kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: 7022/1: allow to detect conflicting zreladdrs

Browse source 
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>
This commit is contained in:
Sascha Hauer 2011-08-17 14:24:52 +01:00 committed by Russell King
parent cd227fbffa
commit 40c6d8aee4
58 changed files with 77 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-at91/Makefile.boot
View file

@ -4,15 +4,15 @@
# INITRD_PHYS must be in RAM
ifeq ($(CONFIG_ARCH_AT91CAP9),y)
zreladdr-y := 0x70008000
zreladdr-y += 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
zreladdr-y := 0x70008000
zreladdr-y += 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else
zreladdr-y := 0x20008000
zreladdr-y += 0x20008000
params_phys-y := 0x20000100
initrd_phys-y := 0x20410000
endif

2
arch/arm/mach-bcmring/Makefile.boot
View file

@ -1,6 +1,6 @@
# Address where decompressor will be written and eventually executed.
#
# default to SDRAM
zreladdr-y := $(CONFIG_BCM_ZRELADDR)
zreladdr-y += $(CONFIG_BCM_ZRELADDR)
params_phys-y := 0x00000800

2
arch/arm/mach-clps711x/Makefile.boot
View file

@ -1,5 +1,5 @@
# The standard locations for stuff on CLPS711x type processors
zreladdr-y := 0xc0028000
zreladdr-y += 0xc0028000
params_phys-y := 0xc0000100
# Should probably have some agreement on these...
initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000

2
arch/arm/mach-cns3xxx/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00C00000

4
arch/arm/mach-davinci/Makefile.boot
View file

@ -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

2
arch/arm/mach-dove/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-ebsa110/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000400
initrd_phys-y := 0x00800000

10
arch/arm/mach-ep93xx/Makefile.boot
View file

@ -1,14 +1,14 @@
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
zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0008000
zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) += 0xc0008000
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
zreladdr-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) := 0xe0008000
zreladdr-$(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) += 0xe0008000
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

2
arch/arm/mach-exynos4/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x40008000
zreladdr-y += 0x40008000
params_phys-y := 0x40000100

2
arch/arm/mach-footbridge/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

4
arch/arm/mach-gemini/Makefile.boot
View file

@ -1,9 +1,9 @@
ifeq ($(CONFIG_GEMINI_MEM_SWAP),y)
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
else
zreladdr-y := 0x10008000
zreladdr-y += 0x10008000
params_phys-y := 0x10000100
initrd_phys-y := 0x10800000
endif

2
arch/arm/mach-h720x/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-$(CONFIG_ARCH_H720X) := 0x40008000
zreladdr-$(CONFIG_ARCH_H720X) += 0x40008000

10
arch/arm/mach-imx/Makefile.boot
View file

@ -1,19 +1,19 @@
zreladdr-$(CONFIG_ARCH_MX1) := 0x08008000
zreladdr-$(CONFIG_ARCH_MX1) += 0x08008000
params_phys-$(CONFIG_ARCH_MX1) := 0x08000100
initrd_phys-$(CONFIG_ARCH_MX1) := 0x08800000
zreladdr-$(CONFIG_MACH_MX21) := 0xC0008000
zreladdr-$(CONFIG_MACH_MX21) += 0xC0008000
params_phys-$(CONFIG_MACH_MX21) := 0xC0000100
initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000
zreladdr-$(CONFIG_ARCH_MX25) := 0x80008000
zreladdr-$(CONFIG_ARCH_MX25) += 0x80008000
params_phys-$(CONFIG_ARCH_MX25) := 0x80000100
initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000
zreladdr-$(CONFIG_MACH_MX27) := 0xA0008000
zreladdr-$(CONFIG_MACH_MX27) += 0xA0008000
params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
zreladdr-$(CONFIG_ARCH_MX3) := 0x80008000
zreladdr-$(CONFIG_ARCH_MX3) += 0x80008000
params_phys-$(CONFIG_ARCH_MX3) := 0x80000100
initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000

2
arch/arm/mach-integrator/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-iop13xx/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-iop32x/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0xa0008000
zreladdr-y += 0xa0008000
params_phys-y := 0xa0000100
initrd_phys-y := 0xa0800000

2
arch/arm/mach-iop33x/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-ixp2000/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100

2
arch/arm/mach-ixp23xx/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100

2
arch/arm/mach-ixp4xx/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100

2
arch/arm/mach-kirkwood/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-ks8695/Makefile.boot
View file

@ -3,6 +3,6 @@
# PARAMS_PHYS must be within 4MB of ZRELADDR
# INITRD_PHYS must be in RAM
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-lpc32xx/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x80008000
zreladdr-y += 0x80008000
params_phys-y := 0x80000100
initrd_phys-y := 0x82000000

2
arch/arm/mach-mmp/Makefile.boot
View file

@ -1 +1 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000

2
arch/arm/mach-msm/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x10008000
zreladdr-y += 0x10008000
params_phys-y := 0x10000100
initrd_phys-y := 0x10800000

2
arch/arm/mach-mv78xx0/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

6
arch/arm/mach-mx5/Makefile.boot
View file

