From 2585c8864b5ba85c9aa1fe81e21e771173125b97 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 19 Apr 2012 17:33:34 +0200 Subject: linux-ti33x-psp 3.2: fix VGA cape detection for beaglebone Signed-off-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- ...don-t-compare-undefined-characters-it-mak.patch | 26 ++++++++++++++++++++++ recipes-kernel/linux/linux-ti33x-psp_3.2.bb | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch new file mode 100644 index 00000000..48e8c53b --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch @@ -0,0 +1,26 @@ +From 6e14ab85bd71ec3831169d665c4e79f646a60df8 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 19 Apr 2012 07:55:55 +0200 +Subject: [PATCH 30/30] beaglebone: don't compare undefined characters, it makes strncomp fail + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-am335xevm.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c +index bfcccd9..08a0425 100644 +--- a/arch/arm/mach-omap2/board-am335xevm.c ++++ b/arch/arm/mach-omap2/board-am335xevm.c +@@ -2152,7 +2152,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context + beaglebone_lcd3_keys_init(0,0); + } + +- if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 15)) { ++ if (!strncmp("BB-BONE-VGA-01", cape_config.partnumber, 14)) { + pr_info("BeagleBone cape: initializing VGA cape\n"); + dvi_init(0,0); + } +-- +1.7.2.5 + diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index d3a2f2ee..f560a1d1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb @@ -12,7 +12,7 @@ MULTI_CONFIG_BASE_SUFFIX = "" BRANCH = "v3.2-staging" SRCREV = "e8004dad869568692ca2a45c04e8464ce48cc4d7" -MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "d+gitr${SRCREV}" COMPATIBLE_MACHINE = "(ti33x)" @@ -825,4 +825,5 @@ PATCHES_OVER_PSP = " \ file://beaglebone/0027-beaglebone-decrease-PWM-frequency-to-old-value-LCD7-.patch \ file://beaglebone/0028-beaglebone-fix-ehrpwm-backlight.patch \ file://beaglebone/0029-beaglebone-also-report-cape-revision.patch \ + file://beaglebone/0030-beaglebone-don-t-compare-undefined-characters-it-mak.patch \ " -- cgit v1.2.3-54-g00ecf