[meta-ti] [PATCH 2/2] linux 3.0: update to 3.0.13

[Koen Kooi]

Ignore this one, it's still work in progress

Op 17 dec. 2011, om 17:03 heeft Koen Kooi het volgende geschreven:

> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
> ---
> conf/machine/include/omap3.inc                     |    2 +-
> ...-Fix-twl4030-dependencies-for-audio-codec.patch |   26 --------------------
> recipes-kernel/linux/linux_3.0.bb                  |    9 +++----
> 3 files changed, 5 insertions(+), 32 deletions(-)
> delete mode 100644 recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch
> 
> diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
> index 4530ae1..fc252ba 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 = "r113"
> +MACHINE_KERNEL_PR = "r114"
> 
> KERNEL_IMAGETYPE = "uImage"
> 
> diff --git a/recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch b/recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch
> deleted file mode 100644
> index 527b0f5..0000000
> --- a/recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From 6d7bf5251219d2aa604ada2c955812b16ad5cff4 Mon Sep 17 00:00:00 2001
> -From: Koen Kooi <koen at dominion.thruhere.net>
> -Date: Wed, 30 Nov 2011 09:50:56 +0100
> -Subject: [PATCH] Revert "mfd: Fix twl4030 dependencies for audio codec"
> -
> -This reverts commit 11b8fc6ae54bf18a48c94e181c37ca135b858b42.
> ----
> - drivers/mfd/twl-core.c |    2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> -index f0dfca3..e659d4e 100644
> ---- a/drivers/mfd/twl-core.c
> -+++ b/drivers/mfd/twl-core.c
> -@@ -116,7 +116,7 @@
> - #define twl_has_watchdog()        false
> - #endif
> - 
> --#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
> -+#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
> - 	defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
> - #define twl_has_codec()	true
> - #else
> --- 
> -1.7.2.5
> -
> diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb
> index 38b90e9..f335506 100644
> --- a/recipes-kernel/linux/linux_3.0.bb
> +++ b/recipes-kernel/linux/linux_3.0.bb
> @@ -5,12 +5,12 @@ KERNEL_IMAGETYPE = "uImage"
> 
> COMPATIBLE_MACHINE = "(beagleboard)"
> 
> -PV = "3.0.12"
> -# v3.0.12 tag
> -SRCREV_pn-${PN} = "ac6766564c0305ca020fe747dfd7dbdf0881369d"
> +PV = "3.0.13"
> +# v3.0.13 tag
> +SRCREV_pn-${PN} = "d986a8dbfd7358bfbda116650c4caf8a3b90d865"
> 
> # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
> -MACHINE_KERNEL_PR_append = "b"
> +MACHINE_KERNEL_PR_append = "a"
> 
> FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:"
> 
> @@ -194,7 +194,6 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi
>             file://beagle/0008-OMAP2-add-cpu-id-register-to-MAC-address-helper.patch \
>             file://beagle/0009-HACK-OMAP2-BeagleBoard-Fix-up-random-or-missing-MAC-.patch \
>             file://beagle/0010-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch \
> -            file://beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch \
>             file://madc/0001-Enabling-Hwmon-driver-for-twl4030-madc.patch \
>             file://madc/0002-mfd-twl-core-enable-madc-clock.patch \
>             \
> -- 
> 1.7.2.5
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.yoctoproject.org/pipermail/meta-ti/attachments/20111217/c615389a/attachment.pgp>