diff options
| author | Andy Green <andy.green@linaro.org> | 2011-10-25 10:52:08 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 10:52:08 +0800 |
| commit | 765efc213a1ba0d107f92c5cfdaf8221ff6ba433 (patch) | |
| tree | 1be48e7e21fa5955133bc497f0a776cfc2771948 | |
| parent | 86851ab74e13872c19347e498045e5fbc817da63 (diff) | |
config remove OMAP3 support add HW_PERF_EVENTS
HW_PERF_EVENTS is dependent on !ARCH_OMAP3 unfortunately...
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/configs/omap4_defconfig | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig index a9a753ee7fe..c62db87e9d2 100644 --- a/arch/arm/configs/omap4_defconfig +++ b/arch/arm/configs/omap4_defconfig @@ -31,6 +31,7 @@ CONFIG_OMAP_SMARTREFLEX=y CONFIG_OMAP_SMARTREFLEX_CLASS3=y CONFIG_OMAP_MUX_DEBUG=y # CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set CONFIG_ARM_THUMBEE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -107,10 +108,8 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_ARM_INTEGRATOR=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y -CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y @@ -155,6 +154,8 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=y # CONFIG_SERIO_SERPORT is not set CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y @@ -200,13 +201,11 @@ CONFIG_VIDEO_DEV=y # CONFIG_MEDIA_TUNER_MAX2165 is not set # CONFIG_MEDIA_TUNER_TDA18218 is not set # CONFIG_MEDIA_TUNER_TDA18212 is not set -CONFIG_VIDEO_OMAP2_VOUT=y CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL128X=m CONFIG_DRM=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_OMAP_LCD_VGA=y CONFIG_OMAP2_VRAM_SIZE=32 CONFIG_OMAP2_DSS_SDI=y CONFIG_OMAP2_DSS_DSI=y @@ -216,6 +215,7 @@ CONFIG_PANEL_TAAL=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_DISPLAY_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONTS=y @@ -231,16 +231,8 @@ CONFIG_SND_DEBUG_VERBOSE=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y CONFIG_SND_OMAP_SOC=y -CONFIG_SND_OMAP_SOC_OVERO=y -CONFIG_SND_OMAP_SOC_OMAP3EVM=y -CONFIG_SND_OMAP_SOC_AM3517EVM=y -CONFIG_SND_OMAP_SOC_SDP3430=y CONFIG_SND_OMAP_SOC_SDP4430=y CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y -CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y -CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y -CONFIG_SND_OMAP_SOC_ZOOM2=y -CONFIG_SND_OMAP_SOC_IGEP0020=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_DEVICEFS=y @@ -272,6 +264,7 @@ CONFIG_MMC_OMAP_HS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_TWL4030=y CONFIG_STAGING=y +CONFIG_DRM_OMAP_NUM_CRTCS=1 CONFIG_HWSPINLOCK=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y |