diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-17 09:24:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-17 04:12:40 -0400 |
| commit | 40c6d8aee40e373db75e6b0b4230fc8e8259d7a6 (patch) | |
| tree | 28dd575d38399a08b3c344596aafa81f554c05bb /arch/arm/mach-bcmring | |
| parent | cd227fbffa9e971ee80065de772d3201c73e1670 (diff) | |
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-bcmring')
| -rw-r--r-- | arch/arm/mach-bcmring/Makefile.boot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcmring/Makefile.boot b/arch/arm/mach-bcmring/Makefile.boot index fb53b283bebb..aef2467757fa 100644 --- a/arch/arm/mach-bcmring/Makefile.boot +++ b/arch/arm/mach-bcmring/Makefile.boot | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Address where decompressor will be written and eventually executed. | 1 | # Address where decompressor will be written and eventually executed. |
| 2 | # | 2 | # |
| 3 | # default to SDRAM | 3 | # default to SDRAM |
| 4 | zreladdr-y := $(CONFIG_BCM_ZRELADDR) | 4 | zreladdr-y += $(CONFIG_BCM_ZRELADDR) |
| 5 | params_phys-y := 0x00000800 | 5 | params_phys-y := 0x00000800 |
| 6 | 6 | ||