Skip to content

Commit

Permalink
ARM: shmobile: Remove romImage CONFIG_MEMORY_START
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Simon Horman committed Jun 12, 2013
1 parent 2a58009 commit 4f309d2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/head-shmobile.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-shmobile/include/mach/zboot.h
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 4f309d2

Please sign in to comment.