diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 4530ae1d..fc252bab 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/beagleboard/defconfig b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig index 0b150c5c..5f2a7eb2 100644 --- a/recipes-kernel/linux/linux-3.0/beagleboard/defconfig +++ b/recipes-kernel/linux/linux-3.0/beagleboard/defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.7 Kernel Configuration +# Linux/arm 3.0.14 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -149,7 +149,7 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set CONFIG_PROFILING=y -CONFIG_OPROFILE=y +CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_KPROBES=y diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb index 38b90e9f..d72826b8 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.14" +# v3.0.14 tag +SRCREV_pn-${PN} = "6636552f1dd0d2e2be2f87605ea2cd3aa4d2e5b6" # 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 \ \