diff options
author | Koen Kooi <koen@openembedded.org> | 2008-10-26 15:32:17 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2008-10-26 15:32:17 +0100 |
commit | eb96cb746050300adcd80d64e0eeacd7317e8a6e (patch) | |
tree | fe3741b753868da88d30002e582a43a62129539b /packages | |
parent | 91ab2557b5351bc46a21a0470494cadaeb2a7751 (diff) |
linux omap git: fix oprofile patch
Diffstat (limited to 'packages')
-rw-r--r-- | packages/linux/linux-omap/omap3evm/defconfig | 19 | ||||
-rw-r--r-- | packages/linux/linux-omap/oprofile-0.9.3.armv7.diff | 13 | ||||
-rw-r--r-- | packages/linux/linux-omap_git.bb | 4 |
3 files changed, 15 insertions, 21 deletions
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig index 42af0da454..f4431728cd 100644 --- a/packages/linux/linux-omap/omap3evm/defconfig +++ b/packages/linux/linux-omap/omap3evm/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27-omap1 -# Sun Oct 26 10:36:32 2008 +# Sun Oct 26 14:48:42 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -801,13 +801,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set @@ -815,7 +815,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_KEYBOARD_TWL4030=y # CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_GPIO=m CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y @@ -1299,7 +1299,7 @@ CONFIG_DVB_ISL6421=m # Graphics support # # CONFIG_VGASTATE is not set -CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set @@ -1328,7 +1328,14 @@ CONFIG_FB_OMAP_VIDEO_MODE="" # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=8 -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_LTV350QV=y +CONFIG_LCD_ILI9320=y +CONFIG_LCD_VGG2432A4=y +CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y # # Display device support diff --git a/packages/linux/linux-omap/oprofile-0.9.3.armv7.diff b/packages/linux/linux-omap/oprofile-0.9.3.armv7.diff index 02dc079095..1eedbb50ff 100644 --- a/packages/linux/linux-omap/oprofile-0.9.3.armv7.diff +++ b/packages/linux/linux-omap/oprofile-0.9.3.armv7.diff @@ -597,16 +597,3 @@ index 0000000..08f40ea + +#endif -diff --git a/arch/arm/plat-omap/include/mach/irqs.h -b/arch/arm/plat-omap/include/mach/irqs.h -index c80e160..89ca90e 100644 ---- a/arch/arm/plat-omap/include/mach/irqs.h -+++ b/arch/arm/plat-omap/include/mach/irqs.h -@@ -297,6 +297,7 @@ - #define INT_243X_HS_USB_DMA 93 - #define INT_243X_CARKIT_IRQ 94 - -+#define INT_34XX_BENCH_MPU_EMUL 3 - #define INT_34XX_ST_MCBSP2_IRQ 4 - #define INT_34XX_ST_MCBSP3_IRQ 5 - #define INT_34XX_SYS_NIRQ 7 diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 3d884e00d9..0f5113d76e 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -10,14 +10,14 @@ SRCREV = "2a3408be17f287fdb5809c9b6c68e7ad96d25b74" #PV = "2.6.26+2.6.27-rc7+${PR}+gitr${SRCREV}" PV = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" SRC_URI_append = " \ file://no-empty-flash-warnings.patch;patch=1 \ -# file://oprofile-0.9.3.armv7.diff;patch=1 \ + file://oprofile-0.9.3.armv7.diff;patch=1 \ file://no-cortex-deadlock.patch;patch=1 \ file://read_die_ids.patch;patch=1 \ file://fix-install.patch;patch=1 \ |