From fa1039ef168f11906fdac1690f3462b39e057a66 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 16 May 2009 12:03:53 +0200
Subject: linux-kirkwood: update to 2.6.29.2

---
 conf/machine/include/kirkwood.inc        |  2 +-
 recipes/linux/linux-kirkwood_2.6.29.1.bb | 21 ---------------------
 recipes/linux/linux-kirkwood_2.6.29.2.bb | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 recipes/linux/linux-kirkwood_2.6.29.1.bb
 create mode 100644 recipes/linux/linux-kirkwood_2.6.29.2.bb

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.1.bb
deleted file mode 100644
index 531f520497..0000000000
--- a/recipes/linux/linux-kirkwood_2.6.29.1.bb
+++ /dev/null
@@ -1,21 +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.1"
-PR_append = "+gitr${SRCREV}"
-#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
-
-SRCREV = "f66f1d49e6d8617a07b07681c684083e48547eef"
-SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
-           file://fw.patch;patch=1 \
-           file://defconfig \
-               "
-
-S = "${WORKDIR}/git"
-
-KERNEL_IMAGETYPE ?= "uImage"
diff --git a/recipes/linux/linux-kirkwood_2.6.29.2.bb b/recipes/linux/linux-kirkwood_2.6.29.2.bb
new file mode 100644
index 0000000000..0e349362db
--- /dev/null
+++ b/recipes/linux/linux-kirkwood_2.6.29.2.bb
@@ -0,0 +1,21 @@
+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://defconfig \
+               "
+
+S = "${WORKDIR}/git"
+
+KERNEL_IMAGETYPE ?= "uImage"
-- 
cgit v1.2.3