diff options
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-3.0/beagleboard/defconfig | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/linux_3.0.bb | 9 |
2 files changed, 6 insertions, 7 deletions
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 | # |
5 | CONFIG_ARM=y | 5 | CONFIG_ARM=y |
6 | CONFIG_HAVE_PWM=y | 6 | CONFIG_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 |
151 | CONFIG_PROFILING=y | 151 | CONFIG_PROFILING=y |
152 | CONFIG_OPROFILE=y | 152 | CONFIG_OPROFILE=m |
153 | CONFIG_HAVE_OPROFILE=y | 153 | CONFIG_HAVE_OPROFILE=y |
154 | # CONFIG_KPROBES is not set | 154 | # CONFIG_KPROBES is not set |
155 | CONFIG_HAVE_KPROBES=y | 155 | 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" | |||
5 | 5 | ||
6 | COMPATIBLE_MACHINE = "(beagleboard)" | 6 | COMPATIBLE_MACHINE = "(beagleboard)" |
7 | 7 | ||
8 | PV = "3.0.12" | 8 | PV = "3.0.14" |
9 | # v3.0.12 tag | 9 | # v3.0.14 tag |
10 | SRCREV_pn-${PN} = "ac6766564c0305ca020fe747dfd7dbdf0881369d" | 10 | SRCREV_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 |
13 | MACHINE_KERNEL_PR_append = "b" | 13 | MACHINE_KERNEL_PR_append = "a" |
14 | 14 | ||
15 | FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" | 15 | FILESPATH =. "${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 | \ |