11 files changed, 180 insertions, 94 deletions
diff --git a/nuttx/configs/ea3131/include/board.h b/nuttx/configs/ea3131/include/board.h
index eadb7e2a1..0392e05a8 100755
--- a/nuttx/configs/ea3131/include/board.h
+++ b/nuttx/configs/ea3131/include/board.h
@@ -100,7 +100,6 @@
 #define BOARD_CLKS_64_92 \
  (0)
 
-
 /* LED definitions ******************************************************************/
 
 #define LED_STARTED       0
diff --git a/nuttx/configs/ea3131/include/board_memorymap.h b/nuttx/configs/ea3131/include/board_memorymap.h
new file mode 100755
index 000000000..f64b028a8
--- /dev/null
+++ b/nuttx/configs/ea3131/include/board_memorymap.h
@@ -0,0 +1,116 @@
+/************************************************************************************
+ * configs/ea3131/include/board_memorymap.h
+ * include/arch/board/board_memorymap.h
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_BOARD_BOARD_MEMORYMAP_H
+#define __ARCH_BOARD_BOARD_MEMORYMAP_H
+
+/* This file should never be included directly, but only indirectly via
+ * lpc313x_memorymap.h.
+ */
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* If the LPC313x ROM page table is selected, then the board-logic is required
+ * to provide:
+ *
+ *   PGTABLE_BASE_PADDR - The physical address of the page table in ROM,
+ *   PGTABLE_BASE_VADDR - The mapped address of the page table in ROM, and
+ *   Mappings for each of the PSECTIONS in lpc313x_memorymap.h
+ */
+ 
+#ifdef CONFIG_ARCH_ROMPGTABLE
+   /* The LPC313x ROM page table uses a 1-1 physical to virtual memory mapping */
+
+#  define LPC313X_SHADOWSPACE_VSECTION 0x00000000 /* 0x00000000-0x00000fff: Shadow Area 4Kb */
+#  define LPC313X_INTSRAM_VSECTION     0x11028000 /*                        Internal SRAM 96Kb-192Kb */
+#    define LPC313X_INTSRAM0_VADDR     0x11028000 /* 0x11028000-0x1103ffff: Internal SRAM 0 96Kb */
+#    define LPC313X_INTSRAM1_VADDR     0x11040000 /* 0x11040000-0x11057fff: Internal SRAM 1 96Kb */
+#  define LPC313X_INTSROM0_VSECTION    0x12000000 /* 0x12000000-0x1201ffff: Internal SROM 0 128Kb */
+#  define LPC313X_APB0_VSECTION        0x13000000 /* 0x13000000-0x13007fff: APB0 32Kb */
+#  define LPC313X_APB1_VSECTION        0x13008000 /* 0x13008000-0x1300bfff: APB1 16Kb */
+#  define LPC313X_APB2_VSECTION        0x15000000 /* 0x15000000-0x15003fff: APB2 16Kb */
+#  define LPC313X_APB3_VSECTION        0x16000000 /* 0x16000000-0x160003ff: APB3 1Kb */
+#  define LPC313X_APB4MPMC_VSECTION    0x17000000 /*                        8Kb */
+#    define LPC313X_APB4_VADDR         0x17000000 /* 0x17000000-0x17000fff: APB4 4Kb */
+#    define LPC313X_MPMC_VADDR         0x17008000 /* 0x17008000-0x17008fff: MPMC cfg 4Kb */
+#  define LPC313X_MCI_VSECTION         0x18000000 /* 0x18000000 0x180003ff: MCI/SD/SDIO 1Kb */
+#  define LPC313X_USBOTG_VSECTION      0x19000000 /* 0x19000000-0x19000fff: USB OTG 4Kb */
+#  define LPC313X_EXTSRAM_VSECTION     0x20020000 /*                        64-128Kb */
+#    define LPC313X_EXTSRAM0_VADDR     0x20000000 /* 0x20000000-0x2001ffff: External SRAM 0 64-128Kb */
+#    define LPC313X_EXTSRAM1_VADDR     0x20020000 /* 0x20020000-0x2003ffff: External SRAM 1 64-128Kb */
+#  define LPC313X_EXTSDRAM0_VSECTION   0x30000000 /* 0x30000000-0x37ffffff: External SDRAM 0 128Mb */
+#  define LPC313X_INTC_VSECTION        0x60000000 /* 0x60000000-0x60000fff: Interrupt controller 4Kb */
+#  define LPC313X_NAND_VSECTION        0x70000000 /* 0x70000000-0x700007ff: NANDFLASH Ctrl 2Kb */
+
+   /* Define the address of the page table within the ROM */
+
+#  define ROMPGTABLE_OFFSET            0x0001c00  /* Offset of the ROM page table in ROM */
+#  define PGTABLE_BASE_PADDR           (LPC313X_INTSROM0_PSECTION+ROMPGTABLE_OFFSET)
+#  define PGTABLE_BASE_VADDR           (LPC313X_INTSROM0_VSECTION+ROMPGTABLE_OFFSET)
+#endif
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/************************************************************************************
+ * Public Function Prototypes
+ ************************************************************************************/
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif  /* __ARCH_BOARD_BOARD_MEMORYMAP_H */
diff --git a/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 8f0a73a3f..f45119fdf 100755
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/configs/ea3131/ostest/defconfig
@@ -96,17 +96,15 @@ CONFIG_ARCH_DMA=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=y
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping in a file named
+#   board_memorymap.h.
+#
+CONFIG_ARCH_LOWVECTORS=y
+CONFIG_ARCH_ROMPGTABLE=y
 
 # Identify toolchain and linker options
 #
diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index 6948c2bb5..f3dc4a970 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/configs/mx1ads/ostest/defconfig
@@ -52,8 +52,6 @@
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
 # CONFIG_DRAM_START - The start address of DRAM (physical)
 # CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual)
-# CONFIG_ARCH_LOWVECTORS - Leave ARM interrupt vectors at 0x0000:0000
-#   instead of moving to 0xffff:0000
 # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
 #   stack. If defined, this symbol is the size of the interrupt
 #   stack in bytes.  If not defined, the user task stacks will be
@@ -72,24 +70,20 @@ CONFIG_DRAM_SIZE=0x01000000
 CONFIG_DRAM_START=0x08000000
 CONFIG_DRAM_VSTART=0x00000000
 CONFIG_DRAM_NUTTXENTRY=0x01004000
-CONFIG_ARCH_LOWVECTORS=y
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=y
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # IMX specific serial device driver settings
diff --git a/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index 5c013f92d..bc1b729df 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/configs/ntosd-dm320/nettest/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index 0c77a0882..6d41bc586 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings
diff --git a/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index 904918639..b4e38b347 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/configs/ntosd-dm320/ostest/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=y
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings
diff --git a/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig
index ffb97dbf3..bdbab6be3 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/configs/ntosd-dm320/poll/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings
diff --git a/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig
index e5eb6ee76..7cb7cce17 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/defconfig
+++ b/nuttx/configs/ntosd-dm320/thttpd/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index ffea2b946..4ed686bc9 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings
diff --git a/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index 288a65f0e..13903db60 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/configs/ntosd-dm320/uip/defconfig
@@ -76,17 +76,14 @@ CONFIG_ARCH_STACKDUMP=n
 #
 # ARM-specific configuration
 #
-# CONFIG_ARM_LOWVECTORS - define if vectors reside at address 0x0000:00000
+# CONFIG_ARCH_LOWVECTORS - define if vectors reside at address 0x0000:00000
 #   Undefine if vectors reside at address 0xffff:0000
-# CONFIG_ARM_ROMPGTABLE - A pre-initialized, read-only page table is available
-#   CONFIG_PGTABLE_BASE must also be defined in this case.
-# CONFIG_PGTABLE_BASE - The (physical) base address of the pre-initialized
-#   read-only page table vector.  This must be provided if CONFIG_ARM_ROMPGTABLE
-#   is defined.
-#
-CONFIG_ARM_LOWVECTORS=n
-CONFIG_ARM_ROMPGTABLE=n
-#CONFIG_PGTABLE_BASE=
+# CONFIG_ARCH_ROMPGTABLE - A pre-initialized, read-only page table is available.
+#   If defined, then board-specific logic must also define PGTABLE_BASE_PADDR,
+#   PGTABLE_BASE_VADDR, and all memory section mapping, possibly in board.h
+#
+CONFIG_ARCH_LOWVECTORS=n
+CONFIG_ARCH_ROMPGTABLE=n
 
 #
 # DM320 specific device driver settings