Merge remote-tracking branch '4xx/next'

[karo-tx-linux.git] / arch / powerpc / boot / wrapper

diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 87f4950f38b15eed9379639e3bbcce21b5354de5..eb78e437ec1b482efe82441102b3d4884d05f719 100755 (executable)
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -163,7 +163,7 @@ coff)
     link_address='0x500000'
     pie=
     ;;
-miboot|uboot)
+miboot|uboot*)
     # miboot and U-boot want just the bare bits, not an ELF binary
     ext=bin
     objflags="-O binary"
@@ -294,6 +294,26 @@ uboot)
     fi
     exit 0
     ;;
+uboot-obs600)
+    rm -f "$ofile"
+    # obs600 wants a multi image with an initrd, so we need to put a fake
+    # one in even when building a "normal" image.
+    if [ -n "$initrd" ]; then
+       real_rd="$initrd"
+    else
+       real_rd=`mktemp`
+       echo "\0" >>"$real_rd"
+    fi
+    ${MKIMAGE} -A ppc -O linux -T multi -C gzip -a $membase -e $membase \
+       $uboot_version -d "$vmz":"$real_rd":"$dtb" "$ofile"
+    if [ -z "$initrd" ]; then
+       rm -f "$real_rd"
+    fi
+    if [ -z "$cacheit" ]; then
+       rm -f "$vmz"
+    fi
+    exit 0
+    ;;
 esac
 
 addsec() {