mpc83x3-rdb: Fix uImage kernel build.

diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3bc18e3..27706cb 100644 (file)
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -10,6 +10,8 @@ PREFERRED_VERSION_u-boot = "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
+KERNEL_IMAGETYPE = "uImage"
+
 PREFERRED_VERSION_u-boot = "1.3.1"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 

diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index ee2c614..38f3b19 100644 (file)
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -10,6 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 
 MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
+KERNEL_IMAGETYPE = "uImage"
+
 PREFERRED_VERSION_u-boot = "1.1.6"
 UBOOT_MACHINE = "MPC8323ERDB_config"
 

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 23f3143..b98b722 100644 (file)
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -108,15 +108,20 @@ UBOOT_ENTRYPOINT ?= "20008000"
 
 do_compile_append() {
     if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+       if test "x${ARCH}" = "xpowerpc" ; then
+               UBOOT_ARCH=ppc
+       else
+               UBOOT_ARCH=$ARCH
+       fi
         if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
             ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-            uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
             rm -f linux.bin
         else
             ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
             rm -f linux.bin.gz
             gzip -9 linux.bin
-            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
             rm -f linux.bin.gz
         fi
     fi