diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-20 10:54:54 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-20 10:54:54 +0100 |
commit | 93b8eef1c098efbea2f1fc0be7e3c681f259a7e7 (patch) | |
tree | 462cc8c2bc07bbc825dab2a200891a28d8643329 /arch/powerpc/boot/wrapper | |
parent | Input: libps2 - handle 0xfc responses from devices (diff) | |
parent | Linux 2.6.28-rc9 (diff) | |
download | linux-93b8eef1c098efbea2f1fc0be7e3c681f259a7e7.tar.xz linux-93b8eef1c098efbea2f1fc0be7e3c681f259a7e7.zip |
Merge commit 'v2.6.28-rc9' into next
Diffstat (limited to 'arch/powerpc/boot/wrapper')
-rwxr-xr-x | arch/powerpc/boot/wrapper | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index f39073511a49..965c237c122d 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -306,13 +306,8 @@ fi # post-processing needed for some platforms case "$platform" in -pseries) - ${CROSS}objcopy -O binary -j .fakeelf "$kernel" "$ofile".rpanote - $objbin/addnote "$ofile" "$ofile".rpanote - rm -r "$ofile".rpanote - ;; -chrp) - $objbin/addnote -r c00000 "$ofile" +pseries|chrp) + $objbin/addnote "$ofile" ;; coff) ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile" |