git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
wrapper
diff --git
a/arch/powerpc/boot/wrapper
b/arch/powerpc/boot/wrapper
index
cb97e75
..
c74531a
100755
(executable)
--- a/
arch/powerpc/boot/wrapper
+++ b/
arch/powerpc/boot/wrapper
@@
-39,6
+39,7
@@
dts=
cacheit=
binary=
gzip=.gz
cacheit=
binary=
gzip=.gz
+pie=
# cross-compilation prefix
CROSS=
# cross-compilation prefix
CROSS=
@@
-157,9
+158,10
@@
pmac|chrp)
platformo=$object/of.o
;;
coff)
platformo=$object/of.o
;;
coff)
- platformo=
$object/of.o
+ platformo=
"$object/crt0.o $object/of.o"
lds=$object/zImage.coff.lds
link_address='0x500000'
lds=$object/zImage.coff.lds
link_address='0x500000'
+ pie=
;;
miboot|uboot)
# miboot and U-boot want just the bare bits, not an ELF binary
;;
miboot|uboot)
# miboot and U-boot want just the bare bits, not an ELF binary
@@
-208,6
+210,7
@@
ps3)
ksection=.kernel:vmlinux.bin
isection=.kernel:initrd
link_address=''
ksection=.kernel:vmlinux.bin
isection=.kernel:initrd
link_address=''
+ pie=
;;
ep88xc|ep405|ep8248e)
platformo="$object/fixed-head.o $object/$platform.o"
;;
ep88xc|ep405|ep8248e)
platformo="$object/fixed-head.o $object/$platform.o"
@@
-244,6
+247,10
@@
gamecube|wii)
treeboot-iss4xx-mpic)
platformo="$object/treeboot-iss4xx.o"
;;
treeboot-iss4xx-mpic)
platformo="$object/treeboot-iss4xx.o"
;;
+epapr)
+ link_address='0x20000000'
+ pie=-pie
+ ;;
esac
vmz="$tmpdir/`basename \"$kernel\"`.$ext"
esac
vmz="$tmpdir/`basename \"$kernel\"`.$ext"
@@
-251,7
+258,7
@@
if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then
${CROSS}objcopy $objflags "$kernel" "$vmz.$$"
if [ -n "$gzip" ]; then
${CROSS}objcopy $objflags "$kernel" "$vmz.$$"
if [ -n "$gzip" ]; then
- gzip -f -9 "$vmz.$$"
+ gzip -
n -
f -9 "$vmz.$$"
fi
if [ -n "$cacheit" ]; then
fi
if [ -n "$cacheit" ]; then
@@
-310,9
+317,9
@@
fi
if [ "$platform" != "miboot" ]; then
if [ -n "$link_address" ] ; then
if [ "$platform" != "miboot" ]; then
if [ -n "$link_address" ] ; then
- text_start="-Ttext $link_address
--defsym _start=$link_address
"
+ text_start="-Ttext $link_address"
fi
fi
- ${CROSS}ld -m elf32ppc -T $lds $text_start -o "$ofile" \
+ ${CROSS}ld -m elf32ppc -T $lds $text_start
$pie
-o "$ofile" \
$platformo $tmp $object/wrapper.a
rm $tmp
fi
$platformo $tmp $object/wrapper.a
rm $tmp
fi
@@
-336,7
+343,7
@@
coff)
$objbin/hack-coff "$ofile"
;;
cuboot*)
$objbin/hack-coff "$ofile"
;;
cuboot*)
- gzip -f -9 "$ofile"
+ gzip -
n -
f -9 "$ofile"
${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
$uboot_version -d "$ofile".gz "$ofile"
;;
${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
$uboot_version -d "$ofile".gz "$ofile"
;;
@@
-383,6
+390,6
@@
ps3)
odir="$(dirname "$ofile.bin")"
rm -f "$odir/otheros.bld"
odir="$(dirname "$ofile.bin")"
rm -f "$odir/otheros.bld"
- gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
+ gzip -
n -
-force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
;;
esac
;;
esac