diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-23 13:57:15 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-29 18:06:05 -0400 |
commit | a7426c1dad40adc586cb1cbdffebba6d095581a5 (patch) | |
tree | 259455051ebe76dfc32d139fba74a382b552f787 | |
parent | e4a354f6b06ceed3ddcce73b2fe9bfa9f43334af (diff) | |
download | meta-ti-a7426c1dad40adc586cb1cbdffebba6d095581a5.tar.gz |
linux-mainline: update to 3.2.18
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-mainline_3.2.bb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index c5b1979c..0f3cc36b 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc | |||
@@ -4,7 +4,7 @@ require conf/machine/include/soc-family.inc | |||
4 | require conf/machine/include/tune-cortexa8.inc | 4 | require conf/machine/include/tune-cortexa8.inc |
5 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" | 5 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" |
6 | # Increase this everytime you change something in the kernel | 6 | # Increase this everytime you change something in the kernel |
7 | MACHINE_KERNEL_PR = "r120" | 7 | MACHINE_KERNEL_PR = "r121" |
8 | 8 | ||
9 | KERNEL_IMAGETYPE = "uImage" | 9 | KERNEL_IMAGETYPE = "uImage" |
10 | 10 | ||
diff --git a/recipes-kernel/linux/linux-mainline_3.2.bb b/recipes-kernel/linux/linux-mainline_3.2.bb index 3dda4f88..69eb7e5f 100644 --- a/recipes-kernel/linux/linux-mainline_3.2.bb +++ b/recipes-kernel/linux/linux-mainline_3.2.bb | |||
@@ -5,12 +5,12 @@ KERNEL_IMAGETYPE = "uImage" | |||
5 | 5 | ||
6 | COMPATIBLE_MACHINE = "(beagleboard)" | 6 | COMPATIBLE_MACHINE = "(beagleboard)" |
7 | 7 | ||
8 | PV = "3.2.16" | 8 | PV = "3.2.18" |
9 | # v3.2.16 tag | 9 | # v3.2.18 tag |
10 | SRCREV_pn-${PN} = "b1be7dd1ec231ae751d0ce3acd0d2e5760704a6f" | 10 | SRCREV_pn-${PN} = "52c6b95f8a2edaff98b779f15b2f4d69b61b18b9" |
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 = "d" | 13 | MACHINE_KERNEL_PR_append = "a" |
14 | 14 | ||
15 | FILESPATH =. "${FILE_DIRNAME}/linux-mainline-3.2:${FILE_DIRNAME}/linux-mainline-3.2/${MACHINE}:" | 15 | FILESPATH =. "${FILE_DIRNAME}/linux-mainline-3.2:${FILE_DIRNAME}/linux-mainline-3.2/${MACHINE}:" |
16 | 16 | ||