linux-dht-walnut: switch to uImage

diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index a8a2d60..6eeb088 100644 (file)
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
 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

diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb
index 8c1d2b8..61836ac 100644 (file)
--- a/packages/linux/linux-dht-walnut_2.6.20.bb
+++ b/packages/linux/linux-dht-walnut_2.6.20.bb
@@ -18,7 +18,6 @@ FILES_kernel-image = "/boot/zImage.elf"
 
 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_stage_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}/
 }