summaryrefslogtreecommitdiff
path: root/polux/linux-2.6.10/include/asm-arm
diff options
context:
space:
mode:
Diffstat (limited to 'polux/linux-2.6.10/include/asm-arm')
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore17
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/debug-macro.S32
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/dma.h27
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S112
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/gpio.h25
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/hardware.h55
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/io.h28
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/irq_prio.h58
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/irqs.h79
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/memory.h59
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram.h85
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram_gen.h111
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/param.h9
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/serial.h46
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/spid_img_desc.h66
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/system.h43
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/timex.h27
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/uncompress.h67
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/vmalloc.h10
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/wdt.h79
20 files changed, 84 insertions, 951 deletions
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore b/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore
index 4119d58772..8438030f86 100644
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore
+++ b/polux/linux-2.6.10/include/asm-arm/arch-mse500/.gitignore
@@ -1,3 +1,20 @@
+debug-macro.S
+dma.h
+entry-macro.S
+gpio.h
+hardware.h
+io.h
+irqs.h
+memory.h
+nvram.h
+platform.h
+serial.h
+spid_img_desc.h
+system.h
+timex.h
+uncompress.h
+wdt.h
+
ips/arizona.h
ips/gic.h
ips/gpio.h
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/debug-macro.S b/polux/linux-2.6.10/include/asm-arm/arch-mse500/debug-macro.S
deleted file mode 100644
index bda8f7d14b..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/debug-macro.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 2012 SPiDCOM Technologies
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
- .macro addruart,rx
- mov \rx, #0xc0000000
- orr \rx, \rx, #0x00040000
- .endm
-
- .macro senduart,rd,rx
- strb \rd, [\rx, #0x0]
- .endm
-
- .macro busyuart,rd,rx
-1002: ldrb \rd, [\rx, #0x14]
- and \rd, \rd, #0x20
- teq \rd, #0x20
- bne 1002b
- .endm
-
- .macro waituart,rd,rx
- .endm
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/dma.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/dma.h
deleted file mode 100644
index 760bdf037e..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/dma.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/dma.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_DMA_H
-#define ASM_ARM_ARCH_MSE500_DMA_H
-
-#define MAX_DMA_ADDRESS 0xffffffff
-
-#define MAX_DMA_CHANNELS 0
-
-#endif /* ASM_ARM_ARCH_MSE500_DMA_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S b/polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S
deleted file mode 100644
index 30f0f0d47b..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * include/asm-arm/arch-mse500/entry-macro.S
- *
- * Copyright (C) 2008 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-#include <asm/arch/hardware.h>
-
-.irqpriotable:
- .word 0x00000000
-
- .macro disable_fiq
- .endm
-
-/******************
- * IRQ Workflow !!
- ******************/
- .macro get_irqnr_and_base, irqnr, level, base, tmp
-
- ldr \base, =IO_ADDRESS(ARM_ICTL_BASE)
-
- /* Store previous priority level in a table (in case we preempted
- * a running interrupt). */
- ldr \level, [\base, #IRQ_PLEVEL_OFFSET]
- mov \tmp, #1
- mov \level, \tmp, lsl \level
- ldr \tmp, .irqpriotable
- orr \tmp, \tmp, \level
- str \tmp, .irqpriotable
-
-1:
- /* Get current interruption priority level (in order to update
- * final status register). */
- ldr \level, [\base, #IRQ_VECTOR_OFFSET]
- str \level, [\base, #IRQ_PLEVEL_OFFSET]
-
- /* Save final status register to get IRQ number. */
- ldr \irqnr, [\base, #IRQ_FINALSTATUS_OFFSET]
-
- /* Check vector offset consistency. */
- ldr \tmp, [\base, #IRQ_VECTOR_OFFSET]
- cmp \level, \tmp
- bne 1b
-
- /* Mask lower and same priority interrupts. */
- add \level, \level, #1
- str \level, [\base, #IRQ_PLEVEL_OFFSET]
-
- /* Disable all interrupts if we are on the maximum priority level. */
- cmp \level, #16
- bne 2f
- mov \tmp, #0xFFFFFFFF
- str \tmp, [\base, #IRQ_INTMASK_OFFSET]
-
-2:
- clz \irqnr, \irqnr @ find the upper active it
- cmp \irqnr, #32 @ is there a pending it
- beq 1001f @ no
- rsb \irqnr, \irqnr, #31 @ yes find the correct irqnr (32 - nbzero-1)
-
-1001:
- /* WARNING: These lines override the default behaviour, */
- /* which is to loop back at the start of the macro after the handler */
-
- /* set r1 to registers address */
- movne r1, sp
-
- /* set label 2 as return address */
- adrsvc ne, lr, 2f
- .endm
-
- .macro restore_cpr_and_check_status
- .endm
-
-
- .macro restore_irq_level, level, tmp, table
- /* Get previous priority level (in case we preempted a running
- * interrupt) and update the table. */
- ldr \table, .irqpriotable @ find the last irq level
- clz \level, \table @ stored in .irqpriotable
- rsb \level, \level, #31
- mov \tmp, #1
- mov \tmp, \tmp, lsl \level
- bic \table, \table, \tmp @ suppr this priority in .irqpriotable
- str \table, .irqpriotable
-
- /* Set the previous priority level. */
- ldr \tmp, =IO_ADDRESS(ARM_ICTL_BASE) @ change to this priority
- str \level, [\tmp, #IRQ_PLEVEL_OFFSET]
- mov \table, #0
- str \table, [\tmp, #IRQ_INTMASK_OFFSET]
- .endm
-
- /* This macro is called only for MSE500 platform because some processing
- * must be done after the handler and must work under RTAI */
- .macro irq_prio_table
- .endm
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/gpio.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/gpio.h
deleted file mode 100644
index 74a97dbc4e..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/gpio.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/gpio.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_GPIO_H
-#define ASM_ARM_ARCH_MSE500_GPIO_H
-
-#include <asm/arch/ips/gpio.h>
-
-#endif /* ASM_ARM_ARCH_MSE500_GPIO_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/hardware.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/hardware.h
deleted file mode 100644
index 12038a2d43..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/hardware.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/hardware.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_HARDWARE_H
-#define ASM_ARM_ARCH_MSE500_HARDWARE_H
-
-#include <asm/arch/ips/hardware/bus_sys.h>
-#include <asm/sizes.h>
-#include <platform.h>
-
-#ifndef __ASSEMBLY__
-//extern uint32_t SDRAM_size;
-extern unsigned int DMA_zone_base;
-#endif
-
-/*
- * Implementation specific hardware definitions.
- */
-#define KERNEL_TIMER 0
-
-#if !defined(CONFIG_MMU) && defined(CONFIG_CPU_MXU_ENABLE)
-#define MMU_PAGETABLE_ADDR (SDRAM_BASE + 0x4000)
-
-// WARNING: THIS IS NEEDED TO PROTECT PAGETABLE
-#define MACH_RESERVE_BOOTMEM() do { \
- reserve_bootmem_node(pgdat, MMU_PAGETABLE_ADDR, 0x4000); \
- reserve_bootmem_node(pgdat, DMA_zone_base, DMA_ZONE_SIZE); \
- } while(0)
-
-#endif /* CONFIG_MMU */
-
-/* Where are in virtual memory the IO devices (timers, system controllers and so on) */
-#define IO_BASE 0xF0000000 // VA of IO
-#define IO_SIZE 0x0B000000 // How much?
-
-/* Macro to get at IO space when running virtually */
-#define IO_ADDRESS(x) (x)
-
-#endif /* ASM_ARM_ARCH_MSE500_HARDWARE_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/io.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/io.h
deleted file mode 100644
index 199d204dbe..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/io.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/io.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_IO_H
-#define ASM_ARM_ARCH_MSE500_IO_H
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#define __io(a) (a)
-#define __mem_pci(a) (a)
-
-#endif /* ASM_ARM_ARCH_MSE500_IO_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/irq_prio.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/irq_prio.h
new file mode 100644
index 0000000000..6a271203cf
--- /dev/null
+++ b/polux/linux-2.6.10/include/asm-arm/arch-mse500/irq_prio.h
@@ -0,0 +1,58 @@
+/*
+ * include/asm/arch/irq_prio.h
+ *
+ * (C) Copyright 2008 SPiDCOM Technologies.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef __ASM_ARCH_IRQ_PRIO_H
+#define __ASM_ARCH_IRQ_PRIO_H
+
+/* MAX priority = 15
+ * MIN priority = 0 */
+#define INT_PRIO_TIMER_1 15
+#define INT_PRIO_TIMER_2 7
+#define INT_PRIO_GPIO 0
+#define INT_PRIO_UART_1 0
+#define INT_PRIO_UART_2 0
+#define INT_PRIO_SPI 0
+#define INT_PRIO_GPDMA 0
+#define INT_PRIO_MBX 0
+#define INT_PRIO_MBX_ACK 7
+#define INT_PRIO_MBX_WKP 0
+#define INT_PRIO_MBX_WD 0
+#define INT_PRIO_EMMC 0
+#define INT_PRIO_L2ND2A 0
+#define INT_PRIO_ETH 5
+#define INT_PRIO_ETH_PHY 0
+#define INT_PRIO_SPC200_PLC_PHLIC_0 0
+#define INT_PRIO_SPC200_PLC_MAC_LAYER 6
+#define INT_PRIO_SPC200_PLC_RX_BUSY 12
+#define INT_PRIO_SPC200_PLC_RX_CTRL 10
+#define INT_PRIO_SPC200_PLC_RX_DATA 9
+#define INT_PRIO_SPC200_PLC_RX_EOF 8
+#define INT_PRIO_SPC200_PLC_TX_END 14
+#define INT_PRIO_SPC200_PLC_PHLIC_7 0
+#define INT_PRIO_SPC200_PLC_TX_CTRL 13
+#define INT_PRIO_SPC200_PLC_TMO1 7
+#define INT_PRIO_SPC200_PLC_TMO2 7
+#define INT_PRIO_SPC200_PLC_PHLIC_11 0
+#define INT_PRIO_SPC200_PLC_POLL 6
+#define INT_PRIO_SPC200_PLC_R2L 6
+#define INT_PRIO_SPC200_PLC_RX_END 11
+#define INT_PRIO_SPC200_PLC_ERR 0
+#define INT_PRIO_WDT 0
+
+#endif /* __ASM_ARCH_IRQ_PRIO_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/irqs.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/irqs.h
deleted file mode 100644
index 93afa39fc8..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/irqs.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/irqs.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_IRQS_H
-#define ASM_ARM_ARCH_MSE500_IRQS_H
-
-#define INT_TIMER_1 0
-#define INT_TIMER_2 1
-#define INT_GPIO 2
-#define INT_UART_1 3
-#define INT_UART_2 4
-#define INT_SPI 5
-#define INT_GPDMA 6
-#define INT_MBX 7
-#define INT_MBX_ACK 8
-#define INT_MBX_WKP 9
-#define INT_MBX_WD 10
-#define INT_EMMC_CARD 11
-#define INT_L2ND2A 12
-#define INT_ETH 13
-#define INT_ETH_PHY 14
-#define INT_SPC200_PLC_PHLIC_0 15
-#define INT_SPC200_PLC_PHLIC_1 16
-#define INT_SPC200_PLC_PHLIC_2 17
-#define INT_SPC200_PLC_PHLIC_3 18
-#define INT_SPC200_PLC_PHLIC_4 19
-#define INT_SPC200_PLC_PHLIC_5 20
-#define INT_SPC200_PLC_PHLIC_6 21
-#define INT_SPC200_PLC_PHLIC_7 22
-#define INT_SPC200_PLC_PHLIC_8 23
-#define INT_SPC200_PLC_PHLIC_9 24
-#define INT_SPC200_PLC_PHLIC_10 25
-#define INT_SPC200_PLC_PHLIC_11 26
-#define INT_SPC200_PLC_PHLIC_12 27
-#define INT_SPC200_PLC_PHLIC_13 28
-#define INT_SPC200_PLC_RX 29
-#define INT_SPC200_PLC_ERR 30
-#define INT_WDT 31
-
-#define INTMASK_TIMER_1 (1 << INT_TIMER_1)
-#define INTMASK_TIMER_2 (1 << INT_TIMER_2)
-#define INTMASK_GPIO (1 << INT_GPIO)
-#define INTMASK_UART_1 (1 << INT_UART_1)
-#define INTMASK_UART_2 (1 << INT_UART_2)
-#define INTMASK_SPI (1 << INT_SPI)
-#define INTMASK_GPDMA (1 << INT_GPDMA)
-#define INTMASK_MBX (1 << INT_MBX)
-#define INTMASK_MBX_ACK (1 << INT_MBX_ACK)
-#define INTMASK_MBX_WKP (1 << INT_MBX_WKP)
-#define INTMASK_MBX_WD (1 << INT_MBX_WD)
-#define INTMASK_EMMC_CARD (1 << INT_EMMC_CARD)
-#define INTMASK_L2ND2A (1 << INT_L2ND2A)
-#define INTMASK_ETH (1 << INT_ETH)
-#define INTMASK_ETH_PHY (1 << INT_ETH_PHY)
-#define INTMASK_WDT (1 << INT_WDT)
-
-#define NR_IRQS 32
-
-#ifndef NO_IRQ
-#define NO_IRQ ((unsigned int)(-1))
-#endif
-
-#endif /* ASM_ARM_ARCH_MSE500_IRQS_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/memory.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/memory.h
deleted file mode 100644
index 90f08e3135..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/memory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/memory.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_MEMORY_H
-#define ASM_ARM_ARCH_MSE500_MEMORY_H
-
-#include <asm/arch/hardware.h>
-
-#ifndef CONFIG_MMU
-/*
- * Task size: 32M+SDRAM_BASE
- */
-#define TASK_SIZE (SDRAM_BASE+0x02000000UL)
-#endif /* CONFIG_MMU */
-
-/*
- * Page offset: 3GB
- */
-#define PHYS_OFFSET (SDRAM_BASE)
-
-#ifndef CONFIG_MMU
-#define PAGE_OFFSET (PHYS_OFFSET)
-#define END_MEM (SDRAM_BASE + DFT_SDRAM_SIZE)
-
-#define __virt_to_phys__is_a_macro
-#define __phys_to_virt__is_a_macro
-#define __virt_to_phys(vpage) (vpage)
-#define __phys_to_virt(ppage) (ppage)
-#endif /* CONFIG_MMU */
-
-/*
- * Virtual view <-> DMA view memory address translations
- * virt_to_bus: Used to translate the virtual address to an
- * address suitable to be passed to set_dma_addr
- * bus_to_virt: Used to convert an address for DMA operations
- * to an address that the kernel can use.
- */
-#define __virt_to_bus__is_a_macro
-#define __virt_to_bus(x) __virt_to_phys(x)
-#define __bus_to_virt__is_a_macro
-#define __bus_to_virt(x) __phys_to_virt(x)
-
-#endif /* ASM_ARM_ARCH_MSE500_MEMORY_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram.h
deleted file mode 100644
index 54cc9ba45f..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/nvram.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_NVRAM_H
-#define ASM_ARM_ARCH_MSE500_NVRAM_H
-
-#include <platform.h>
-
-#include <asm/arch/nvram_gen.h>
-
-/* To avoid conditionnal code everywhere in polux, all software use the type
- * spidcom_nvram_t to access NVRAM. But NVRAM structure is different
- * between MSE500 and SPC200 chips, and we define the structures using
- * mse500_nvram_t and spc200_nvram_t, that is why need to do this. */
-typedef mse500_nvram_t spidcom_nvram_t;
-
-#define NVRAM_MTD_NAME "nvram"
-#define NVRAM_IS_VALID(nvram) (!memcmp((nvram)->magic, MSE500_NVRAM_MAGIC1, 8))
-
-/* GPIO common definitions */
-#define MAX_INTERNAL_GPIOS 16
-#define MIN_INTERNAL_GPIOS 8
-#define mse500_gpio_max_nb(pkg_cfg) ((((pkg_cfg & 0x000000F0) >> 4) < 5) ? \
- MAX_INTERNAL_GPIOS : MIN_INTERNAL_GPIOS)
-#define mse500_gpio_direction(gpio_allow_dir,num) ((gpio_allow_dir >> (num * 2)) & 0x3)
-
-enum mse500_gpio_direction_t
-{
- MSE500_GPIO_DIRECTION_NONE = 0,
- MSE500_GPIO_DIRECTION_INPUT = 1,
- MSE500_GPIO_DIRECTION_OUTPUT = 2,
- MSE500_GPIO_DIRECTION_BIDIR = 3,
-};
-
-#ifdef __KERNEL__
-extern spidcom_nvram_t spidcom_nvram;
-
-static inline void mse500_nvram_copy(void* dst, void* src, unsigned int length)
-{
- unsigned int burst, rest, i;
- unsigned long *src32, *dst32;
- unsigned char *src8, *dst8;
-
- src32 = (unsigned long*)src;
- dst32 = (unsigned long*)dst;
- burst = length / 4;
- rest = length % 4;
-
- for(i=0 ; i<burst ; i++)
- {
- *dst32 = *src32;
- dst32++;
- src32++;
- }
- if(rest)
- {
- src8 = (unsigned char*)src32;
- dst8 = (unsigned char*)dst32;
- for(i=0 ; i<rest ; i++)
- {
- *dst8 = *src8;
- dst8++;
- src8++;
- }
- }
-}
-#endif /* __KERNEL__ */
-
-#endif /* ASM_ARM_ARCH_MSE500_NVRAM_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram_gen.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram_gen.h
deleted file mode 100644
index 7bdd262548..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/nvram_gen.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * include/asm-arm/arch-mse500/nvram_gen.h
- *
- * Copyright (C) 2009 SPiDCOM Technologies
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/*
- * This file contains all informations needed to generate an NVRAM for this
- * architecture. It is separated from nvram.h file to avoid double definition
- * issues for some macros between architectures, as genNVRAM include all
- * architectures' NVRAM definition files.
- */
-
-#ifndef ASM_ARM_ARCH_MSE500_NVRAM_GEN_H
-#define ASM_ARM_ARCH_MSE500_NVRAM_GEN_H
-
-/* NVRAM integrity word */
-#define MSE500_NVRAM_MAGIC1 "NVRAM\0\0\0"
-#define MSE500_NVRAM_MAGIC2 0x0000FEED
-#define MSE500_NVRAM_MAGIC3 0xDEADBEEF
-#define MSE500_NVRAM_MAGIC4 "NVRAM2\0\0"
-
-/*
- * MSE500 NVRAM is the concatenation of SPC300 and SPC200C NVRAMs. We chose
- * this solution to avoid any modification in polux or cleopatre software and
- * limitate them to genNVRAM. As a consequence some informations are
- * duplicated, but, as we have way more flash memory dedicated to NVRAM than
- * needed, it is acceptable.
- */
-
-/* /!\ All values are LITTLE-ENDIAN */
-typedef struct
-{
- /* SPC300 fields. */
- char magic[8]; /* Magic number "NVRAM\0\0\0" */
- uint32_t pkg_cfg; /* MSE500 package configuration register */
- uint32_t gpio_0_7_cfg; /* MSE500 GPIO 0 to 7 configuration register */
- uint32_t gpio_8_15_cfg; /* MSE500 GPIO 8 to 15 configuration register */
- uint32_t gpio_allow_dir; /* MSE500 GPIO allowed directions 0:none 1:in 2:out 3:bi */
- union {
- struct {
- uint32_t config; /* MSE500 SDRAM configuration register */
- uint32_t timing0; /* MSE500 SDRAM timing register 0 */
- uint32_t timing1; /* MSE500 SDRAM timing register 1 */
- uint32_t refresh; /* MSE500 SDRAM refresh register */
- } sdram;
- struct {
- uint16_t config_offset; /* Offset of MIU config in nvram */
- uint16_t config_size; /* Size of MIU config in words */
- uint32_t ram_size; /* Size of MIU connected RAM in bytes */
- uint32_t reserved[2];
- } miu;
- } dram;
- uint32_t flash_org; /* Flash organization */
- uint32_t img_0_offset; /* Offset of first image address */
- uint32_t nb_images; /* Max Number of Images present in flash */
- char product_name[64]; /* Product short name in string format */
- char product_partnb[64]; /* Product part number in string format */
- char product_desc[128]; /* Product long description in string format */
- char serial_number[64]; /* Product serial number in string format */
- uint32_t eth_phy_addr; /* Address of Ethernet PHY */
- unsigned char eth_address[6]; /* Ethernet MAC address */
- unsigned char eth_port_nb; /* Ethernet port number */
- unsigned char reserved1;
- unsigned char plc_address[6]; /* PowerLine MAC address */
- unsigned char reserved2[2];
- char device_password[32]; /* HomePlugAV device unique password (DPW) */
- char oem_info[64]; /* Additional information for OEM */
- unsigned char tonemask[192]; /* HomePlugAV tonemask */
- char manufactory_info[64]; /* Name of the product manufacturer */
- uint32_t img_max_size; /* Max size of an image in flash */
- uint32_t cpu_partnb; /* SPC3x0 partnb */
- uint32_t dynamic[256]; /* Dynamic data (see miu_config) */
-
- /* SPC200 fields. */
- uint32_t magicWord1;
- uint32_t magicWord2;
- uint32_t boardNumber; /* board Number */
- char serialNumber[64]; /* serial number as tagged on the board */
- char sysDescr[256]; /* system description */
- char ethPhysAddress[6]; /* MAC Address */
- char plcPhysAddress[6]; /* MAC Address */
- char reserved[8];
- char magicNvram2[8]; /* 0x4e565241 0x4d320000 "NVRAM2" */
- char boardDesc[16]; /* board description string */
- uint32_t boardId; /* board identification number */
- char vendorInfo[64]; /* vendor additional info (OEM) */
- uint32_t sdramSize; /* size of SDRAM in MBytes */
- unsigned char *imageOffset0; /* address of image #0 in flash */
- unsigned char *imageOffset1; /* address of image #1 in flash */
- uint32_t afeType; /* Type of AFE design */
- uint32_t ethPortNum; /* Number of the eth port */
- char manufactoryInfo[64]; /* manufactory info string */
-} mse500_nvram_t; //Currently __attribute__((packed)) not needed
-
-#endif /* ASM_ARM_ARCH_MSE500_NVRAM_GEN_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/param.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/param.h
index 86705768cd..873c2c3467 100644
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/param.h
+++ b/polux/linux-2.6.10/include/asm-arm/arch-mse500/param.h
@@ -17,13 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef ASM_ARM_ARCH_MSE500_PARAM_H
-#define ASM_ARM_ARCH_MSE500_PARAM_H
+#ifndef __ASM_ARCH_PARAM_H
+#define __ASM_ARCH_PARAM_H
-
-#define HZ 100
/*
* We use default params
*/
+#define HZ 100
-#endif /* ASM_ARM_ARCH_MSE500_PARAM_H */
+#endif /* __ASM_ARCH_PARAM_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/serial.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/serial.h
deleted file mode 100644
index 491c47424a..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/serial.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/serial.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_SERIAL_H
-#define ASM_ARM_ARCH_MSE500_SERIAL_H
-
-#include <asm/arch/hardware.h>
-#include <asm/arch/irqs.h>
-
-#define BASE_BAUD (UART_CLK/16)
-
-#define STD_SERIAL_PORT_DEFNS \
- { \
- baud_base: BASE_BAUD, \
- irq:INT_UART_1, \
- flags:(ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
- iomem_base: (u8*)IO_ADDRESS(ARM_UART1_BASE), iomem_reg_shift: 2, \
- io_type: SERIAL_IO_MEM \
- }, \
- { \
- baud_base: BASE_BAUD, \
- irq:INT_UART_2, \
- flags:(ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
- iomem_base: (u8*)IO_ADDRESS(ARM_UART2_BASE), iomem_reg_shift: 2, \
- io_type: SERIAL_IO_MEM \
- }
-
-#define EXTRA_SERIAL_PORT_DEFNS
-
-#endif /* ASM_ARM_ARCH_MSE500_SERIAL_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/spid_img_desc.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/spid_img_desc.h
deleted file mode 100644
index 7c92427fd2..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/spid_img_desc.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/spid_img_desc.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_SPID_IMG_DESC_H
-#define ASM_ARM_ARCH_MSE500_SPID_IMG_DESC_H
-
-#include <stdint.h>
-
-#define SPIDCOM_IMG_DESC_MTD_NAME_0 "image 0"
-#define SPIDCOM_IMG_DESC_MTD_NAME_1 "image 1"
-
-#define SPIDCOM_IMG_DESC_SPC300 0x00
-#define SPIDCOM_IMG_DESC_UNKNOWN 0x01
-
-#define SPIDCOM_IMG_DESC_MAGIC "SPIDIMG\0"
-#define SPIDCOM_IMG_DESC_SIZE 1024
-
-#define SPIDCOM_IMG_DESC_INVALID_INDEX 0x7fffffff
-#define SPIDCOM_IMG_DESC_ORIGIN_INDEX 0xffffffff
-
-#define SPIDCOM_IMG_DESC_NORMAL_TYPE 0x0
-
-#define SPIDCOM_IMG_DESC_PLC_RAM 0x400000 /* 4M */
-
-#define SPIDCOM_IMG_DESC_IS_VALID(desc) ( !memcmp((desc)->magic, SPIDCOM_IMG_DESC_MAGIC, 8) && \
- (desc)->is_valid && \
- ( (desc)->index != SPIDCOM_IMG_DESC_INVALID_INDEX ) )
-
-/* /!\ All values are LITTLE-ENDIAN */
-typedef struct {
- char magic[8]; /* Magic number = "SPIDIMG\0"
- * = { 0x53, 0x50, 0x49, 0x44,
- * 0x49, 0x4d, 0x47, 0x00 } */
- uint32_t index; /* The biggest one is the image to boot */
- uint32_t is_valid:1; /* Is image valid (bootable ?) */
- uint32_t is_1st_boot:1; /* Is first image boot ? */
- uint32_t is_not_success:1; /* Is first boot successful ? */
- uint32_t is_not_update:1; /* Is update process finished correctly? */
- uint32_t size; /* Firmware size (descriptor included) */
- uint32_t type; /* Image type : 0 is normal image */
- uint8_t md5_sum[16]; /* MD5 checksum of the whole firmware */
- char version[16]; /* Image version string */
- char description[64]; /* Image description string */
- uint32_t arch; /* spc300 or unknown */
- uint32_t plc_ram; /* RAM size needed for the PLC processor */
- char reserved[900];
- char image[0]; /* Used in bootloader to mark beging of the payload */
-} spidcom_image_desc_t;
-
-#endif /* ASM_ARM_ARCH_MSE500_SPID_IMG_DESC_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/system.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/system.h
deleted file mode 100644
index 65f398bd2a..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/system.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/system.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_SYSTEM_H
-#define ASM_ARM_ARCH_MSE500_SYSTEM_H
-
-#include <asm/arch/ips/regbank.h>
-
-static inline void arch_idle(void)
-{
- /*
- * This should do all the clock switching
- * and wait for interrupt tricks
- */
- cpu_do_idle();
-}
-
-static inline void arch_reset(char mode)
-{
- /*
- * Perform a hardware reset with reset manager.
- */
-
- RB_RST_GLOBAL_VA = 1;
-}
-
-#endif /* ASM_ARM_ARCH_MSE500_SYSTEM_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/timex.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/timex.h
deleted file mode 100644
index f4b78023af..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/timex.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/timex.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_TIMEX_H
-#define ASM_ARM_ARCH_MSE500_TIMEX_H
-
-#include <asm/arch/hardware.h>
-
-#define CLOCK_TICK_RATE (TIMER_CLK)
-
-#endif /* ASM_ARM_ARCH_MSE500_TIMEX_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/uncompress.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/uncompress.h
deleted file mode 100644
index 1bea5756ab..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/uncompress.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/uncompress.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_UNCOMPRESS_H
-#define ASM_ARM_ARCH_MSE500_UNCOMPRESS_H
-
-#include <asm/arch/hardware.h>
-#include <asm/arch/wdt.h>
-
-#define TRANSMIT_REGISTER (*(volatile unsigned char *)(ARM_UART1_BASE+0x00))
-#define LINE_STATUS_REGISTER (*(volatile unsigned char *)(ARM_UART1_BASE+0x14))
-
-#define LSR_THRE (0x20) // THR empty
-
-/*
- * The following code assumes the serial port has already been
- * initialized by the bootloader. We search for the first enabled
- * port in the most probable order. If you didn't setup a port in
- * your bootloader then nothing will appear (which might be desired).
- *
- * This does not append a newline
- */
-static void putstr(const char *s)
-{
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
- while (*s) {
-
- while (!(LINE_STATUS_REGISTER & LSR_THRE))
- barrier();
-
- TRANSMIT_REGISTER = *s;
-
- if (*s == '\n')
- {
- while (!(LINE_STATUS_REGISTER & LSR_THRE))
- barrier();
-
- TRANSMIT_REGISTER = '\r';
- }
- s++;
- }
-#endif // CONFIG_SERIAL_CORE_CONSOLE
-}
-
-#define arch_decomp_setup()
-
-#define arch_decomp_wdog() \
-{ \
- WDT_CRR_PA = WDT_BF(CR, WDT_CR_VAL); \
-}
-#endif /* ASM_ARM_ARCH_MSE500_UNCOMPRESS_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/vmalloc.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/vmalloc.h
index 874ddf7e75..00b4538a79 100644
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/vmalloc.h
+++ b/polux/linux-2.6.10/include/asm-arm/arch-mse500/vmalloc.h
@@ -1,7 +1,7 @@
/*
- * linux/include/asm-arm/arch-mse500/vmalloc.h
+ * include/asm/arch/vmalloc.h
*
- * (C) Copyright 2012 SPiDCOM Technologies.
+ * (C) Copyright 2008 SPiDCOM Technologies.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef ASM_ARM_ARCH_MSE500_VMALLOC_H
-#define ASM_ARM_ARCH_MSE500_VMALLOC_H
+#ifndef __ASM_ARCH_VMALLOC_H
+#define __ASM_ARCH_VMALLOC_H
/*
* Just any arbitrary offset to the start of the vmalloc VM area: the
@@ -35,4 +35,4 @@
#define VMALLOC_END (0xe0000000-1)
//#define VMALLOC_END (PAGE_OFFSET + DFT_SDRAM_SIZE)
-#endif /* ASM_ARM_ARCH_MSE500_VMALLOC_H */
+#endif /* __ASM_ARCH_VMALLOC_H */
diff --git a/polux/linux-2.6.10/include/asm-arm/arch-mse500/wdt.h b/polux/linux-2.6.10/include/asm-arm/arch-mse500/wdt.h
deleted file mode 100644
index 35e827e76b..0000000000
--- a/polux/linux-2.6.10/include/asm-arm/arch-mse500/wdt.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * linux/include/asm-arm/arch-mse500/wdt.h
- *
- * (C) Copyright 2012 SPiDCOM Technologies.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef ASM_ARM_ARCH_MSE500_WDT_H
-#define ASM_ARM_ARCH_MSE500_WDT_H
-
-#include <asm/arch/ips/wdt.h>
-
-#define WDT_DEFAULT_TIME 5 //seconds
-#define WDT_MAX_TIME 21 //seconds
-
-#ifndef __ASSEMBLY__
-
-/** Global watchdog mode variable */
-extern uint32_t mse500_wdt_user_mode;
-
-/**
- * Start watchdog timer.
- */
-extern void mse500_wdt_start(void);
-
-/**
- * Stop watchdog timer.
- */
-extern void mse500_wdt_stop(void);
-
-/**
- * Switch watchdog between user and kernel mode.
- *
- * \param use_umode 1 to switch to user mode.
- */
-extern void mse500_wdt_switch(int use_umode);
-
-/**
- * Refresh watchdog timer.
- */
-extern void mse500_wdt_refresh(void);
-
-/**
- * Change the watchdog time interval.
- *
- * \param new_time new time interval in seconds.
- * \return range error.
- */
-extern int mse500_wdt_settimeout(int new_time);
-
-/**
- * Get the watchdog time interval.
- *
- * \return time interval.
- */
-extern int mse500_wdt_gettimeout(void);
-
-/**
- * Restart watchdog timer.
- *
- * \param timeout time interval in seconds.
- * \return if new timeout is done.
- */
-extern int mse500_wdt_restart(int timeout);
-
-#endif /* __ASSEMBLY__ */
-#endif /* ASM_ARM_ARCH_MSE500_WDT_H */