linux-hardened/arch/arm/mach-mmp/Makefile.boot at d6ac4ffc61ace6ed6f183e9fd7f207c0ddafb897 - kpriv/linux-hardened - Disroot Forgejo: Brace yourself, merge conflicts ahead.

kpriv/linux-hardened

Sascha Hauer 40c6d8aee4 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>

2011-10-17 09:12:40 +01:00

1 line

28 B

Clojure

Raw Blame History

zreladdr-y += 0x00008000