projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-shmobile
/
include
/
mach
/
zboot.h
diff --git
a/arch/arm/mach-shmobile/include/mach/zboot.h
b/arch/arm/mach-shmobile/include/mach/zboot.h
index
c3c4669
..
727cc78
100644
(file)
--- a/
arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/
arch/arm/mach-shmobile/include/mach/zboot.h
@@
-12,6
+12,9
@@
#ifdef CONFIG_MACH_MACKEREL
#define MEMORY_START 0x40000000
#include "mach/head-mackerel.txt"
#ifdef CONFIG_MACH_MACKEREL
#define MEMORY_START 0x40000000
#include "mach/head-mackerel.txt"
+#elif defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE)
+#define MEMORY_START 0x43000000
+#include "mach/head-kzm9g.txt"
#else
#error "unsupported board."
#endif
#else
#error "unsupported board."
#endif