diff options
| author | Scott Wood <scottwood@freescale.com> | 2008-02-20 12:33:38 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-03-07 08:42:41 -0600 |
| commit | a55387e5ad903dec4e281907e4d8e74679ae60e2 (patch) | |
| tree | b5f974b3442d990d4224fab6f78974f4e54423df /arch/powerpc/boot/wrapper | |
| parent | 76db5bd26f2d79712459bf80ce0e5c0c5c31b769 (diff) | |
| download | blackbird-obmc-linux-a55387e5ad903dec4e281907e4d8e74679ae60e2.tar.gz blackbird-obmc-linux-a55387e5ad903dec4e281907e4d8e74679ae60e2.zip | |
[POWERPC] 8xx: Fix wrapper platform for adder875, and combine defconfigs.
This fixes the following bug:
http://ozlabs.org/pipermail/linuxppc-dev/2008-February/051979.html
Separate defconfigs are no longer needed now that CONFIG_DEVICE_TREE is gone.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/wrapper')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index c3178155311b..d50e498a072b 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -191,10 +191,14 @@ ps3) ksection=.kernel:vmlinux.bin isection=.kernel:initrd ;; -ep88xc|ep405|redboot*|ep8248e) +ep88xc|ep405|ep8248e) platformo="$object/fixed-head.o $object/$platform.o" binary=y ;; +adder875-redboot) + platformo="$object/fixed-head.o $object/redboot-8xx.o" + binary=y + ;; esac vmz="$tmpdir/`basename \"$kernel\"`.$ext" |
