diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-07-03 09:07:15 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-07-03 09:07:15 +0200 |
commit | 2af6483cbfd4dc57a710744356e8e6bd7c0cd77c (patch) | |
tree | 134779142314155e01ed7ea6c8c23c1d39aea109 | |
parent | b403f8d6f35272a96e9499fa77350e4e1a6909e3 (diff) | |
download | barebox-2af6483cbfd4dc57a710744356e8e6bd7c0cd77c.tar.gz barebox-2af6483cbfd4dc57a710744356e8e6bd7c0cd77c.tar.xz |
[blackfin] memory layout related compile fixes
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/blackfin/cpu-bf561/start.S | 6 | ||||
-rw-r--r-- | arch/blackfin/lib/board.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 532e477cf7..587f802992 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -3,6 +3,8 @@ config BLACKFIN bool select HAS_KALLSYMS select HAS_MODULES + select HAVE_CONFIGURABLE_MEMORY_LAYOUT + select HAVE_CONFIGURABLE_TEXT_BASE default y config BF561 diff --git a/arch/blackfin/cpu-bf561/start.S b/arch/blackfin/cpu-bf561/start.S index 99b106d98a..81efff09b6 100644 --- a/arch/blackfin/cpu-bf561/start.S +++ b/arch/blackfin/cpu-bf561/start.S @@ -34,6 +34,7 @@ #include <asm/blackfin.h> #include <asm/cpu/defBF561_extn.h> #include <asm/cpu/defBF561.h> +#include <asm-generic/memory_layout.h> .section ".text_entry","ax" @@ -173,8 +174,9 @@ loop1: /* * configure STACK */ - r0.h = hi(CONFIG_STACKBASE); - r0.l = lo(CONFIG_STACKBASE); + + r0.h = hi(STACK_BASE); + r0.l = lo(STACK_BASE); sp = r0; fp = sp; diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 37b266234b..f8451cdbf8 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -33,11 +33,12 @@ #include <environment.h> #include <mem_malloc.h> #include <asm/cpu.h> +#include <asm-generic/memory_layout.h> int blackfin_mem_malloc_init(void) { - mem_malloc_init((void *)(CONFIG_MALLOC_BASE), - (void *)(CONFIG_MALLOC_BASE + CONFIG_MALLOC_LEN)); + mem_malloc_init((void *)(MALLOC_BASE), + (void *)(MALLOC_BASE + MALLOC_SIZE)); return 0; } |