diff options
| author |   Paul Mackerras <paulus@samba.org> | 2008-10-31 22:27:17 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-10-31 22:36:21 +1100 |
| commit | 5663a1232bd557b4b2141ad345dd56785fa51c2a (patch) | |
| tree | e52cb28aff24dee85b43330553e38eca66766e60 /arch/powerpc/boot/wrapper | |
| parent | Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge (diff) | |
| download | linux-dev-5663a1232bd557b4b2141ad345dd56785fa51c2a.tar.xz linux-dev-5663a1232bd557b4b2141ad345dd56785fa51c2a.zip | |
Revert "powerpc: Sync RPA note in zImage with kernel's RPA note"
This reverts commit 91a00302959545a9ae423e99732b1e46eb19e877, plus
commit 0dcd440120ef12879ff34fc78d7e4abf171c79e4 ("powerpc: Revert CHRP
boot wrapper to real-base = 12MB on 32-bit") which depended on it.
Commit 91a00302 was causing NVRAM corruption on some pSeries machines,
for as-yet unknown reasons, so this reverts it until the cause is
identified.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to '')
| -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" |