Commit 40c6d8ae authored by Sascha Hauer's avatar Sascha Hauer Committed by Russell King

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cd227fbf
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
# INITRD_PHYS must be in RAM # INITRD_PHYS must be in RAM
ifeq ($(CONFIG_ARCH_AT91CAP9),y) ifeq ($(CONFIG_ARCH_AT91CAP9),y)
zreladdr-y := 0x70008000 zreladdr-y += 0x70008000
params_phys-y := 0x70000100 params_phys-y := 0x70000100
initrd_phys-y := 0x70410000 initrd_phys-y := 0x70410000
else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
zreladdr-y := 0x70008000 zreladdr-y += 0x70008000
params_phys-y := 0x70000100 params_phys-y := 0x70000100
initrd_phys-y := 0x70410000 initrd_phys-y := 0x70410000
else else
zreladdr-y := 0x20008000 zreladdr-y += 0x20008000
params_phys-y := 0x20000100 params_phys-y := 0x20000100
initrd_phys-y := 0x20410000 initrd_phys-y := 0x20410000
endif endif
# Address where decompressor will be written and eventually executed. # Address where decompressor will be written and eventually executed.
# #
# default to SDRAM # default to SDRAM
zreladdr-y := $(CONFIG_BCM_ZRELADDR) zreladdr-y += $(CONFIG_BCM_ZRELADDR)
params_phys-y := 0x00000800 params_phys-y := 0x00000800
# The standard locations for stuff on CLPS711x type processors # The standard locations for stuff on CLPS711x type processors
zreladdr-y := 0xc0028000 zreladdr-y += 0xc0028000
params_phys-y := 0xc0000100 params_phys-y := 0xc0000100
# Should probably have some agreement on these... # Should probably have some agreement on these...
initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000 initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000
......
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00C00000 initrd_phys-y := 0x00C00000
...@@ -2,12 +2,12 @@ ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y) ...@@ -2,12 +2,12 @@ ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)
ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y) ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
$(error Cannot enable DaVinci and DA8XX platforms concurrently) $(error Cannot enable DaVinci and DA8XX platforms concurrently)
else else
zreladdr-y := 0xc0008000 zreladdr-y += 0xc0008000
params_phys-y := 0xc0000100 params_phys-y := 0xc0000100
initrd_phys-y := 0xc0800000 initrd_phys-y := 0xc0800000
endif endif
else else
zreladdr-y := 0x80008000 zreladdr-y += 0x80008000
params_phys-y := 0x80000100 params_phys-y := 0x80000100
initrd_phys-y := 0x80800000 initrd_phys-y := 0x80800000
endif endif
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000400 params_phys-y := 0x00000400
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00008000 zreladdr-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) += 0x00008000
params_phys-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00000100 params_phys-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00000100
zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0008000 zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) += 0xc0008000
params_phys-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0000100 params_phys-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0000100
zreladdr-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) := 0xd0008000 zreladdr-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) += 0xd0008000
params_phys-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) := 0xd0000100 params_phys-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) := 0xd0000100
zreladdr-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) := 0xe0008000 zreladdr-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) += 0xe0008000
params_phys-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) := 0xe0000100 params_phys-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) := 0xe0000100
zreladdr-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) := 0xf0008000 zreladdr-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) += 0xf0008000
params_phys-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) := 0xf0000100 params_phys-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) := 0xf0000100
zreladdr-y := 0x40008000 zreladdr-y += 0x40008000
params_phys-y := 0x40000100 params_phys-y := 0x40000100
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
ifeq ($(CONFIG_GEMINI_MEM_SWAP),y) ifeq ($(CONFIG_GEMINI_MEM_SWAP),y)
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
else else
zreladdr-y := 0x10008000 zreladdr-y += 0x10008000
params_phys-y := 0x10000100 params_phys-y := 0x10000100
initrd_phys-y := 0x10800000 initrd_phys-y := 0x10800000
endif endif
zreladdr-$(CONFIG_ARCH_H720X) := 0x40008000 zreladdr-$(CONFIG_ARCH_H720X) += 0x40008000
zreladdr-$(CONFIG_ARCH_MX1) := 0x08008000 zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000
params_phys-$(CONFIG_ARCH_MX1) := 0x08000100 params_phys-$(CONFIG_ARCH_MX1) := 0x08000100
initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000 initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000
zreladdr-$(CONFIG_MACH_MX21) := 0xC0008000 zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000
params_phys-$(CONFIG_MACH_MX21) := 0xC0000100 params_phys-$(CONFIG_MACH_MX21) := 0xC0000100
initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000 initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000
zreladdr-$(CONFIG_ARCH_MX25) := 0x80008000 zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000
params_phys-$(CONFIG_ARCH_MX25) := 0x80000100 params_phys-$(CONFIG_ARCH_MX25) := 0x80000100
initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000 initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000
zreladdr-$(CONFIG_MACH_MX27) := 0xA0008000 zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000
params_phys-$(CONFIG_MACH_MX27) := 0xA0000100 params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000 initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
zreladdr-$(CONFIG_ARCH_MX3) := 0x80008000 zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000
params_phys-$(CONFIG_ARCH_MX3) := 0x80000100 params_phys-$(CONFIG_ARCH_MX3) := 0x80000100
initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000 initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0xa0008000 zreladdr-y += 0xa0008000
params_phys-y := 0xa0000100 params_phys-y := 0xa0000100
initrd_phys-y := 0xa0800000 initrd_phys-y := 0xa0800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
# PARAMS_PHYS must be within 4MB of ZRELADDR # PARAMS_PHYS must be within 4MB of ZRELADDR
# INITRD_PHYS must be in RAM # INITRD_PHYS must be in RAM
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x80008000 zreladdr-y += 0x80008000
params_phys-y := 0x80000100 params_phys-y := 0x80000100
initrd_phys-y := 0x82000000 initrd_phys-y := 0x82000000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
zreladdr-y := 0x10008000 zreladdr-y += 0x10008000
params_phys-y := 0x10000100 params_phys-y := 0x10000100
initrd_phys-y := 0x10800000 initrd_phys-y := 0x10800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-$(CONFIG_ARCH_MX50) := 0x70008000 zreladdr-$(CONFIG_ARCH_MX50) += 0x70008000
params_phys-$(CONFIG_ARCH_MX50) := 0x70000100 params_phys-$(CONFIG_ARCH_MX50) := 0x70000100
initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000 initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000
zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000 zreladdr-$(CONFIG_ARCH_MX51) += 0x90008000
params_phys-$(CONFIG_ARCH_MX51) := 0x90000100 params_phys-$(CONFIG_ARCH_MX51) := 0x90000100
initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000 initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000
zreladdr-$(CONFIG_ARCH_MX53) := 0x70008000 zreladdr-$(CONFIG_ARCH_MX53) += 0x70008000
params_phys-$(CONFIG_ARCH_MX53) := 0x70000100 params_phys-$(CONFIG_ARCH_MX53) := 0x70000100
initrd_phys-$(CONFIG_ARCH_MX53) := 0x70800000 initrd_phys-$(CONFIG_ARCH_MX53) := 0x70800000
zreladdr-y := 0x40008000 zreladdr-y += 0x40008000
zreladdr-y := 0x80008000 zreladdr-y += 0x80008000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
zreladdr-y := 0x10008000 zreladdr-y += 0x10008000
params_phys-y := 0x10000100 params_phys-y := 0x10000100
initrd_phys-y := 0x10800000 initrd_phys-y := 0x10800000
zreladdr-y := 0x80008000 zreladdr-y += 0x80008000
params_phys-y := 0x80000100 params_phys-y := 0x80000100
initrd_phys-y := 0x80800000 initrd_phys-y := 0x80800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x80008000 zreladdr-y += 0x80008000
params_phys-y := 0x80000100 params_phys-y := 0x80000100
initrd_phys-y := 0x80800000 initrd_phys-y := 0x80800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0xa0008000 zreladdr-y += 0xa0008000
ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y) ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y)
zreladdr-y := 0x70008000 zreladdr-y += 0x70008000
params_phys-y := 0x70000100 params_phys-y := 0x70000100
initrd_phys-y := 0x70800000 initrd_phys-y := 0x70800000
else else
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
endif endif
zreladdr-y := 0x10008000 zreladdr-y += 0x10008000
params_phys-y := 0x10000100 params_phys-y := 0x10000100
initrd_phys-y := 0x18000000 initrd_phys-y := 0x18000000
ifeq ($(CONFIG_PM_H1940),y) ifeq ($(CONFIG_PM_H1940),y)
zreladdr-y := 0x30108000 zreladdr-y += 0x30108000
params_phys-y := 0x30100100 params_phys-y := 0x30100100
else else
zreladdr-y := 0x30008000 zreladdr-y += 0x30008000
params_phys-y := 0x30000100 params_phys-y := 0x30000100
endif endif
zreladdr-y := 0x50008000 zreladdr-y += 0x50008000
params_phys-y := 0x50000100 params_phys-y := 0x50000100
zreladdr-y := 0x20008000 zreladdr-y += 0x20008000
params_phys-y := 0x20000100 params_phys-y := 0x20000100
zreladdr-y := 0x20008000 zreladdr-y += 0x20008000
params_phys-y := 0x20000100 params_phys-y := 0x20000100
zreladdr-y := 0x20008000 zreladdr-y += 0x20008000
params_phys-y := 0x20000100 params_phys-y := 0x20000100
zreladdr-y := 0xc0008000
ifeq ($(CONFIG_ARCH_SA1100),y) ifeq ($(CONFIG_ARCH_SA1100),y)
zreladdr-$(CONFIG_SA1111) := 0xc0208000 zreladdr-$(CONFIG_SA1111) += 0xc0208000
else
zreladdr-y += 0xc0008000
endif endif
params_phys-y := 0xc0000100 params_phys-y := 0xc0000100
initrd_phys-y := 0xc0800000 initrd_phys-y := 0xc0800000
......
zreladdr-y := 0x08008000 zreladdr-y += 0x08008000
__ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ __ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \
$$[$(CONFIG_MEMORY_START) + 0x8000]') $$[$(CONFIG_MEMORY_START) + 0x8000]')
zreladdr-y := $(__ZRELADDR) zreladdr-y += $(__ZRELADDR)
# Unsupported legacy stuff # Unsupported legacy stuff
# #
......
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x20008000 zreladdr-y += 0x20008000
params_phys-y := 0x20000100 params_phys-y := 0x20000100
initrd_phys-y := 0x20800000 initrd_phys-y := 0x20800000
zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00008000 zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) += 0x00008000
params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100 params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100
initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000 initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
# INITRD_PHYS must be in RAM # INITRD_PHYS must be in RAM
ifdef CONFIG_MACH_U300_SINGLE_RAM ifdef CONFIG_MACH_U300_SINGLE_RAM
zreladdr-y := 0x28E08000 zreladdr-y += 0x28E08000
params_phys-y := 0x28E00100 params_phys-y := 0x28E00100
else else
zreladdr-y := 0x48008000 zreladdr-y += 0x48008000
params_phys-y := 0x48000100 params_phys-y := 0x48000100
endif endif
......
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
zreladdr-y := 0x60008000 zreladdr-y += 0x60008000
params_phys-y := 0x60000100 params_phys-y := 0x60000100
initrd_phys-y := 0x60800000 initrd_phys-y := 0x60800000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x01000000 initrd_phys-y := 0x01000000
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
zreladdr-y := 0x00008000 zreladdr-y += 0x00008000
params_phys-y := 0x00000100 params_phys-y := 0x00000100
initrd_phys-y := 0x00800000 initrd_phys-y := 0x00800000
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment