[oe] [PATCH 07/14] kexecboot: use custom device table with mmc and event0

[Andrea Adami]

- revert 98e9985edab2eb072795a443e6d193fac7c048eb
- revert 5c1a421f73d9688341ace9c4dd4db59c3ef4b988
- add mmc devices mmcblk0p4 - mmcblk0p10
- fix 'cannot boot from logical partitions on SD'
---
 conf/machine/include/kexecboot.inc |    3 +++
 files/device_table-kexecboot.txt   |    4 ++++
 files/device_table-minimal.txt     |    7 -------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 7e22008..8158f3c 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -10,3 +10,6 @@ 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"
diff --git a/files/device_table-kexecboot.txt b/files/device_table-kexecboot.txt
index ff17a8e..5d37afa 100644
--- a/files/device_table-kexecboot.txt
+++ b/files/device_table-kexecboot.txt
@@ -3,5 +3,9 @@
 /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/mmcblk0p4	b	660	0	6	179	4	-	-	-
+/dev/mmcblk0p5	b	660	0	6	179	5	-	-	-
+/dev/mmcblk0p6	b	660	0	6	179	6	-	-	-
+/dev/mmcblk0p7	b	660	0	6	179	7	-	-	-
 /dev/event0 	c	660	0	0	13	64	-	-	-
 /dev/fb0	c	660	0	0	29	0	-	-	-
diff --git a/files/device_table-minimal.txt b/files/device_table-minimal.txt
index e75db89..1d15b09 100644
--- a/files/device_table-minimal.txt
+++ b/files/device_table-minimal.txt
@@ -29,10 +29,3 @@
 /dev/random	c	644	0	0	1	8	-	-	-
 /dev/urandom	c	644	0	0	1	9	-	-	-
 /dev/ptmx	c	644	0	0	5	2	-	-	-
-
-# 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	-	-	-
-- 
1.6.0.6