diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 01:24:25 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 01:24:25 +0100 |
| commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
| tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/boot/wrapper | |
| parent | powerpc/pmac: Fix SMP kernels on pre-core99 UP machines (diff) | |
| parent | powerpc/47x: Add support for the new IBM currituck platform (diff) | |
| download | linux-1e7342e7789fa2ca9202701467428726cbcfd649.tar.xz linux-1e7342e7789fa2ca9202701467428726cbcfd649.zip | |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/boot/wrapper')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 14cd4bca8b8a..eb78e437ec1b 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -244,6 +244,9 @@ gamecube|wii) link_address='0x600000' platformo="$object/$platform-head.o $object/$platform.o" ;; +treeboot-currituck) + link_address='0x1000000' + ;; treeboot-iss4xx-mpic) platformo="$object/treeboot-iss4xx.o" ;; |