diff options
| author |   Paul Mackerras <paulus@samba.org> | 2013-10-29 16:21:26 +1100 |
|---|---|---|
| committer |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-30 16:00:17 +1100 |
| commit | f5467e28d4e2569b2c71435d438ce3c7f9ac238e (patch) | |
| tree | 666cbd6f5c01ff50599805c41fb623a7d236f729 /arch/powerpc/boot/wrapper | |
| parent | powerpc: Add includes to fix powernv/rng.c build (diff) | |
| download | linux-dev-f5467e28d4e2569b2c71435d438ce3c7f9ac238e.tar.xz linux-dev-f5467e28d4e2569b2c71435d438ce3c7f9ac238e.zip | |
powerpc/boot: Don't change link address for OF-based platforms
Commit c55aef0e5bc6 ("powerpc/boot: Change the load address for the
wrapper to fit the kernel") adjusts the wrapper address unnecessarily
for platforms that use arch/powerpc/boot/of.c, since the code there
allocates space for the kernel wherever it can find it and doesn't
necessarily load the kernel at address 0. Changing the link address
is actually harmful since it can cause the zImage to overlap with
Open Firmware and thus fail to boot.
To fix this, we set make_space to n for all of the platforms that
use of.o.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to '')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index cd7af841ba05..ac16e9984ecb 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -150,18 +150,22 @@ case "$platform" in pseries) platformo="$object/of.o $object/epapr.o" link_address='0x4000000' + make_space=n ;; maple) platformo="$object/of.o $object/epapr.o" link_address='0x400000' + make_space=n ;; pmac|chrp) platformo="$object/of.o $object/epapr.o" + make_space=n ;; coff) platformo="$object/crt0.o $object/of.o $object/epapr.o" lds=$object/zImage.coff.lds link_address='0x500000' + make_space=n pie= ;; miboot|uboot*) |