diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-16 12:03:53 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-16 12:03:53 +0200 |
| commit | fa1039ef168f11906fdac1690f3462b39e057a66 (patch) | |
| tree | d3e2e706cb8b8013fda842d49b16d3025011224b | |
| parent | b4e29757971085a7f089bd106ec7d6223e753112 (diff) | |
linux-kirkwood: update to 2.6.29.2
| -rw-r--r-- | conf/machine/include/kirkwood.inc | 2 | ||||
| -rw-r--r-- | recipes/linux/linux-kirkwood_2.6.29.2.bb (renamed from recipes/linux/linux-kirkwood_2.6.29.1.bb) | 4 |
2 files changed, 3 insertions, 3 deletions
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 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 \ |