forked from Minki/linux
[POWERPC] bootwrapper: Revert ps3 binary flag usage, and remove .bin suffix
The ps3 target produces two images, and the binary one is not the "primary" image that corresponds to the -o flag; thus, it no longer uses the generic binary flag. On platforms which do use the binary flag, it no longer produces a .bin suffix, so that the output file matches what was passed to the -o flag. This should fix the zImage ln problems for the ps3 target. Signed-off-by: Scott Wood <scottwood@freescale.com> Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
d102c9d5d3
commit
aeb4552fad
@ -149,7 +149,6 @@ cuboot*)
|
|||||||
ps3)
|
ps3)
|
||||||
platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o"
|
platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o"
|
||||||
lds=$object/zImage.ps3.lds
|
lds=$object/zImage.ps3.lds
|
||||||
binary=y
|
|
||||||
gzip=
|
gzip=
|
||||||
ext=bin
|
ext=bin
|
||||||
objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
|
objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
|
||||||
@ -233,7 +232,7 @@ entry=`${CROSS}objdump -f "$ofile" | grep '^start address ' | cut -d' ' -f3`
|
|||||||
|
|
||||||
if [ -n "$binary" ]; then
|
if [ -n "$binary" ]; then
|
||||||
mv "$ofile" "$ofile".elf
|
mv "$ofile" "$ofile".elf
|
||||||
${CROSS}objcopy -O binary "$ofile".elf "$ofile".bin
|
${CROSS}objcopy -O binary "$ofile".elf "$ofile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# post-processing needed for some platforms
|
# post-processing needed for some platforms
|
||||||
@ -246,9 +245,9 @@ coff)
|
|||||||
$object/hack-coff "$ofile"
|
$object/hack-coff "$ofile"
|
||||||
;;
|
;;
|
||||||
cuboot*)
|
cuboot*)
|
||||||
gzip -f -9 "$ofile".bin
|
gzip -f -9 "$ofile"
|
||||||
mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
|
mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
|
||||||
$uboot_version -d "$ofile".bin.gz "$ofile"
|
$uboot_version -d "$ofile".gz "$ofile"
|
||||||
;;
|
;;
|
||||||
treeboot*)
|
treeboot*)
|
||||||
mv "$ofile" "$ofile.elf"
|
mv "$ofile" "$ofile.elf"
|
||||||
@ -269,11 +268,11 @@ ps3)
|
|||||||
# then copied to offset 0x100. At runtime the bootwrapper program
|
# then copied to offset 0x100. At runtime the bootwrapper program
|
||||||
# copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
|
# copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
|
||||||
|
|
||||||
system_reset_overlay=0x`${CROSS}nm "$ofile".elf \
|
system_reset_overlay=0x`${CROSS}nm "$ofile" \
|
||||||
| grep ' __system_reset_overlay$' \
|
| grep ' __system_reset_overlay$' \
|
||||||
| cut -d' ' -f1`
|
| cut -d' ' -f1`
|
||||||
system_reset_overlay=`printf "%d" $system_reset_overlay`
|
system_reset_overlay=`printf "%d" $system_reset_overlay`
|
||||||
system_reset_kernel=0x`${CROSS}nm "$ofile".elf \
|
system_reset_kernel=0x`${CROSS}nm "$ofile" \
|
||||||
| grep ' __system_reset_kernel$' \
|
| grep ' __system_reset_kernel$' \
|
||||||
| cut -d' ' -f1`
|
| cut -d' ' -f1`
|
||||||
system_reset_kernel=`printf "%d" $system_reset_kernel`
|
system_reset_kernel=`printf "%d" $system_reset_kernel`
|
||||||
@ -282,6 +281,8 @@ ps3)
|
|||||||
|
|
||||||
rm -f "$object/otheros.bld"
|
rm -f "$object/otheros.bld"
|
||||||
|
|
||||||
|
${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
|
||||||
|
|
||||||
msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
|
msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
|
||||||
skip=$overlay_dest seek=$system_reset_kernel \
|
skip=$overlay_dest seek=$system_reset_kernel \
|
||||||
count=$overlay_size bs=1 2>&1)
|
count=$overlay_size bs=1 2>&1)
|
||||||
|
Loading…
Reference in New Issue
Block a user