kexecboot.inc: rename as initramfs-kexecboot.in

diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
similarity index 55%
rename from conf/machine/include/kexecboot.inc
rename to conf/machine/include/initramfs-kexecboot.inc
index 1835af4..6ee1ddc 100644 (file)
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/initramfs-kexecboot.inc
@@ -1,16 +1,13 @@
-# kexecboot specific config options
-
-# NOTE: include this file after zaurus-2.6.inc for zaurus machines
+# initramfs-kexecboot specific config options
 
 MACHINE_FEATURES_append = " kexecboot "
 
-IMAGE_FSTYPES += " tar.gz "
 EXTRA_IMAGEDEPENDS += "linux-kexecboot"
 
-# Include Kernel image in kexecboot enabled images
+# Include kernel image in kexecboot enabled images
 RDEPENDS_kernel-base = "kernel-image" 
 
-# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
+# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index a8c564f..783ea9f 100644 (file)
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -23,7 +23,7 @@ PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-IMAGE_FSTYPES += "jffs2"
+IMAGE_FSTYPES += "jffs2 tar.gz"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
 MACHINE_FEATURES_append_akita = " usbhost "
@@ -45,4 +45,4 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-p
 MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix"
 
 require conf/machine/include/zaurus-kernel.inc
-require conf/machine/include/kexecboot.inc
+require conf/machine/include/initramfs-kexecboot.inc