Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sascha Hauer and committed by
Russell King
40c6d8ae cd227fbf

+77 -76
+3 -3
arch/arm/mach-at91/Makefile.boot
··· 4 4 # INITRD_PHYS must be in RAM 5 5 6 6 ifeq ($(CONFIG_ARCH_AT91CAP9),y) 7 - zreladdr-y := 0x70008000 7 + zreladdr-y += 0x70008000 8 8 params_phys-y := 0x70000100 9 9 initrd_phys-y := 0x70410000 10 10 else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) 11 - zreladdr-y := 0x70008000 11 + zreladdr-y += 0x70008000 12 12 params_phys-y := 0x70000100 13 13 initrd_phys-y := 0x70410000 14 14 else 15 - zreladdr-y := 0x20008000 15 + zreladdr-y += 0x20008000 16 16 params_phys-y := 0x20000100 17 17 initrd_phys-y := 0x20410000 18 18 endif
+1 -1
arch/arm/mach-bcmring/Makefile.boot
··· 1 1 # Address where decompressor will be written and eventually executed. 2 2 # 3 3 # default to SDRAM 4 - zreladdr-y := $(CONFIG_BCM_ZRELADDR) 4 + zreladdr-y += $(CONFIG_BCM_ZRELADDR) 5 5 params_phys-y := 0x00000800 6 6
+1 -1
arch/arm/mach-clps711x/Makefile.boot
··· 1 1 # The standard locations for stuff on CLPS711x type processors 2 - zreladdr-y := 0xc0028000 2 + zreladdr-y += 0xc0028000 3 3 params_phys-y := 0xc0000100 4 4 # Should probably have some agreement on these... 5 5 initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000
+1 -1
arch/arm/mach-cns3xxx/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00C00000
+2 -2
arch/arm/mach-davinci/Makefile.boot
··· 2 2 ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y) 3 3 $(error Cannot enable DaVinci and DA8XX platforms concurrently) 4 4 else 5 - zreladdr-y := 0xc0008000 5 + zreladdr-y += 0xc0008000 6 6 params_phys-y := 0xc0000100 7 7 initrd_phys-y := 0xc0800000 8 8 endif 9 9 else 10 - zreladdr-y := 0x80008000 10 + zreladdr-y += 0x80008000 11 11 params_phys-y := 0x80000100 12 12 initrd_phys-y := 0x80800000 13 13 endif
+1 -1
arch/arm/mach-dove/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-ebsa110/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000400 3 3 initrd_phys-y := 0x00800000 4 4
+5 -5
arch/arm/mach-ep93xx/Makefile.boot
··· 1 - zreladdr-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00008000 1 + zreladdr-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) += 0x00008000 2 2 params_phys-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00000100 3 3 4 - zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0008000 4 + zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) += 0xc0008000 5 5 params_phys-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0000100 6 6 7 - zreladdr-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) := 0xd0008000 7 + zreladdr-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) += 0xd0008000 8 8 params_phys-$(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) := 0xd0000100 9 9 10 - zreladdr-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) := 0xe0008000 10 + zreladdr-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) += 0xe0008000 11 11 params_phys-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) := 0xe0000100 12 12 13 - zreladdr-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) := 0xf0008000 13 + zreladdr-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) += 0xf0008000 14 14 params_phys-$(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) := 0xf0000100
+1 -1
arch/arm/mach-exynos4/Makefile.boot
··· 1 - zreladdr-y := 0x40008000 1 + zreladdr-y += 0x40008000 2 2 params_phys-y := 0x40000100
+1 -1
arch/arm/mach-footbridge/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000 4 4
+2 -2
arch/arm/mach-gemini/Makefile.boot
··· 1 1 ifeq ($(CONFIG_GEMINI_MEM_SWAP),y) 2 - zreladdr-y := 0x00008000 2 + zreladdr-y += 0x00008000 3 3 params_phys-y := 0x00000100 4 4 initrd_phys-y := 0x00800000 5 5 else 6 - zreladdr-y := 0x10008000 6 + zreladdr-y += 0x10008000 7 7 params_phys-y := 0x10000100 8 8 initrd_phys-y := 0x10800000 9 9 endif
+1 -1
arch/arm/mach-h720x/Makefile.boot
··· 1 - zreladdr-$(CONFIG_ARCH_H720X) := 0x40008000 1 + zreladdr-$(CONFIG_ARCH_H720X) += 0x40008000 2 2
+5 -5
arch/arm/mach-imx/Makefile.boot
··· 1 - zreladdr-$(CONFIG_ARCH_MX1) := 0x08008000 1 + zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000 2 2 params_phys-$(CONFIG_ARCH_MX1) := 0x08000100 3 3 initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000 4 4 5 - zreladdr-$(CONFIG_MACH_MX21) := 0xC0008000 5 + zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000 6 6 params_phys-$(CONFIG_MACH_MX21) := 0xC0000100 7 7 initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000 8 8 9 - zreladdr-$(CONFIG_ARCH_MX25) := 0x80008000 9 + zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000 10 10 params_phys-$(CONFIG_ARCH_MX25) := 0x80000100 11 11 initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000 12 12 13 - zreladdr-$(CONFIG_MACH_MX27) := 0xA0008000 13 + zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000 14 14 params_phys-$(CONFIG_MACH_MX27) := 0xA0000100 15 15 initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000 16 16 17 - zreladdr-$(CONFIG_ARCH_MX3) := 0x80008000 17 + zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000 18 18 params_phys-$(CONFIG_ARCH_MX3) := 0x80000100 19 19 initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000
+1 -1
arch/arm/mach-integrator/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000 4 4
+1 -1
arch/arm/mach-iop13xx/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-iop32x/Makefile.boot
··· 1 - zreladdr-y := 0xa0008000 1 + zreladdr-y += 0xa0008000 2 2 params_phys-y := 0xa0000100 3 3 initrd_phys-y := 0xa0800000
+1 -1
arch/arm/mach-iop33x/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-ixp2000/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3
+1 -1
arch/arm/mach-ixp23xx/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100
+1 -1
arch/arm/mach-ixp4xx/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3
+1 -1
arch/arm/mach-kirkwood/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-ks8695/Makefile.boot
··· 3 3 # PARAMS_PHYS must be within 4MB of ZRELADDR 4 4 # INITRD_PHYS must be in RAM 5 5 6 - zreladdr-y := 0x00008000 6 + zreladdr-y += 0x00008000 7 7 params_phys-y := 0x00000100 8 8 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-lpc32xx/Makefile.boot
··· 1 - zreladdr-y := 0x80008000 1 + zreladdr-y += 0x80008000 2 2 params_phys-y := 0x80000100 3 3 initrd_phys-y := 0x82000000 4 4
+1 -1
arch/arm/mach-mmp/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000
+1 -1
arch/arm/mach-msm/Makefile.boot
··· 1 - zreladdr-y := 0x10008000 1 + zreladdr-y += 0x10008000 2 2 params_phys-y := 0x10000100 3 3 initrd_phys-y := 0x10800000
+1 -1
arch/arm/mach-mv78xx0/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+3 -3
arch/arm/mach-mx5/Makefile.boot
··· 1 - zreladdr-$(CONFIG_ARCH_MX50) := 0x70008000 1 + zreladdr-$(CONFIG_ARCH_MX50) += 0x70008000 2 2 params_phys-$(CONFIG_ARCH_MX50) := 0x70000100 3 3 initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000 4 - zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000 4 + zreladdr-$(CONFIG_ARCH_MX51) += 0x90008000 5 5 params_phys-$(CONFIG_ARCH_MX51) := 0x90000100 6 6 initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000 7 - zreladdr-$(CONFIG_ARCH_MX53) := 0x70008000 7 + zreladdr-$(CONFIG_ARCH_MX53) += 0x70008000 8 8 params_phys-$(CONFIG_ARCH_MX53) := 0x70000100 9 9 initrd_phys-$(CONFIG_ARCH_MX53) := 0x70800000
+1 -1
arch/arm/mach-mxs/Makefile.boot
··· 1 - zreladdr-y := 0x40008000 1 + zreladdr-y += 0x40008000
+1 -1
arch/arm/mach-netx/Makefile.boot
··· 1 - zreladdr-y := 0x80008000 1 + zreladdr-y += 0x80008000 2 2
+1 -1
arch/arm/mach-nomadik/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000 4 4
+1 -1
arch/arm/mach-nuc93x/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3
+1 -1
arch/arm/mach-omap1/Makefile.boot
··· 1 - zreladdr-y := 0x10008000 1 + zreladdr-y += 0x10008000 2 2 params_phys-y := 0x10000100 3 3 initrd_phys-y := 0x10800000
+1 -1
arch/arm/mach-omap2/Makefile.boot
··· 1 - zreladdr-y := 0x80008000 1 + zreladdr-y += 0x80008000 2 2 params_phys-y := 0x80000100 3 3 initrd_phys-y := 0x80800000
+1 -1
arch/arm/mach-orion5x/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-pnx4008/Makefile.boot
··· 1 - zreladdr-y := 0x80008000 1 + zreladdr-y += 0x80008000 2 2 params_phys-y := 0x80000100 3 3 initrd_phys-y := 0x80800000 4 4
+1 -1
arch/arm/mach-prima2/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-pxa/Makefile.boot
··· 1 - zreladdr-y := 0xa0008000 1 + zreladdr-y += 0xa0008000 2 2
+2 -2
arch/arm/mach-realview/Makefile.boot
··· 1 1 ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y) 2 - zreladdr-y := 0x70008000 2 + zreladdr-y += 0x70008000 3 3 params_phys-y := 0x70000100 4 4 initrd_phys-y := 0x70800000 5 5 else 6 - zreladdr-y := 0x00008000 6 + zreladdr-y += 0x00008000 7 7 params_phys-y := 0x00000100 8 8 initrd_phys-y := 0x00800000 9 9 endif
+1 -1
arch/arm/mach-rpc/Makefile.boot
··· 1 - zreladdr-y := 0x10008000 1 + zreladdr-y += 0x10008000 2 2 params_phys-y := 0x10000100 3 3 initrd_phys-y := 0x18000000 4 4
+2 -2
arch/arm/mach-s3c2410/Makefile.boot
··· 1 1 ifeq ($(CONFIG_PM_H1940),y) 2 - zreladdr-y := 0x30108000 2 + zreladdr-y += 0x30108000 3 3 params_phys-y := 0x30100100 4 4 else 5 - zreladdr-y := 0x30008000 5 + zreladdr-y += 0x30008000 6 6 params_phys-y := 0x30000100 7 7 endif
+1 -1
arch/arm/mach-s3c64xx/Makefile.boot
··· 1 - zreladdr-y := 0x50008000 1 + zreladdr-y += 0x50008000 2 2 params_phys-y := 0x50000100
+1 -1
arch/arm/mach-s5p64x0/Makefile.boot
··· 1 - zreladdr-y := 0x20008000 1 + zreladdr-y += 0x20008000 2 2 params_phys-y := 0x20000100
+1 -1
arch/arm/mach-s5pc100/Makefile.boot
··· 1 - zreladdr-y := 0x20008000 1 + zreladdr-y += 0x20008000 2 2 params_phys-y := 0x20000100
+1 -1
arch/arm/mach-s5pv210/Makefile.boot
··· 1 - zreladdr-y := 0x20008000 1 + zreladdr-y += 0x20008000 2 2 params_phys-y := 0x20000100
+3 -2
arch/arm/mach-sa1100/Makefile.boot
··· 1 - zreladdr-y := 0xc0008000 2 1 ifeq ($(CONFIG_ARCH_SA1100),y) 3 - zreladdr-$(CONFIG_SA1111) := 0xc0208000 2 + zreladdr-$(CONFIG_SA1111) += 0xc0208000 3 + else 4 + zreladdr-y += 0xc0008000 4 5 endif 5 6 params_phys-y := 0xc0000100 6 7 initrd_phys-y := 0xc0800000
+1 -1
arch/arm/mach-shark/Makefile.boot
··· 1 - zreladdr-y := 0x08008000 1 + zreladdr-y += 0x08008000 2 2
+1 -1
arch/arm/mach-shmobile/Makefile.boot
··· 1 1 __ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ 2 2 $$[$(CONFIG_MEMORY_START) + 0x8000]') 3 3 4 - zreladdr-y := $(__ZRELADDR) 4 + zreladdr-y += $(__ZRELADDR) 5 5 6 6 # Unsupported legacy stuff 7 7 #
+1 -1
arch/arm/mach-spear3xx/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-spear6xx/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000
+1 -1
arch/arm/mach-tcc8k/Makefile.boot
··· 1 - zreladdr-y := 0x20008000 1 + zreladdr-y += 0x20008000 2 2 params_phys-y := 0x20000100 3 3 initrd_phys-y := 0x20800000
+1 -1
arch/arm/mach-tegra/Makefile.boot
··· 1 - zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00008000 1 + zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) += 0x00008000 2 2 params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100 3 3 initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000 4 4
+2 -2
arch/arm/mach-u300/Makefile.boot
··· 4 4 # INITRD_PHYS must be in RAM 5 5 6 6 ifdef CONFIG_MACH_U300_SINGLE_RAM 7 - zreladdr-y := 0x28E08000 7 + zreladdr-y += 0x28E08000 8 8 params_phys-y := 0x28E00100 9 9 else 10 - zreladdr-y := 0x48008000 10 + zreladdr-y += 0x48008000 11 11 params_phys-y := 0x48000100 12 12 endif 13 13
+1 -1
arch/arm/mach-ux500/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000 4 4
+1 -1
arch/arm/mach-versatile/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000 4 4
+1 -1
arch/arm/mach-vexpress/Makefile.boot
··· 1 - zreladdr-y := 0x60008000 1 + zreladdr-y += 0x60008000 2 2 params_phys-y := 0x60000100 3 3 initrd_phys-y := 0x60800000
+1 -1
arch/arm/mach-vt8500/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x01000000
+1 -1
arch/arm/mach-w90x900/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3
+1 -1
arch/arm/mach-zynq/Makefile.boot
··· 1 - zreladdr-y := 0x00008000 1 + zreladdr-y += 0x00008000 2 2 params_phys-y := 0x00000100 3 3 initrd_phys-y := 0x00800000