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/common | |
| parent | 1e3a335beb36c0e88d75e449759d4fc54f4e299e (diff) | |
| download | px4-nuttx-ddb019413f39bbe495dba2a55c60f9ff8f8e00ce.tar.gz px4-nuttx-ddb019413f39bbe495dba2a55c60f9ff8f8e00ce.tar.bz2 px4-nuttx-ddb019413f39bbe495dba2a55c60f9ff8f8e00ce.zip | |
Finally... renamed all CONFIG_DRAM_ settings to CONFIG_RAM_
Diffstat (limited to 'nuttx/arch/arm/src/common')
| -rw-r--r-- | nuttx/arch/arm/src/common/up_allocateheap.c | 10 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/common/up_internal.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/common/up_allocateheap.c b/nuttx/arch/arm/src/common/up_allocateheap.c index ec61436e3..020d83730 100644 --- a/nuttx/arch/arm/src/common/up_allocateheap.c +++ b/nuttx/arch/arm/src/common/up_allocateheap.c @@ -111,10 +111,10 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) */ uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + CONFIG_MM_KERNEL_HEAPSIZE; - size_t usize = CONFIG_DRAM_END - ubase; + size_t usize = CONFIG_RAM_END - ubase; int log2; - DEBUGASSERT(ubase < (uintptr_t)CONFIG_DRAM_END); + DEBUGASSERT(ubase < (uintptr_t)CONFIG_RAM_END); /* Return the user-space heap settings */ @@ -127,7 +127,7 @@ 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 = CONFIG_DRAM_END - g_idle_topstack; + *heap_size = CONFIG_RAM_END - g_idle_topstack; #endif } @@ -151,10 +151,10 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) */ uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + CONFIG_MM_KERNEL_HEAPSIZE; - size_t usize = CONFIG_DRAM_END - ubase; + size_t usize = CONFIG_RAM_END - ubase; int log2; - DEBUGASSERT(ubase < (uintptr_t)CONFIG_DRAM_END); + DEBUGASSERT(ubase < (uintptr_t)CONFIG_RAM_END); /* Return the kernel heap settings (i.e., the part of the heap region * that was not dedicated to the user heap). diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index 25887770d..df5ad67a8 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/arch/arm/src/common/up_internal.h @@ -194,7 +194,7 @@ extern volatile uint32_t *current_regs; /* This is the beginning of heap as provided from up_head.S. * This is the first address in DRAM after the loaded * program+bss+idle stack. The end of the heap is - * CONFIG_DRAM_END + * CONFIG_RAM_END */ extern const uint32_t g_idle_topstack; |