linux-kirkwood: update to 2.6.29.4

diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 9e6f130..a318ce4 100644 (file)
--- 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 = "r5"
+MACHINE_KERNEL_PR = "r6"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"

diff --git a/recipes/linux/linux-kirkwood_2.6.29.2.bb b/recipes/linux/linux-kirkwood_2.6.29.2.bb
deleted file mode 100644 (file)
index b3b87a6..0000000
--- a/recipes/linux/linux-kirkwood_2.6.29.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices"
-SECTION = "kernel"
-LICENSE = "GPL"
-COMPATIBLE_MACHINE = "sheevaplug"
-
-require linux.inc
-
-# Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
-PV = "2.6.29.2"
-PR_append = "+gitr${SRCREV}"
-#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
-
-SRCREV = "10a12868405319fbf114af2bde9789aa64c34144"
-SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
-           file://fw.patch;patch=1 \
-           file://mvsdio.patch;patch=1 \
-           file://0001--ARM-Kirkwood-CPU-idle-driver.patch;patch=1 \
-           file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch;patch=1 \
-           file://defconfig \
-               "
-
-S = "${WORKDIR}/git"
-
-KERNEL_IMAGETYPE ?= "uImage"

diff --git a/recipes/linux/linux-kirkwood_2.6.29.4.bb b/recipes/linux/linux-kirkwood_2.6.29.4.bb
new file mode 100644 (file)
index 0000000..5e88afb
--- /dev/null
+++ b/recipes/linux/linux-kirkwood_2.6.29.4.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices"
+SECTION = "kernel"
+LICENSE = "GPL"
+COMPATIBLE_MACHINE = "sheevaplug"
+
+require linux.inc
+
+# Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
+PV = "2.6.29.4"
+PR_append = "+gitr${SRCREV}"
+#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
+
+SRCREV = "21c304ace160f6020a8b833ea658d17c117b610a"
+SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
+           file://fw.patch;patch=1 \
+           file://0001--ARM-Kirkwood-CPU-idle-driver.patch;patch=1 \
+           file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch;patch=1 \
+           file://defconfig \
+               "
+
+S = "${WORKDIR}/git"
+
+KERNEL_IMAGETYPE ?= "uImage"