blob: 8a4c8604bdec51d9a0259a2a1056da7cc825c1e5 [file] [log] [blame]
From 2fae4feecea5a2dc694de19538ef3df6efc05e23 Mon Sep 17 00:00:00 2001
From: Simon Horman <horms+renesas@verge.net.au>
Date: Sat, 9 Nov 2013 08:47:45 +0900
Subject: ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig
This is required to allow the load address to be supplied
as an environment variable when building a uImage.
LOADADDR=0x40008000 ARCH=arm make uImage
This is necessary since "ARM: shmobile: Remove legacy KZM9D board code"
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 577092b3d11530acd8467074f6ea7e2dd36b5028)
(Queued by ARM-SoC for v3.14 but not yet in Linus's tree)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/configs/kzm9d_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
index 6c37f4a98eb8..e6aed23ac083 100644
--- a/arch/arm/configs/kzm9d_defconfig
+++ b/arch/arm/configs/kzm9d_defconfig
@@ -32,6 +32,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
+CONFIG_AUTO_ZRELADDR=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_PM_RUNTIME=y
--
1.8.5.rc3