diff options
| author | Magnus Damm <damm@opensource.se> | 2013-06-10 05:28:57 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-06-12 07:49:56 -0400 |
| commit | 12dca809ef785e451263351325d4806198040b40 (patch) | |
| tree | d9a9780f0ac8bd6c4bcc710df04652a24dc2b2d7 | |
| parent | 5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb (diff) | |
ARM: shmobile: uImage load address rework
This is V2 of the mach-shmobile uImage load address rework patch.
Rework the mach-shmobile uImage load address calculation by storing
the per-board load addresses in Makefile.boot. This removes the
CONFIG_MEMORY_START dependency from Makefile.boot, and it also makes
it possible to create safe kernel images that boot on multiple boards.
This is one of several series of code that reworks code not to rely on
CONFIG_MEMORY_START/SIZE which in turn is needed for ARCH_MULTIPLATFORM.
Signed-off-by: Magnus Damm <damm@opensource.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile.boot | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot index 498efd99338d..6b147ea21769 100644 --- a/arch/arm/mach-shmobile/Makefile.boot +++ b/arch/arm/mach-shmobile/Makefile.boot | |||
| @@ -1,6 +1,22 @@ | |||
| 1 | __ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ | 1 | # per-board load address for uImage |
| 2 | $$[$(CONFIG_MEMORY_START) + 0x8000]') | 2 | loadaddr-y := |
| 3 | loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000 | ||
| 4 | loadaddr-$(CONFIG_MACH_AP4EVB) += 0x40008000 | ||
| 5 | loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000 | ||
| 6 | loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 | ||
| 7 | loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 | ||
| 8 | loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 | ||
| 9 | loadaddr-$(CONFIG_MACH_BONITO) += 0x40008000 | ||
| 10 | loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000 | ||
| 11 | loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 | ||
| 12 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 | ||
| 13 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 | ||
| 14 | loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 | ||
| 15 | loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000 | ||
| 16 | loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000 | ||
| 17 | loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000 | ||
| 3 | 18 | ||
| 19 | __ZRELADDR := $(sort $(loadaddr-y)) | ||
| 4 | zreladdr-y += $(__ZRELADDR) | 20 | zreladdr-y += $(__ZRELADDR) |
| 5 | 21 | ||
| 6 | # Unsupported legacy stuff | 22 | # Unsupported legacy stuff |