summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-17 14:24:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-17 09:12:40 +0100
commit40c6d8aee40e373db75e6b0b4230fc8e8259d7a6 (patch)
tree28dd575d38399a08b3c344596aafa81f554c05bb /arch/arm/mach-davinci
parentcd227fbffa9e971ee80065de772d3201c73e1670 (diff)
downloadlinux-stable-40c6d8aee40e373db75e6b0b4230fc8e8259d7a6.tar.gz
linux-stable-40c6d8aee40e373db75e6b0b4230fc8e8259d7a6.tar.bz2
linux-stable-40c6d8aee40e373db75e6b0b4230fc8e8259d7a6.zip
ARM: 7022/1: allow to detect conflicting zreladdrs
Boards used to specify zreladdr in their Makefile.boot with zreladdr-y := x, so conflicting zreladdrs were silently overwritten. This patch changes this to zreladdr-y += x, so that we end up with multiple words in zreladdr in such a case. We can detect this later and complain if necessary. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/Makefile.boot4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/Makefile.boot b/arch/arm/mach-davinci/Makefile.boot
index db97ef2c6477..04a6c4e67b14 100644
--- a/arch/arm/mach-davinci/Makefile.boot
+++ b/arch/arm/mach-davinci/Makefile.boot
@@ -2,12 +2,12 @@ ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)
ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
$(error Cannot enable DaVinci and DA8XX platforms concurrently)
else
- zreladdr-y := 0xc0008000
+ zreladdr-y += 0xc0008000
params_phys-y := 0xc0000100
initrd_phys-y := 0xc0800000
endif
else
- zreladdr-y := 0x80008000
+ zreladdr-y += 0x80008000
params_phys-y := 0x80000100
initrd_phys-y := 0x80800000
endif