From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Jun 2009 20:37:27 +0000 (+0200)
Subject: linux-kirkwood: update to 2.6.29.4
X-Git-Tag: Release-2010-05/1~3266
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee4c019c96697779f5ac673840c1a76b821514c;p=openembedded.git

linux-kirkwood: update to 2.6.29.4
---

diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 9e6f130c35..a318ce481f 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 = "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.4.bb
similarity index 85%
rename from recipes/linux/linux-kirkwood_2.6.29.2.bb
rename to recipes/linux/linux-kirkwood_2.6.29.4.bb
index b3b87a632e..5e88afbe92 100644
--- a/recipes/linux/linux-kirkwood_2.6.29.2.bb
+++ b/recipes/linux/linux-kirkwood_2.6.29.4.bb
@@ -6,14 +6,13 @@ COMPATIBLE_MACHINE = "sheevaplug"
 require linux.inc
 
 # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
-PV = "2.6.29.2"
+PV = "2.6.29.4"
 PR_append = "+gitr${SRCREV}"
 #PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
 
-SRCREV = "10a12868405319fbf114af2bde9789aa64c34144"
+SRCREV = "21c304ace160f6020a8b833ea658d17c117b610a"
 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 \