diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-04-17 14:47:45 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-04-18 12:19:55 -0400 |
commit | da08d625f22063c4a49a16229a94b0b2492c90de (patch) | |
tree | 113e77779ce69b4aee5c05ba21accfa168914d51 /recipes-kernel | |
parent | 415f8b2c33cc3a7d2856fa0c6063f30fcbdad442 (diff) | |
download | meta-ti-da08d625f22063c4a49a16229a94b0b2492c90de.tar.gz |
linux-ti33x-psp 3.2: include latest MUSB fixes
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig | 2 | ||||
-rwxr-xr-x | recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh | 3 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp_3.2.bb | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig index 605a3242..09128754 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig | |||
@@ -2322,7 +2322,7 @@ CONFIG_FB_TILEBLITTING=y | |||
2322 | CONFIG_FB_SMSCUFX=m | 2322 | CONFIG_FB_SMSCUFX=m |
2323 | CONFIG_FB_UDL=m | 2323 | CONFIG_FB_UDL=m |
2324 | CONFIG_FB_DA8XX=y | 2324 | CONFIG_FB_DA8XX=y |
2325 | CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=4 | 2325 | CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=5 |
2326 | # CONFIG_FB_VIRTUAL is not set | 2326 | # CONFIG_FB_VIRTUAL is not set |
2327 | # CONFIG_FB_METRONOME is not set | 2327 | # CONFIG_FB_METRONOME is not set |
2328 | # CONFIG_FB_BROADSHEET is not set | 2328 | # CONFIG_FB_BROADSHEET is not set |
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh b/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh index 5215d44b..695eb419 100755 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/patch.sh | |||
@@ -7,8 +7,7 @@ set -e | |||
7 | # don't use builtin 'echo' from /bin/sh | 7 | # don't use builtin 'echo' from /bin/sh |
8 | export ECHO="$(which echo)" | 8 | export ECHO="$(which echo)" |
9 | 9 | ||
10 | #git tag -f beaglebone-v3.2 09e9651bcf2ee8d86685f2a8075bc6557b1d3b91 | 10 | git tag -f beaglebone-v3.2 e8004dad869568692ca2a45c04e8464ce48cc4d7 |
11 | git tag -f beaglebone-v3.2 88dcc46017b970660ff113c1bb4e7d832c5a3693 | ||
12 | 11 | ||
13 | TAG="beaglebone-v3.2" | 12 | TAG="beaglebone-v3.2" |
14 | EXTRATAG="" | 13 | EXTRATAG="" |
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 082c73cc..1dad0fb9 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -11,8 +11,8 @@ S = "${WORKDIR}/git" | |||
11 | MULTI_CONFIG_BASE_SUFFIX = "" | 11 | MULTI_CONFIG_BASE_SUFFIX = "" |
12 | 12 | ||
13 | BRANCH = "v3.2-staging" | 13 | BRANCH = "v3.2-staging" |
14 | SRCREV = "88dcc46017b970660ff113c1bb4e7d832c5a3693" | 14 | SRCREV = "e8004dad869568692ca2a45c04e8464ce48cc4d7" |
15 | MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" | 15 | MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(ti33x)" | 17 | COMPATIBLE_MACHINE = "(ti33x)" |
18 | 18 | ||