[oe-commits] org.oe.dev mpc83x3-rdb: Fix uImage kernel build.

[likewise commit]

mpc83x3-rdb: Fix uImage kernel build.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 19595382c19aadeee7dac4939deb285a05e428eb
ViewMTN: http://monotone.openembedded.org/revision/info/19595382c19aadeee7dac4939deb285a05e428eb
Files:
1
conf/machine/mpc8313e-rdb.conf
conf/machine/mpc8323e-rdb.conf
packages/linux/linux.inc
Diffs:

#
# mt diff -ra78f1ac200a2335e43caa6bd63981d7e83454284 -r19595382c19aadeee7dac4939deb285a05e428eb
#
# 
# 
# patch "conf/machine/mpc8313e-rdb.conf"
#  from [f24e1a2aa898afd23e87bf623adfe947da548a3d]
#    to [8d91dbc6066254429f7bb58a89ddd63064e893b6]
# 
# patch "conf/machine/mpc8323e-rdb.conf"
#  from [250e826f5d31182ea85bbc328c82de9c3973796b]
#    to [54b0a85f3b2b21b088ba2cc07834fa16318a72d8]
# 
# patch "packages/linux/linux.inc"
#  from [a0d496b811bed73fa1cc6883dc248a306f18edef]
#    to [80f38a1e1786c843bf61a35d6abaeb856434a160]
# 
============================================================
--- conf/machine/mpc8313e-rdb.conf	f24e1a2aa898afd23e87bf623adfe947da548a3d
+++ conf/machine/mpc8313e-rdb.conf	8d91dbc6066254429f7bb58a89ddd63064e893b6
@@ -10,6 +10,8 @@ MACHINE_FEATURES = "kernel26 usbhost ext
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
+KERNEL_IMAGETYPE = "uImage"
+
 PREFERRED_VERSION_u-boot = "1.3.1"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
============================================================
--- conf/machine/mpc8323e-rdb.conf	250e826f5d31182ea85bbc328c82de9c3973796b
+++ conf/machine/mpc8323e-rdb.conf	54b0a85f3b2b21b088ba2cc07834fa16318a72d8
@@ -10,6 +10,8 @@ MACHINE_FEATURES = "kernel26 usbhost pci
 
 MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
 
+KERNEL_IMAGETYPE = "uImage"
+
 PREFERRED_VERSION_u-boot = "1.1.6"
 UBOOT_MACHINE = "MPC8323ERDB_config"
 
============================================================
--- packages/linux/linux.inc	a0d496b811bed73fa1cc6883dc248a306f18edef
+++ packages/linux/linux.inc	80f38a1e1786c843bf61a35d6abaeb856434a160
@@ -108,15 +108,20 @@ do_compile_append() {
 
 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