ARM: shmobile: Remove romImage CONFIG_MEMORY_START
Instead of relying on CONFIG_MEMORY_START for memory base address, let each romImage board header file specify this information. This is reworks code not to rely on CONFIG_MEMORY_START which in turn is needed for ARCH_MULTIPLATFORM. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
parent
2a58009599
commit
4f309d272f
|
@ -46,7 +46,7 @@ __image_start:
|
||||||
__image_end:
|
__image_end:
|
||||||
.long _got_end
|
.long _got_end
|
||||||
__load_base:
|
__load_base:
|
||||||
.long CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM
|
.long MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM
|
||||||
__loaded:
|
__loaded:
|
||||||
.long __continue
|
.long __continue
|
||||||
.align
|
.align
|
||||||
|
|
|
@ -12,9 +12,11 @@
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_AP4EVB
|
#ifdef CONFIG_MACH_AP4EVB
|
||||||
#define MACH_TYPE MACH_TYPE_AP4EVB
|
#define MACH_TYPE MACH_TYPE_AP4EVB
|
||||||
|
#define MEMORY_START 0x40000000
|
||||||
#include "mach/head-ap4evb.txt"
|
#include "mach/head-ap4evb.txt"
|
||||||
#elif defined(CONFIG_MACH_MACKEREL)
|
#elif defined(CONFIG_MACH_MACKEREL)
|
||||||
#define MACH_TYPE MACH_TYPE_MACKEREL
|
#define MACH_TYPE MACH_TYPE_MACKEREL
|
||||||
|
#define MEMORY_START 0x40000000
|
||||||
#include "mach/head-mackerel.txt"
|
#include "mach/head-mackerel.txt"
|
||||||
#else
|
#else
|
||||||
#error "unsupported board."
|
#error "unsupported board."
|
||||||
|
|
Loading…
Reference in New Issue