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

Commit dfbc2d75 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt
Browse files

powerpc/ps3: Do not adjust the wrapper load address 



Commit c55aef0e "powerpc/boot: Change the load address for the wrapper
to fit the kernel" adjusted the laod address if the uncompressed kernel
was too large.  Ps3 does not compress the kernel and uses a different
linker script, so do not adjust the load address in that case.

fixes this build error:

powerpc64-linux-ld: section .text loaded at [0000000000e00000,0000000000e0721b] overlaps section .kernel:dtb loaded at [0000000000e00000,0000000000e0066f]

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent a6626ffe

arch/powerpc/boot/wrapper

+13 −9
Original line number Original line Diff line number Diff line
@@ -144,6 +144,7 @@ tmp=$tmpdir/zImage.$$.o 
ksection=.kernel:vmlinux.strip

ksection=.kernel:vmlinux.strip

isection=.kernel:initrd

isection=.kernel:initrd

link_address='0x400000'

link_address='0x400000'

make_space=y





case "$platform" in

case "$platform" in

pseries)

pseries)
@@ -210,6 +211,7 @@ ps3) 
    ksection=.kernel:vmlinux.bin

    ksection=.kernel:vmlinux.bin

    isection=.kernel:initrd

    isection=.kernel:initrd

    link_address=''

    link_address=''

    make_space=n

    pie=

    pie=

    ;;

    ;;

ep88xc|ep405|ep8248e)

ep88xc|ep405|ep8248e)
@@ -278,6 +280,7 @@ else 
    rm -f $vmz.$$

    rm -f $vmz.$$

fi

fi





if [ "$make_space" = "y" ]; then

	# Round the size to next higher MB limit

	# Round the size to next higher MB limit

	round_size=$(((strip_size + 0xfffff) & 0xfff00000))

	round_size=$(((strip_size + 0xfffff) & 0xfff00000))
@@ -290,6 +293,7 @@ if [ $link_addr -lt $strip_size ]; then 
	    echo "INFO: Fixing the link_address of wrapper to ($round_size)"

	    echo "INFO: Fixing the link_address of wrapper to ($round_size)"

	    link_address=$round_size

	    link_address=$round_size

	fi

	fi

fi





vmz="$vmz$gzip"

vmz="$vmz$gzip"