Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40c6d8ae authored Aug 17, 2011 by Sascha Hauer Committed by Russell King Oct 17, 2011

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>

parent cd227fbf

arch/arm/mach-at91/Makefile.boot

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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

arch/arm/mach-bcmring/Makefile.boot

+1 −1

Original line number	Original line	Diff line number	Diff line
	# 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

arch/arm/mach-clps711x/Makefile.boot

+1 −1

Original line number	Original line	Diff line number	Diff line
	# 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

arch/arm/mach-cns3xxx/Makefile.boot

+1 −1

Original line number	Original line	Diff line number	Diff line
	zreladdr-y := 0x00008000		zreladdr-y += 0x00008000
	params_phys-y := 0x00000100		params_phys-y := 0x00000100
	initrd_phys-y := 0x00C00000		initrd_phys-y := 0x00C00000

arch/arm/mach-davinci/Makefile.boot

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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