From be8461e8b3c7e9d7c7d777816e5243ad45734233 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 24 May 2009 00:22:57 +0200 Subject: kexecboot.inc: rename as initramfs-kexecboot.in --- conf/machine/include/initramfs-kexecboot.inc | 13 +++++++++++++ conf/machine/include/kexecboot.inc | 16 ---------------- conf/machine/include/zaurus-2.6.inc | 4 ++-- 3 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 conf/machine/include/initramfs-kexecboot.inc delete mode 100644 conf/machine/include/kexecboot.inc diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc new file mode 100644 index 0000000000..6ee1ddc3fa --- /dev/null +++ b/conf/machine/include/initramfs-kexecboot.inc @@ -0,0 +1,13 @@ +# initramfs-kexecboot specific config options + +MACHINE_FEATURES_append = " kexecboot " + +EXTRA_IMAGEDEPENDS += "linux-kexecboot" + +# 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 nand for booting other kernels +DONT_CHECK_KERNELSIZE ?= "1" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc deleted file mode 100644 index 1835af4727..0000000000 --- a/conf/machine/include/kexecboot.inc +++ /dev/null @@ -1,16 +0,0 @@ -# kexecboot specific config options - -# NOTE: include this file after zaurus-2.6.inc for zaurus machines - -MACHINE_FEATURES_append = " kexecboot " - -IMAGE_FSTYPES += " tar.gz " -EXTRA_IMAGEDEPENDS += "linux-kexecboot" - -# 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 -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 a8c564f4da..783ea9fd32 100644 --- 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 -- cgit v1.2.3