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>
This commit is contained in:
parent
65f7a718e6
commit
46fa902064
|
@ -2,15 +2,13 @@
|
||||||
#define __ASM_GENERIC_MEMORY_LAYOUT_H
|
#define __ASM_GENERIC_MEMORY_LAYOUT_H
|
||||||
|
|
||||||
#ifdef CONFIG_MEMORY_LAYOUT_DEFAULT
|
#ifdef CONFIG_MEMORY_LAYOUT_DEFAULT
|
||||||
|
|
||||||
#define MALLOC_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE)
|
#define MALLOC_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE)
|
||||||
#define STACK_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE - CONFIG_STACK_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 STACK_BASE CONFIG_STACK_BASE
|
||||||
#define MALLOC_BASE CONFIG_MALLOC_BASE
|
#define MALLOC_BASE CONFIG_MALLOC_BASE
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define HEAD_TEXT_BASE MALLOC_BASE
|
#define HEAD_TEXT_BASE MALLOC_BASE
|
||||||
|
|
Loading…
Reference in New Issue