![Sascha Hauer](/assets/img/avatar_default.png)
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>
14 lines
328 B
Clojure
14 lines
328 B
Clojure
ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)
|
|
ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
|
|
$(error Cannot enable DaVinci and DA8XX platforms concurrently)
|
|
else
|
|
zreladdr-y += 0xc0008000
|
|
params_phys-y := 0xc0000100
|
|
initrd_phys-y := 0xc0800000
|
|
endif
|
|
else
|
|
zreladdr-y += 0x80008000
|
|
params_phys-y := 0x80000100
|
|
initrd_phys-y := 0x80800000
|
|
endif
|