summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-06-04 11:43:10 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2008-06-04 11:54:03 +0200
commit596c8450727ff2c9e2a8053e83280682d813c82f (patch)
treeb1623de1d69f75765cffd8db50083a6faa64c8b4 /commands
parent9e6ee5e79516f5af5366bd95fab801a692728373 (diff)
downloadbarebox-596c8450727ff2c9e2a8053e83280682d813c82f.tar.gz
barebox-596c8450727ff2c9e2a8053e83280682d813c82f.tar.xz
[memory layout]: streamline memory layout
Memory layout can now be specified via kconfig options. Two possibilities exist: default layout means the layout is stack / malloc heap / U-Boot. The user can also specify fixed addresses for each TEXT_BASE / stack / malloc heap.
Diffstat (limited to 'commands')
-rw-r--r--commands/bootm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index e210059aa2..9b0a158796 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -42,6 +42,7 @@
#include <boot.h>
#include <rtc.h>
#include <init.h>
+#include <asm-generic/memory_layout.h>
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h>
@@ -223,7 +224,7 @@ int relocate_image(struct image_handle *handle, void *load_address)
*/
if (BZ2_bzBuffToBuffDecompress (load_address,
&unc_len, (char *)data, len,
- CFG_MALLOC_LEN < (4096 * 1024), 0)
+ MALLOC_SIZE < (4096 * 1024), 0)
!= BZ_OK)
return -1;
break;