From 22465583e62fadb0fe019b641c86b13c7510601a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 5 Oct 2011 01:57:04 +0200 Subject: linux 3.0: rebase from 3.0.4 to 3.0.6 Signed-off-by: Koen Kooi --- conf/machine/include/omap3.inc | 2 +- recipes-kernel/linux/linux_3.0.bb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index f6b67bb4..9c7e62ea 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r105" +MACHINE_KERNEL_PR = "r106" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb index 7de9d93e..82ab1877 100644 --- a/recipes-kernel/linux/linux_3.0.bb +++ b/recipes-kernel/linux/linux_3.0.bb @@ -5,16 +5,16 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "(beagleboard)" -PV = "3.0.4" -# v3.0.4 tag -SRCREV_pn-${PN} = "04aa37b5f943920017ad094e776cd5514b1a9246" +PV = "3.0.6" +# v3.0.6 tag +SRCREV_pn-${PN} = "a004e0962a10dfa7fc83dfa4ed4109d1cf84124b" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "f" +MACHINE_KERNEL_PR_append = "a" FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" -SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-3.0.y.git;protocol=git \ +SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;branch=linux-3.0.y;protocol=git \ file://pm-wip/voltdm/0001-cleanup-regulator-supply-definitions-in-mach-omap2.patch \ file://pm-wip/voltdm/0002-Remove-old-style-supply.dev-assignments-common-in-hs.patch \ file://pm-wip/voltdm/0003-omap-Use-separate-init_irq-functions-to-avoid-cpu_is.patch \ -- cgit v1.2.3-54-g00ecf