diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-26 23:11:02 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-26 23:11:02 +0000 |
| commit | a57cc2353f87cc923f610c21130df9e67779db97 (patch) | |
| tree | 60359e586dfdea37b803c0ca23f2adf9111ac1d4 /nuttx/arch/arm/src/imx | |
| parent | 2a114bcb72c9b2388b10fb86d00ca740b0e11254 (diff) | |
Fixes to get clean i.MXADS build
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3533 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/imx')
| -rw-r--r-- | nuttx/arch/arm/src/imx/imx_boot.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/imx/imx_memorymap.h | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/imx/imx_boot.c b/nuttx/arch/arm/src/imx/imx_boot.c index 9cd4d390ea..65a6951ce9 100644 --- a/nuttx/arch/arm/src/imx/imx_boot.c +++ b/nuttx/arch/arm/src/imx/imx_boot.c @@ -117,7 +117,7 @@ extern void imx_boardinitialize(void); static inline void up_setlevel1entry(uint32_t paddr, uint32_t vaddr, uint32_t mmuflags) { - uint32_t *pgtable = (uint32_t*)PGTABLE_VBASE; + uint32_t *pgtable = (uint32_t*)PGTABLE_BASE_VADDR; uint32_t index = vaddr >> 20; /* Save the page table entry */ diff --git a/nuttx/arch/arm/src/imx/imx_memorymap.h b/nuttx/arch/arm/src/imx/imx_memorymap.h index 0b7603befb..7eafc908a5 100644 --- a/nuttx/arch/arm/src/imx/imx_memorymap.h +++ b/nuttx/arch/arm/src/imx/imx_memorymap.h @@ -233,19 +233,19 @@ * We will reuse this memory for coarse page tables as follows: */ -#define PGTABLE_PBASE IMX_SDRAM0_PSECTION -#define PGTABLE_SDRAM_PBASE PGTABLE_PBASE -#define PGTABLE_COARSE_PBASE (PGTABLE_PBASE+0x00000800) -#define PGTABLE_COARSE_PEND (PGTABLE_PBASE+0x00003000) -#define PTTABLE_PERIPHERALS_PBASE (PGTABLE_PBASE+0x00003000) -#define PGTABLE_PEND (PGTABLE_PBASE+0x00004000) - -#define PGTABLE_VBASE IMX_SDRAM_VSECTION -#define PGTABLE_SDRAM_VBASE PGTABLE_VBASE -#define PGTABLE_COARSE_VBASE (PGTABLE_VBASE+0x00000800) -#define PGTABLE_COARSE_VEND (PGTABLE_VBASE+0x00003000) -#define PTTABLE_PERIPHERALS_VBASE (PGTABLE_VBASE+0x00003000) -#define PGTABLE_VEND (PGTABLE_VBASE+0x00004000) +#define PGTABLE_BASE_PADDR IMX_SDRAM0_PSECTION +#define PGTABLE_SDRAM_PADDR PGTABLE_BASE_PADDR +#define PGTABLE_COARSE_PBASE (PGTABLE_BASE_PADDR+0x00000800) +#define PGTABLE_COARSE_PEND (PGTABLE_BASE_PADDR+0x00003000) +#define PTTABLE_PERIPHERALS_PBASE (PGTABLE_BASE_PADDR+0x00003000) +#define PGTABLE_PEND (PGTABLE_BASE_PADDR+0x00004000) + +#define PGTABLE_BASE_VADDR IMX_SDRAM_VSECTION +#define PGTABLE_SDRAM_VADDR PGTABLE_BASE_VADDR +#define PGTABLE_COARSE_VBASE (PGTABLE_BASE_VADDR+0x00000800) +#define PGTABLE_COARSE_VEND (PGTABLE_BASE_VADDR+0x00003000) +#define PTTABLE_PERIPHERALS_VBASE (PGTABLE_BASE_VADDR+0x00003000) +#define PGTABLE_VEND (PGTABLE_BASE_VADDR+0x00004000) #define PGTABLE_COARSE_TABLE_SIZE (4*256) #define PGTABLE_COARSE_ALLOC (PGTABLE_COARSE_VEND-PGTABLE_COARSE_VBASE) |