diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-15 16:04:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:52:41 +0100 |
| commit | 46fa9020643607c66781ef8b373f0983ca4815fb (patch) | |
| tree | cb00b96cea0d1b4bdc68b6e06f710dd63d68e9ea /include/asm-generic | |
| parent | 65f7a718e6bb943e66d4b6ccab49c3356a3ea2d0 (diff) | |
| download | barebox-46fa9020643607c66781ef8b373f0983ca4815fb.tar.gz barebox-46fa9020643607c66781ef8b373f0983ca4815fb.tar.xz | |
generic memory layout: fix deps for [MALLOC|STACK]_BASE
Defining STACK_BASE and MALLOC_BASE only makes sense when
either CONFIG_MEMORY_LAYOUT_DEFAULT or CONFIG_MEMORY_LAYOUT_FIXED
is set, so use separate #ifdefs instead ot #if/#else
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/memory_layout.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-generic/memory_layout.h b/include/asm-generic/memory_layout.h index eb1607f36d..45e0ed8023 100644 --- a/include/asm-generic/memory_layout.h +++ b/include/asm-generic/memory_layout.h @@ -2,15 +2,13 @@ #define __ASM_GENERIC_MEMORY_LAYOUT_H #ifdef CONFIG_MEMORY_LAYOUT_DEFAULT - #define MALLOC_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE) #define STACK_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE - CONFIG_STACK_SIZE) +#endif -#else - +#ifdef CONFIG_MEMORY_LAYOUT_FIXED #define STACK_BASE CONFIG_STACK_BASE #define MALLOC_BASE CONFIG_MALLOC_BASE - #endif #define HEAD_TEXT_BASE MALLOC_BASE |