[oe-commits] org.oe.dev conf/machine/include: add kexecboot.inc

[thesing commit]

conf/machine/include: add kexecboot.inc
kexecboot: create a new devicetable file
collie.conf, poodle.conf: use new kexecboot.inc
zaurus-2.6.inc: make do_installkit know about kexecboot
(based on work of hvontres)

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 061e46a6247ee375f1eb975b1700e93e10652cb9
ViewMTN: http://monotone.openembedded.org/revision/info/061e46a6247ee375f1eb975b1700e93e10652cb9
Files:
1
files/device_table-collie.txt
conf/machine/include/kexecboot.inc
files/device_table-kexecboot.txt
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/poodle.conf
Diffs:

#
# mt diff -re79681f0263934ecd70cac36e5b8ecaf12947580 -r061e46a6247ee375f1eb975b1700e93e10652cb9
#
#
#
# delete "files/device_table-collie.txt"
# 
# add_file "conf/machine/include/kexecboot.inc"
#  content [7acdc760852b5120f1553c0b0c6902c689c52061]
# 
# add_file "files/device_table-kexecboot.txt"
#  content [0aa81ea1cfae99fe6444169126959812cdae023b]
# 
# patch "conf/machine/collie.conf"
#  from [105a9e4ec629b862a8a7ad233a14e2449eb3976b]
#    to [8cda630361532ba2b70242be5f8381f3d784ad6a]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [d5af9251eed68a286197deb3a5761113b02bbd2f]
#    to [109b8aefb282d22fcc40de5e3b21e95933d87121]
# 
# patch "conf/machine/poodle.conf"
#  from [feea8a0731386d34ce3e6563f8af4005d3e3e908]
#    to [a6cf8356f2ba4a99540f6357fa1c3d0dc5aedf01]
#
============================================================
--- conf/machine/include/kexecboot.inc	7acdc760852b5120f1553c0b0c6902c689c52061
+++ conf/machine/include/kexecboot.inc	7acdc760852b5120f1553c0b0c6902c689c52061
@@ -0,0 +1,15 @@
+# kexecboot specific config options
+
+# NOTE: include this file after zaurus-2.6.inc for zaurus machines
+
+MACHINE_FEATURES_append = "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"
+
+IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt"
+#add some device nodes for kexecboot
+IMAGE_DEVICE_TABLES_append = " files/device_table-kexecboot.txt"
============================================================
--- files/device_table-kexecboot.txt	0aa81ea1cfae99fe6444169126959812cdae023b
+++ files/device_table-kexecboot.txt	0aa81ea1cfae99fe6444169126959812cdae023b
@@ -0,0 +1,14 @@
+# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
+/dev/mmcblk0	b	660	0	6	179	0	-	-	-
+/dev/mmcblk0p1	b	660	0	6	179	1	-	-	-
+/dev/mmcblk0p2	b	660	0	6	179	2	-	-	-
+/dev/mmcblk0p3	b	660	0	6	179	3	-	-	-
+/dev/event0 	c	660	0	0	13	64	-	-	-
+/dev/fb0	c	660	0	0	29	0	-	-	-
+# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
+/dev/mmcblk0	b	660	0	6	179	0	-	-	-
+/dev/mmcblk0p1	b	660	0	6	179	1	-	-	-
+/dev/mmcblk0p2	b	660	0	6	179	2	-	-	-
+/dev/mmcblk0p3	b	660	0	6	179	3	-	-	-
+/dev/event0 	c	660	0	0	13	64	-	-	-
+/dev/fb0	c	660	0	0	29	0	-	-	-
============================================================
--- conf/machine/collie.conf	105a9e4ec629b862a8a7ad233a14e2449eb3976b
+++ conf/machine/collie.conf	8cda630361532ba2b70242be5f8381f3d784ad6a
@@ -6,6 +6,7 @@ require conf/machine/include/zaurus-${MA
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
@@ -17,10 +18,4 @@ ROOT_FLASH_SIZE = "14"
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
-# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
-DONT_CHECK_KERNELSIZE ?= "1"
-
-IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt \
-                       files/device_table-collie.txt"
-
 XSERVER ?= "xserver-kdrive-fbdev"
============================================================
--- conf/machine/include/zaurus-2.6.inc	d5af9251eed68a286197deb3a5761113b02bbd2f
+++ conf/machine/include/zaurus-2.6.inc	109b8aefb282d22fcc40de5e3b21e95933d87121
@@ -52,10 +52,10 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/
 
     # Get the latest kernel using the zImage-<machine>.bin symlink
-    if [ "${MACHINE}" = "collie" ]; then
-	    [ -f "zImage-${MACHINE}-kexecboot.bin" ] && cp zImage-${MACHINE}-kexecboot.bin ${IMAGE_NAME}-installkit/zImage
+    if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" ]; then
+	    [ -f "zImage-kexecboot-${MACHINE}.bin" ] && cp zImage-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
 	    # we need also tgz for mmc or cf cards
-	    cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+	    cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz
     else
 	    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
     fi
@@ -79,6 +79,5 @@ RDEPENDS_kernel-base = ""
 
 # Don't include kernels in standard images for Zaurus machines
 RDEPENDS_kernel-base = ""
-# collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it.
-RDEPENDS_kernel-base_collie = "kernel-image" 
+
 KERNEL_IMAGETYPE ?= "zImage"
============================================================
--- conf/machine/poodle.conf	feea8a0731386d34ce3e6563f8af4005d3e3e908
+++ conf/machine/poodle.conf	a6cf8356f2ba4a99540f6357fa1c3d0dc5aedf01
@@ -3,6 +3,7 @@ require conf/machine/include/zaurus-2.6.
 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
 
 require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/kexecboot.inc
 require conf/machine/include/tune-xscale.inc
 
 IMAGE_FSTYPES ?= "jffs2"