diff options
| author | Magnus Damm <damm@opensource.se> | 2013-06-05 16:55:31 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-12 20:49:57 +0900 |
| commit | 4f309d272f7139278f52cf1e2dcf5b2bc8c029d9 (patch) | |
| tree | 4d9b44880dd88ba4cdde634ad13c8fe92a477f4b | |
| parent | 2a58009599ff0d2bdbe7e3a9a11a0d838868634d (diff) | |
| download | op-kernel-dev-4f309d272f7139278f52cf1e2dcf5b2bc8c029d9.zip op-kernel-dev-4f309d272f7139278f52cf1e2dcf5b2bc8c029d9.tar.gz | |
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>
| -rw-r--r-- | arch/arm/boot/compressed/head-shmobile.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/zboot.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head-shmobile.S b/arch/arm/boot/compressed/head-shmobile.S index 19b2304..e2d6363 100644 --- a/arch/arm/boot/compressed/head-shmobile.S +++ b/arch/arm/boot/compressed/head-shmobile.S @@ -46,7 +46,7 @@ __image_start: __image_end: .long _got_end __load_base: - .long CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM + .long MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM __loaded: .long __continue .align diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h index 9320aff..308b5cf 100644 --- a/arch/arm/mach-shmobile/include/mach/zboot.h +++ b/arch/arm/mach-shmobile/include/mach/zboot.h @@ -12,9 +12,11 @@ #ifdef CONFIG_MACH_AP4EVB #define MACH_TYPE MACH_TYPE_AP4EVB +#define MEMORY_START 0x40000000 #include "mach/head-ap4evb.txt" #elif defined(CONFIG_MACH_MACKEREL) #define MACH_TYPE MACH_TYPE_MACKEREL +#define MEMORY_START 0x40000000 #include "mach/head-mackerel.txt" #else #error "unsupported board." |
