diff options
author | Magnus Damm <damm@opensource.se> | 2013-06-27 08:48:07 +0900 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-17 10:04:36 +0900 |
commit | 2c408d149299e99c89fc4be80fb4fe00a7016f02 (patch) | |
tree | c014317f860487982757c9fc46f193a6c2a22c70 /arch/arm/mach-shmobile/include/mach/zboot.h | |
parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) |
ARM: shmobile: Update romImage to relocate appended DTB
Instead of relying of MACH_TYPE for board identification,
update the romImage code to relocate an appended DTB to
the beginning of RAM. This implementation is independent
of ARM_APPENDED_DTB, this because it is necessary to copy
the DTB to memory so the kernel can access it.
Without this patch Mackerel does not boot via the Mask ROM
over USB (r_usb_boot) - this since non-DT boot was broken
ages ago in commit:
0ce53cd ARM: mach-shmobile: Use DT_MACHINE for mackerel
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/zboot.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/zboot.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h index f2d8744c1f14..c3c4669a2d72 100644 --- a/arch/arm/mach-shmobile/include/mach/zboot.h +++ b/arch/arm/mach-shmobile/include/mach/zboot.h @@ -1,7 +1,6 @@ #ifndef ZBOOT_H #define ZBOOT_H -#include <asm/mach-types.h> #include <mach/zboot_macros.h> /************************************************** @@ -11,7 +10,6 @@ **************************************************/ #ifdef CONFIG_MACH_MACKEREL -#define MACH_TYPE MACH_TYPE_MACKEREL #define MEMORY_START 0x40000000 #include "mach/head-mackerel.txt" #else |