summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--recipes-kernel/linux/linux-3.0/beagleboard/defconfig4
-rw-r--r--recipes-kernel/linux/linux_3.0.bb9
3 files changed, 7 insertions, 8 deletions
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"
3require conf/machine/include/tune-cortexa8.inc 3require conf/machine/include/tune-cortexa8.inc
4PREFERRED_PROVIDER_virtual/kernel = "linux-omap" 4PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
5# Increase this everytime you change something in the kernel 5# Increase this everytime you change something in the kernel
6MACHINE_KERNEL_PR = "r113" 6MACHINE_KERNEL_PR = "r114"
7 7
8KERNEL_IMAGETYPE = "uImage" 8KERNEL_IMAGETYPE = "uImage"
9 9
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 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux/arm 3.0.7 Kernel Configuration 3# Linux/arm 3.0.14 Kernel Configuration
4# 4#
5CONFIG_ARM=y 5CONFIG_ARM=y
6CONFIG_HAVE_PWM=y 6CONFIG_HAVE_PWM=y
@@ -149,7 +149,7 @@ CONFIG_SLAB=y
149# CONFIG_SLUB is not set 149# CONFIG_SLUB is not set
150# CONFIG_SLOB is not set 150# CONFIG_SLOB is not set
151CONFIG_PROFILING=y 151CONFIG_PROFILING=y
152CONFIG_OPROFILE=y 152CONFIG_OPROFILE=m
153CONFIG_HAVE_OPROFILE=y 153CONFIG_HAVE_OPROFILE=y
154# CONFIG_KPROBES is not set 154# CONFIG_KPROBES is not set
155CONFIG_HAVE_KPROBES=y 155CONFIG_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"
5 5
6COMPATIBLE_MACHINE = "(beagleboard)" 6COMPATIBLE_MACHINE = "(beagleboard)"
7 7
8PV = "3.0.12" 8PV = "3.0.14"
9# v3.0.12 tag 9# v3.0.14 tag
10SRCREV_pn-${PN} = "ac6766564c0305ca020fe747dfd7dbdf0881369d" 10SRCREV_pn-${PN} = "6636552f1dd0d2e2be2f87605ea2cd3aa4d2e5b6"
11 11
12# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc 12# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
13MACHINE_KERNEL_PR_append = "b" 13MACHINE_KERNEL_PR_append = "a"
14 14
15FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" 15FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:"
16 16
@@ -194,7 +194,6 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi
194 file://beagle/0008-OMAP2-add-cpu-id-register-to-MAC-address-helper.patch \ 194 file://beagle/0008-OMAP2-add-cpu-id-register-to-MAC-address-helper.patch \
195 file://beagle/0009-HACK-OMAP2-BeagleBoard-Fix-up-random-or-missing-MAC-.patch \ 195 file://beagle/0009-HACK-OMAP2-BeagleBoard-Fix-up-random-or-missing-MAC-.patch \
196 file://beagle/0010-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch \ 196 file://beagle/0010-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch \
197 file://beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch \
198 file://madc/0001-Enabling-Hwmon-driver-for-twl4030-madc.patch \ 197 file://madc/0001-Enabling-Hwmon-driver-for-twl4030-madc.patch \
199 file://madc/0002-mfd-twl-core-enable-madc-clock.patch \ 198 file://madc/0002-mfd-twl-core-enable-madc-clock.patch \
200 \ 199 \