@ -1,9 +1,9 @@
zreladdr-$(CONFIG_ARCH_MX50) := 0x70008000
zreladdr-$(CONFIG_ARCH_MX50) += 0x70008000
params_phys-$(CONFIG_ARCH_MX50) := 0x70000100
initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000
zreladdr-$(CONFIG_ARCH_MX51) := 0x90008000
zreladdr-$(CONFIG_ARCH_MX51) += 0x90008000
params_phys-$(CONFIG_ARCH_MX51) := 0x90000100
initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000
zreladdr-$(CONFIG_ARCH_MX53) := 0x70008000
zreladdr-$(CONFIG_ARCH_MX53) += 0x70008000
params_phys-$(CONFIG_ARCH_MX53) := 0x70000100
initrd_phys-$(CONFIG_ARCH_MX53) := 0x70800000

2
arch/arm/mach-mxs/Makefile.boot
View file

@ -1 +1 @@
zreladdr-y := 0x40008000
zreladdr-y += 0x40008000

2
arch/arm/mach-netx/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x80008000
zreladdr-y += 0x80008000

2
arch/arm/mach-nomadik/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-nuc93x/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100

2
arch/arm/mach-omap1/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x10008000
zreladdr-y += 0x10008000
params_phys-y := 0x10000100
initrd_phys-y := 0x10800000

2
arch/arm/mach-omap2/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x80008000
zreladdr-y += 0x80008000
params_phys-y := 0x80000100
initrd_phys-y := 0x80800000

2
arch/arm/mach-orion5x/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-pnx4008/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x80008000
zreladdr-y += 0x80008000
params_phys-y := 0x80000100
initrd_phys-y := 0x80800000

2
arch/arm/mach-prima2/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-pxa/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0xa0008000
zreladdr-y += 0xa0008000

4
arch/arm/mach-realview/Makefile.boot
View file

@ -1,9 +1,9 @@
ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y)
zreladdr-y := 0x70008000
zreladdr-y += 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70800000
else
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
endif

2
arch/arm/mach-rpc/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x10008000
zreladdr-y += 0x10008000
params_phys-y := 0x10000100
initrd_phys-y := 0x18000000

4
arch/arm/mach-s3c2410/Makefile.boot
View file

@ -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

2
arch/arm/mach-s3c64xx/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x50008000
zreladdr-y += 0x50008000
params_phys-y := 0x50000100

2
arch/arm/mach-s5p64x0/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x20008000
zreladdr-y += 0x20008000
params_phys-y := 0x20000100

2
arch/arm/mach-s5pc100/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x20008000
zreladdr-y += 0x20008000
params_phys-y := 0x20000100

2
arch/arm/mach-s5pv210/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x20008000
zreladdr-y += 0x20008000
params_phys-y := 0x20000100

5
arch/arm/mach-sa1100/Makefile.boot
View file

@ -1,6 +1,7 @@
zreladdr-y := 0xc0008000
ifeq ($(CONFIG_ARCH_SA1100),y)
zreladdr-$(CONFIG_SA1111) := 0xc0208000
zreladdr-$(CONFIG_SA1111) += 0xc0208000
else
zreladdr-y += 0xc0008000
endif
params_phys-y := 0xc0000100
initrd_phys-y := 0xc0800000

2
arch/arm/mach-shark/Makefile.boot
View file

@ -1,2 +1,2 @@
zreladdr-y := 0x08008000
zreladdr-y += 0x08008000

2
arch/arm/mach-shmobile/Makefile.boot
View file

@ -1,7 +1,7 @@
__ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \
$$[$(CONFIG_MEMORY_START) + 0x8000]')
zreladdr-y := $(__ZRELADDR)
zreladdr-y += $(__ZRELADDR)
# Unsupported legacy stuff
#

2
arch/arm/mach-spear3xx/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-spear6xx/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-tcc8k/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x20008000
zreladdr-y += 0x20008000
params_phys-y := 0x20000100
initrd_phys-y := 0x20800000

2
arch/arm/mach-tegra/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00008000
zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) += 0x00008000
params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100
initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000

4
arch/arm/mach-u300/Makefile.boot
View file

@ -4,10 +4,10 @@
# INITRD_PHYS must be in RAM
ifdef CONFIG_MACH_U300_SINGLE_RAM
zreladdr-y := 0x28E08000
zreladdr-y += 0x28E08000
params_phys-y := 0x28E00100
else
zreladdr-y := 0x48008000
zreladdr-y += 0x48008000
params_phys-y := 0x48000100
endif

2
arch/arm/mach-ux500/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-versatile/Makefile.boot
View file

@ -1,4 +1,4 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000

2
arch/arm/mach-vexpress/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x60008000
zreladdr-y += 0x60008000
params_phys-y := 0x60000100
initrd_phys-y := 0x60800000

2
arch/arm/mach-vt8500/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x01000000

2
arch/arm/mach-w90x900/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100

2
arch/arm/mach-zynq/Makefile.boot
View file

@ -1,3 +1,3 @@
zreladdr-y := 0x00008000
zreladdr-y += 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000