diff --git a/arch/arm/src/a1x/hardware/a10_memorymap.h b/arch/arm/src/a1x/hardware/a10_memorymap.h index 6455701875..55f849faf7 100644 --- a/arch/arm/src/a1x/hardware/a10_memorymap.h +++ b/arch/arm/src/a1x/hardware/a10_memorymap.h @@ -28,6 +28,15 @@ #include #include +/* A1X Virtual (mapped) Memory Map + * + * board_memorymap.h contains special mappings that are needed when a ROM + * memory map is used. It is included in this odd location because it + * depends on some the virtual address definitions provided above. + */ + +#include + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -279,15 +288,6 @@ #define A1X_DDR_MMUFLAGS MMU_MEMFLAGS #define A1X_BROM_MMUFLAGS MMU_ROMFLAGS -/* A1X Virtual (mapped) Memory Map - * - * board_memorymap.h contains special mappings that are needed when a ROM - * memory map is used. It is included in this odd location because it - * depends on some the virtual address definitions provided above. - */ - -#include - /* A1X Virtual (mapped) Memory Map. These are the mappings that will * be created if the page table lies in RAM. If the platform has another, * read-only, pre-initialized page table (perhaps in ROM), then the board.h diff --git a/arch/arm/src/am335x/hardware/am3358_memorymap.h b/arch/arm/src/am335x/hardware/am3358_memorymap.h index 4e52293a26..4004f204fc 100644 --- a/arch/arm/src/am335x/hardware/am3358_memorymap.h +++ b/arch/arm/src/am335x/hardware/am3358_memorymap.h @@ -28,6 +28,15 @@ #include #include +/* AM335X Virtual (mapped) Memory Map + * + * board_memorymap.h contains special mappings that are needed when a ROM + * memory map is used. It is included in this odd location because it + * depends on some the virtual address definitions provided above. + */ + +#include + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -250,15 +259,6 @@ #define AM335X_PERIPH_MMUFLAGS MMU_IOFLAGS #define AM335X_DDR_MMUFLAGS MMU_MEMFLAGS -/* AM335X Virtual (mapped) Memory Map - * - * board_memorymap.h contains special mappings that are needed when a ROM - * memory map is used. It is included in this odd location because it - * depends on some the virtual address definitions provided above. - */ - -#include - /* AM335X Virtual (mapped) Memory Map. These are the mappings that will * be created if the page table lies in RAM. If the platform has another, * read-only, pre-initialized page table (perhaps in ROM), then the board.h diff --git a/arch/arm/src/lpc31xx/lpc31_memorymap.h b/arch/arm/src/lpc31xx/lpc31_memorymap.h index 93631b4c70..c6a53e5bf8 100644 --- a/arch/arm/src/lpc31xx/lpc31_memorymap.h +++ b/arch/arm/src/lpc31xx/lpc31_memorymap.h @@ -28,6 +28,13 @@ #include #include "chip.h" +/* board_memorymap.h contains special mappings that are needed when a ROM + * memory map is used. It is included in this odd location because it + * depends on some the virtual address definitions provided above. + */ + +#include + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -185,13 +192,6 @@ #define LPC31_INTC_MMUFLAGS MMU_IOFLAGS #define LPC31_NAND_MMUFLAGS MMU_IOFLAGS -/* board_memorymap.h contains special mappings that are needed when a ROM - * memory map is used. It is included in this odd location because it - * depends on some the virtual address definitions provided above. - */ - -#include - /* LPC31XX Virtual (mapped) Memory Map. These are the mappings that will * be created if the page table lies in RAM. If the platform has another, * read-only, pre-initialized page table (perhaps in ROM), then the board.h diff --git a/arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h b/arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h index 3e527cb707..ee1470b0c1 100644 --- a/arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h +++ b/arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h @@ -28,6 +28,15 @@ #include #include +/* SAMA5 Virtual (mapped) Memory Map + * + * board_memorymap.h contains special mappings that are needed when a ROM + * memory map is used. It is included in this odd location because it + * depends on some the virtual address definitions provided above. + */ + +#include + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -373,15 +382,6 @@ #define SAM_PERIPHB_MMUFLAGS MMU_IOFLAGS #define SAM_PERIPHC_MMUFLAGS MMU_IOFLAGS -/* SAMA5 Virtual (mapped) Memory Map - * - * board_memorymap.h contains special mappings that are needed when a ROM - * memory map is used. It is included in this odd location because it - * depends on some the virtual address definitions provided above. - */ - -#include - /* SAMA5 Virtual (mapped) Memory Map. These are the mappings that will * be created if the page table lies in RAM. If the platform has another, * read-only, pre-initialized page table (perhaps in ROM), then the diff --git a/arch/arm/src/sama5/hardware/_sama5d3x_memorymap.h b/arch/arm/src/sama5/hardware/_sama5d3x_memorymap.h index 3f4b5140e1..d11ae4edfe 100644 --- a/arch/arm/src/sama5/hardware/_sama5d3x_memorymap.h +++ b/arch/arm/src/sama5/hardware/_sama5d3x_memorymap.h @@ -28,6 +28,15 @@ #include #include +/* SAMA5 Virtual (mapped) Memory Map + * + * board_memorymap.h contains special mappings that are needed when a ROM + * memory map is used. It is included in this odd location because it + * depends on some the virtual address definitions provided above. + */ + +#include + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -311,15 +320,6 @@ #define SAM_PERIPHB_MMUFLAGS MMU_IOFLAGS #define SAM_SYSC_MMUFLAGS MMU_IOFLAGS -/* SAMA5 Virtual (mapped) Memory Map - * - * board_memorymap.h contains special mappings that are needed when a ROM - * memory map is used. It is included in this odd location because it - * depends on some the virtual address definitions provided above. - */ - -#include - /* SAMA5 Virtual (mapped) Memory Map. These are the mappings that will * be created if the page table lies in RAM. If the platform has another, * read-only, pre-initialized page table (perhaps in ROM), then the board.h diff --git a/arch/arm/src/sama5/hardware/_sama5d4x_memorymap.h b/arch/arm/src/sama5/hardware/_sama5d4x_memorymap.h index d8639ae75d..80682c7a64 100644 --- a/arch/arm/src/sama5/hardware/_sama5d4x_memorymap.h +++ b/arch/arm/src/sama5/hardware/_sama5d4x_memorymap.h @@ -28,6 +28,15 @@ #include #include +/* SAMA5 Virtual (mapped) Memory Map + * + * board_memorymap.h contains special mappings that are needed when a ROM + * memory map is used. It is included in this odd location because it + * depends on some the virtual address definitions provided above. + */ + +#include + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -311,15 +320,6 @@ #define SAM_PERIPHB_MMUFLAGS MMU_IOFLAGS #define SAM_PERIPHC_MMUFLAGS MMU_IOFLAGS -/* SAMA5 Virtual (mapped) Memory Map - * - * board_memorymap.h contains special mappings that are needed when a ROM - * memory map is used. It is included in this odd location because it - * depends on some the virtual address definitions provided above. - */ - -#include - /* SAMA5 Virtual (mapped) Memory Map. These are the mappings that will * be created if the page table lies in RAM. If the platform has another, * read-only, pre-initialized page table (perhaps in ROM), then the board.h