Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

6 files changed, 22 insertions, 14 deletions

diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index a262059d45..2d744e9897 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r32"
+MACHINE_KERNEL_PR = "r34"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
index 6ee1ddc3fa..bc9cd518e2 100644
--- a/conf/machine/include/initramfs-kexecboot.inc
+++ b/conf/machine/include/initramfs-kexecboot.inc
@@ -1,13 +1,18 @@
-# initramfs-kexecboot specific config options
+# Initramfs-kexecboot extra config
 
-MACHINE_FEATURES_append = " kexecboot "
 
+# If set here, each image will also build linux-kexecboot.
+# Usually the machine-installer recipe already DEPENDS on it
+#
 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"
+# Force inclusion of kernel in target images
+# (done by default)
+#
+RDEPENDS_kernel-base = "kernel-image"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
+
+# Install /boot/boot.cfg in target images
+#
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg "
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 8507857b11..632540345b 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r16"
+MACHINE_KERNEL_PR = "r18"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
index feca186315..1c94a34e9e 100644
--- a/conf/machine/include/tune-ppc440.inc
+++ b/conf/machine/include/tune-ppc440.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=440"
 BASE_PACKAGE_ARCH = "ppc440"
 FEED_ARCH = "ppc440"
-PACKAGE_EXTRA_ARCHS += "ppc440e"
+PACKAGE_EXTRA_ARCHS += "${BASE_PACKAGE_ARCH} ppc440e"
diff --git a/conf/machine/include/tune-ppce600.inc b/conf/machine/include/tune-ppce600.inc
new file mode 100644
index 0000000000..77a7cb86b8
--- /dev/null
+++ b/conf/machine/include/tune-ppce600.inc
@@ -0,0 +1,4 @@
+TARGET_CC_ARCH = "-mcpu=7450"
+BASE_PACKAGE_ARCH = "ppce600"
+FEED_ARCH = "ppce600"
+PACKAGE_EXTRA_ARCHS += "ppce600"
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 1ba4a3422d..bbbb38315c 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -4,13 +4,12 @@ MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
-# Starting with 2.6.32 linux-rp is deprecated
+# Starting with 2.6.32 linux-rp is deprecated for some models
 #PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 
-KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
-
+# Default bootloader expects "zImage", use "uImage" for u-boot
+# Note: kexecboot can boot both kind of images
 ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
 KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"