diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-17 15:24:52 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-17 10:12:40 +0200 |
| commit | 40c6d8aee40e373db75e6b0b4230fc8e8259d7a6 (patch) | |
| tree | 28dd575d38399a08b3c344596aafa81f554c05bb /arch/arm/mach-s3c2410/Makefile.boot | |
| parent | ARM: 7021/1: Check for multiple load addresses before building a uImage (diff) | |
| download | linux-40c6d8aee40e373db75e6b0b4230fc8e8259d7a6.tar.xz linux-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-s3c2410/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-s3c2410/Makefile.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile.boot b/arch/arm/mach-s3c2410/Makefile.boot index 58c1dd7f8e1d..4457605ba04a 100644 --- a/arch/arm/mach-s3c2410/Makefile.boot +++ b/arch/arm/mach-s3c2410/Makefile.boot @@ -1,7 +1,7 @@ ifeq ($(CONFIG_PM_H1940),y) - zreladdr-y := 0x30108000 + zreladdr-y += 0x30108000 params_phys-y := 0x30100100 else - zreladdr-y := 0x30008000 + zreladdr-y += 0x30008000 params_phys-y := 0x30000100 endif |