From: Koen Kooi <koen@openembedded.org>
Date: Sat, 16 May 2009 10:03:53 +0000 (+0200)
Subject: linux-kirkwood: update to 2.6.29.2
X-Git-Tag: Release-2010-05/1~3548
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa1039ef168f11906fdac1690f3462b39e057a66;p=openembedded.git

linux-kirkwood: update to 2.6.29.2
---

diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index f58feb686c..8f995899c9 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 = "r1"
+MACHINE_KERNEL_PR = "r2"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/recipes/linux/linux-kirkwood_2.6.29.1.bb b/recipes/linux/linux-kirkwood_2.6.29.2.bb
similarity index 88%
rename from recipes/linux/linux-kirkwood_2.6.29.1.bb
rename to recipes/linux/linux-kirkwood_2.6.29.2.bb
index 531f520497..0e349362db 100644
--- a/recipes/linux/linux-kirkwood_2.6.29.1.bb
+++ b/recipes/linux/linux-kirkwood_2.6.29.2.bb
@@ -6,11 +6,11 @@ COMPATIBLE_MACHINE = "sheevaplug"
 require linux.inc
 
 # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
-PV = "2.6.29.1"
+PV = "2.6.29.2"
 PR_append = "+gitr${SRCREV}"
 #PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
 
-SRCREV = "f66f1d49e6d8617a07b07681c684083e48547eef"
+SRCREV = "10a12868405319fbf114af2bde9789aa64c34144"
 SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
            file://fw.patch;patch=1 \
            file://defconfig \