Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-08 18:37:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes to get clean i.MXADS build

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3533 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-04-26 23:11:02 +00:00
parent 160ae499c1
commit 5973e0203b
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/arm/up_head.S
+1 -2
View File
@@ -177,7 +177,7 @@
* to the base address of the section containing both.
*/
#ifndef CONFIG_ARCH_LOWVECTORS
#ifdef CONFIG_ARCH_LOWVECTORS
.macro mksection, section, pgtable
bic \section, \pgtable, #0x000ff000
.endm
@@ -306,7 +306,6 @@ __start:
#endif /* CONFIG_PAGING */
#endif /* CONFIG_ARCH_ROMPGTABLE */
/* The following logic will set up the ARM920/ARM926 for normal operation.
*
* Here we expect to have:
arch/arm/src/imx/imx_boot.c
+1 -1
View File
@@ -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 */
arch/arm/src/imx/imx_memorymap.h
+12 -12
View File
@@ -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_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_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_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)