diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-07-26 10:09:17 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-07-26 10:09:17 -0600 |
| commit | ddb019413f39bbe495dba2a55c60f9ff8f8e00ce (patch) | |
| tree | 9637f5cb852af32d6a500699ac6c16b25342dd8c /nuttx/arch/arm/src/dm320 | |
| parent | 1e3a335beb36c0e88d75e449759d4fc54f4e299e (diff) | |
| download | nuttx-ddb019413f39bbe495dba2a55c60f9ff8f8e00ce.tar.gz nuttx-ddb019413f39bbe495dba2a55c60f9ff8f8e00ce.tar.bz2 nuttx-ddb019413f39bbe495dba2a55c60f9ff8f8e00ce.zip | |
Finally... renamed all CONFIG_DRAM_ settings to CONFIG_RAM_
Diffstat (limited to 'nuttx/arch/arm/src/dm320')
| -rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_allocateheap.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_memorymap.h | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_restart.S | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/dm320/dm320_allocateheap.c b/nuttx/arch/arm/src/dm320/dm320_allocateheap.c index 27a7e7a90..50b1b36e1 100644 --- a/nuttx/arch/arm/src/dm320/dm320_allocateheap.c +++ b/nuttx/arch/arm/src/dm320/dm320_allocateheap.c @@ -86,5 +86,5 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) { up_ledon(LED_HEAPALLOCATE); *heap_start = (FAR void*)g_idle_topstack; - *heap_size = (DM320_SDRAM_VADDR + CONFIG_DRAM_SIZE) - g_idle_topstack; + *heap_size = (DM320_SDRAM_VADDR + CONFIG_RAM_SIZE) - g_idle_topstack; } diff --git a/nuttx/arch/arm/src/dm320/dm320_memorymap.h b/nuttx/arch/arm/src/dm320/dm320_memorymap.h index a8aafbb71..b800bf1de 100644 --- a/nuttx/arch/arm/src/dm320/dm320_memorymap.h +++ b/nuttx/arch/arm/src/dm320/dm320_memorymap.h @@ -137,8 +137,8 @@ /* DM320 Virtual Memory Map */ -#if CONFIG_DRAM_VSTART != 0x00000000 -# error "Invalid setting for CONFIG_DRAM_VSTART" +#if CONFIG_RAM_VSTART != 0x00000000 +# error "Invalid setting for CONFIG_RAM_VSTART" #endif /* Section/Region Name Virt Address End Size CW */ diff --git a/nuttx/arch/arm/src/dm320/dm320_restart.S b/nuttx/arch/arm/src/dm320/dm320_restart.S index 7e25d8ff2..a3904a442 100644 --- a/nuttx/arch/arm/src/dm320/dm320_restart.S +++ b/nuttx/arch/arm/src/dm320/dm320_restart.S @@ -121,7 +121,7 @@ up_phyrestart: .type .LCphysrestart, %object .LCphysrestart: - .long (up_phyrestart - CONFIG_DRAM_VSTART - CONFIG_DRAM_START) + .long (up_phyrestart - CONFIG_RAM_VSTART - CONFIG_RAM_START) .LCbtldrentry: .long DM320_EXT_MEM_PADDR |