[oe-commits] org.oe.dev linux-dht-walnut: switch to uImage

[koen commit]

linux-dht-walnut: switch to uImage

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: dad602c71259168fe486c82459bf119f6c69c69a
ViewMTN: http://monotone.openembedded.org/revision/info/dad602c71259168fe486c82459bf119f6c69c69a
Files:
1
conf/machine/dht-walnut.conf
packages/linux/linux-dht-walnut_2.6.20.bb
Diffs:

#
# mt diff -ra211ba42d2c74bcac9e9a4c50701a9b2505b8f34 -rdad602c71259168fe486c82459bf119f6c69c69a
#
# 
# 
# patch "conf/machine/dht-walnut.conf"
#  from [e5c261408b4bffd85b8ef78c4dbd1857c950efe6]
#    to [00c13b5bc54642ac7b5813d3c828023ff3c7885b]
# 
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
#  from [032566f5149e9d714c6631ead6e1db18ccb1dc26]
#    to [f74a2fd1c0fda2557e86d75f9b0cc1b9ad131c4f]
# 
============================================================
--- conf/machine/dht-walnut.conf	e5c261408b4bffd85b8ef78c4dbd1857c950efe6
+++ conf/machine/dht-walnut.conf	00c13b5bc54642ac7b5813d3c828023ff3c7885b
@@ -20,6 +20,7 @@ PREFERRED_VERSION_u-boot = "1.1.4"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_VERSION_u-boot = "1.1.4"
+KERNEL_IMAGETYPE = "uImage"
 
 #tune for the 405 cpu
 require conf/machine/include/tune-ppc405.inc
============================================================
--- packages/linux/linux-dht-walnut_2.6.20.bb	032566f5149e9d714c6631ead6e1db18ccb1dc26
+++ packages/linux/linux-dht-walnut_2.6.20.bb	f74a2fd1c0fda2557e86d75f9b0cc1b9ad131c4f
@@ -18,7 +18,6 @@ ARCH = "ppc"
 
 export OS = "Linux"
 ARCH = "ppc"
-KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
 do_stage_append () {
 #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split
@@ -33,8 +32,11 @@ do_install_append () {
 
 do_install_append () {
         install -d  ${DEPLOY_DIR_IMAGE}
-        install -m 0755 arch/ppc/boot/images/zImage.elf \ 
+	if [ -e arch/ppc/boot/images/zImage.elf ] ; then
+	    cp -a arch/ppc/boot/images/zImage.elf arch/ppc/boot/images/zImage
+            install -m 0755 arch/ppc/boot/images/zImage.elf \ 
                 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
+	fi	
         install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/
 }