From e45a618db3743d1a1a7e4cdf4e16f78a3684b9b3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 20 Jan 2013 20:10:20 +0000 Subject: [PATCH] Remove obsolete ARM configs, Update OMAP config for TI AM35XX SoCs --- config-arm-generic | 1 + config-arm-highbank | 62 ---------------------- config-arm-imx | 119 ------------------------------------------- config-arm-omap | 44 +++++++++------- config-arm-versatile | 95 ---------------------------------- config-armv7 | 4 ++ kernel.spec | 4 ++ 7 files changed, 35 insertions(+), 294 deletions(-) delete mode 100644 config-arm-highbank delete mode 100644 config-arm-imx delete mode 100644 config-arm-versatile diff --git a/config-arm-generic b/config-arm-generic index 3a67e6e01..34985e5b8 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -253,6 +253,7 @@ CONFIG_HW_RANDOM_ATMEL=m CONFIG_HW_RANDOM_EXYNOS=m # Device tree +CONFIG_DTC=y CONFIG_OF=y CONFIG_USE_OF=y CONFIG_OF_DEVICE=y diff --git a/config-arm-highbank b/config-arm-highbank deleted file mode 100644 index 952a21ac4..000000000 --- a/config-arm-highbank +++ /dev/null @@ -1,62 +0,0 @@ -CONFIG_ARCH_HIGHBANK=y -# CONFIG_ARM_LPAE is not set -# CONFIG_ARM_THUMBEE is not set -CONFIG_SWP_EMULATE=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -# CONFIG_ARM_ERRATA_430973 is not set -# CONFIG_ARM_ERRATA_458693 is not set -# CONFIG_ARM_ERRATA_460075 is not set -# CONFIG_PL310_ERRATA_588369 is not set -# CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_ARM_ERRATA_743622 is not set -# CONFIG_PL310_ERRATA_753970 is not set -# CONFIG_ARM_ERRATA_754322 is not set -# CONFIG_PL310_ERRATA_769419 is not set - -# CONFIG_THUMB2_KERNEL is not set - -CONFIG_ARM_TIMER_SP804=y - -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y - -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_ATA_SFF=y - -CONFIG_NET_CALXEDA_XGMAC=y - -CONFIG_EDAC_HIGHBANK_MC=m -CONFIG_EDAC_HIGHBANK_L2=m - -CONFIG_GPIO_PL061=y - -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y - -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y - -CONFIG_SATA_HIGHBANK=m - -CONFIG_OC_ETM=y - -# CONFIG_NET_VENDOR_BROADCOM is not set -# these were all requested to be disabled on highbank kernels by calxeda -# CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set -# CONFIG_CAIF is not set -# CONFIG_NFC is not set -# CONFIG_MTD is not set -# CONFIG_PARPORT is not set -# CONFIG_ATM_DRIVERS is not set -# CONFIG_WAN is not set -# CONFIG_ISDN is not set -# CONFIG_MEDIA_SUPPORT is not set -# CONFIG_DRM is not set -# CONFIG_SND is not set -# end of list of requested disabled options diff --git a/config-arm-imx b/config-arm-imx deleted file mode 100644 index 8ffd96559..000000000 --- a/config-arm-imx +++ /dev/null @@ -1,119 +0,0 @@ -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX51=y - -CONFIG_VFP=y -CONFIG_NEON=y -# CONFIG_SWP_EMULATE is not set -# CONFIG_THUMB2_KERNEL is not set -CONFIG_CPU_FREQ_IMX=y - -CONFIG_SOC_IMX53=y -CONFIG_SOC_IMX6Q=y - -CONFIG_MACH_ARMADILLO5X0=y -CONFIG_MACH_BUG=y -CONFIG_MACH_EUKREA_CPUIMX35=y -CONFIG_MACH_EUKREA_CPUIMX35SD=y -CONFIG_MACH_EUKREA_CPUIMX51=y -CONFIG_MACH_EUKREA_CPUIMX51SD=y -CONFIG_MACH_IMX31_DT=y -CONFIG_MACH_IMX51_DT=y -CONFIG_MACH_IMX53_DT=y -CONFIG_MACH_KZM_ARM11_01=y -CONFIG_MACH_MX31_3DS=y -CONFIG_MACH_MX31ADS=y -CONFIG_MACH_MX31LILLY=y -CONFIG_MACH_MX31LITE=y -CONFIG_MACH_MX31MOBOARD=y -CONFIG_MACH_MX35_3DS=y -CONFIG_MACH_MX51_3DS=y -CONFIG_MACH_MX51_BABBAGE=y -CONFIG_MACH_MX51_EFIKAMX=y -CONFIG_MACH_MX51_EFIKASB=y -CONFIG_MACH_MX53_EVK=y -CONFIG_MACH_MX53_SMD=y -CONFIG_MACH_MX53_LOCO=y -CONFIG_MACH_MX53_ARD=y -CONFIG_MACH_PCM037=y -CONFIG_MACH_PCM037_EET=y -CONFIG_MACH_PCM043=y -CONFIG_MACH_QONG=y -CONFIG_MACH_VPR200=y - -CONFIG_W1_MASTER_MXC=m -CONFIG_DMA_CACHE_RWFO=y -CONFIG_IMX_DMA=y -CONFIG_IMX_SDMA=y -CONFIG_MXS_DMA=y -CONFIG_MXC_IRQ_PRIOR=y -CONFIG_MXC_PWM=m -CONFIG_MXC_DEBUG_BOARD=y - -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_CACHE_L2X0=y -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_ARM_ERRATA_326103=y -CONFIG_ARM_ERRATA_411920=y -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_ARM_ERRATA_364296=y - -CONFIG_PATA_IMX=m -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -CONFIG_KEYBOARD_IMX=m -CONFIG_SERIAL_IMX=y -CONFIG_HW_RANDOM_MXC_RNGA=m -CONFIG_I2C_IMX=m -CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_MCP23S08=m -# CONFIG_GPIO_MC9S08DZ60 is not set -CONFIG_PINCTRL_IMX35=y -CONFIG_PINCTRL_IMX51=y -CONFIG_PINCTRL_IMX53=y -CONFIG_USB_EHCI_MXC=y -CONFIG_USB_MXS_PHY=m -# CONFIG_USB_IMX21_HCD is not set -CONFIG_MMC_SDHCI_ESDHC_IMX=m -CONFIG_MMC_MXC=m -CONFIG_RTC_MXC=y -CONFIG_RTC_DRV_MXC=m - -CONFIG_DRM_IMX=m -CONFIG_DRM_IMX_FB_HELPER=m -CONFIG_DRM_IMX_PARALLEL_DISPLAY=m -CONFIG_DRM_IMX_IPUV3_CORE=m -CONFIG_DRM_IMX_IPUV3=m -CONFIG_VIDEO_CODA=m -CONFIG_BACKLIGHT_PWM=m -CONFIG_LEDS_PWM=m - -# CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set -CONFIG_MXC_USE_EPIT=y -CONFIG_HAVE_EPIT=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_ERRATA_430973=y -CONFIG_ARM_ERRATA_458693=y -CONFIG_ARM_ERRATA_460075=y -CONFIG_ARM_ERRATA_743622=y -CONFIG_ARM_ERRATA_754322=y -CONFIG_CAN_FLEXCAN=m -CONFIG_MTD_NAND_MXC=m -CONFIG_MTD_NAND_GPMI_NAND=y -CONFIG_INPUT_PWM_BEEPER=m -CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_IMX2_WDT=m - -CONFIG_SND_IMX_SOC=m -CONFIG_SND_SOC_PHYCORE_AC97=m -CONFIG_SND_SOC_EUKREA_TLV320=m -CONFIG_SND_SOC_IMX_SGTL5000=m - -CONFIG_PL310_ERRATA_769419=y -CONFIG_LEDS_RENESAS_TPU=y - -CONFIG_MFD_MAX8907=m - -CONFIG_FB_IMX=m - -# CONFIG_NET_VENDOR_BROADCOM is not set diff --git a/config-arm-omap b/config-arm-omap index d020c68d8..a53983357 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -182,6 +182,7 @@ CONFIG_CHARGER_TWL4030=m CONFIG_TWL6030_PWM=m CONFIG_TWL6040_CORE=y CONFIG_SENSORS_TWL4030_MADC=m +CONFIG_SENSORS_LIS3_I2C=m CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_DAVINCI_CPDMA=m @@ -191,12 +192,16 @@ CONFIG_LEDS_LP8788=m CONFIG_MTD_ONENAND_OMAP2=y CONFIG_HDQ_MASTER_OMAP=m CONFIG_I2C_OMAP=m -CONFIG_SPI_OMAP24XX=y +CONFIG_SPI_OMAP24XX=m CONFIG_MFD_OMAP_USB_HOST=y CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_LP8788=y +CONFIG_MFD_TPS65910=y +CONFIG_GPIO_TPS65910=y CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_LP8788=y +CONFIG_REGULATOR_TPS65217=y +CONFIG_REGULATOR_TPS65910=y # Enable V4L2 drivers for OMAP2+ CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y @@ -233,20 +238,25 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y +CONFIG_FB_DA8XX=m +CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=5 + +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_PANEL_GENERIC_DPI=m CONFIG_PANEL_TFP410=m CONFIG_PANEL_TAAL=m CONFIG_PANEL_PICODLP=m +CONFIG_PANEL_SHARP_LS037V7DW01=m +CONFIG_PANEL_NEC_NL8048HL11_01B=m +CONFIG_PANEL_TPO_TD043MTEA1=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_PANDORA=m -# -# OMAP2/3 Display Device Drivers -# -CONFIG_PANEL_GENERIC_DPI=y -CONFIG_PANEL_SHARP_LS037V7DW01=y -CONFIG_PANEL_NEC_NL8048HL11_01B=y -CONFIG_PANEL_TPO_TD043MTEA1=y CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_DMIC=m CONFIG_SND_OMAP_SOC_MCBSP=m CONFIG_SND_OMAP_SOC_MCPDM=m CONFIG_SND_OMAP_SOC_OVERO=m @@ -257,20 +267,18 @@ CONFIG_SND_OMAP_SOC_SDP4430=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m CONFIG_SND_OMAP_SOC_ZOOM2=m -CONFIG_SND_OMAP_SOC_IGEP0020=y -CONFIG_SND_OMAP_SOC_OMAP_HDMI=y -# Because alsa is modular http://www.spinics.net/lists/linux-omap/msg67307.html -# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set +CONFIG_SND_OMAP_SOC_IGEP0020=m +CONFIG_SND_OMAP_SOC_OMAP_HDMI=m CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_OMAP_SOC_RX51 is not set # CONFIG_SND_SOC_ALL_CODECS is not set -CONFIG_SND_SOC_TLV320AIC23=y -CONFIG_SND_SOC_TLV320AIC3X=y -CONFIG_SND_SOC_TWL4030=y -CONFIG_SND_SOC_TWL6040=y -CONFIG_RADIO_WL128X +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TWL4030=m +CONFIG_SND_SOC_TWL6040=m +CONFIG_RADIO_WL128X=m CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD_OMAP=y @@ -300,6 +308,7 @@ CONFIG_TWL4030_USB=y CONFIG_TWL6030_USB=y CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_TPS65910=m CONFIG_PWM_TIECAP=m CONFIG_PWM_TIEHRPWM=m @@ -328,7 +337,6 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_MTD_NAND_OMAP_BCH is not set -# CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_PMIC_DA903X is not set # CONFIG_MFD_DA9052_I2C is not set diff --git a/config-arm-versatile b/config-arm-versatile deleted file mode 100644 index 9c379361b..000000000 --- a/config-arm-versatile +++ /dev/null @@ -1,95 +0,0 @@ -CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_VEXPRESS_CA9X4=y -CONFIG_ARCH_VEXPRESS_DT=y -CONFIG_PLAT_VERSATILE_CLCD=y -CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y -CONFIG_PLAT_VERSATILE=y -CONFIG_ARM_TIMER_SP804=y - -CONFIG_CPU_V7=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_HAS_ASID=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_HAS_PMU=y - -# Need to verify whether these are generic or vexpress specific -CONFIG_ARM_AMBA=y - -CONFIG_VFP=y -CONFIG_VFPv3=y - -CONFIG_CPUSETS=y -# CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11 is not set -# CONFIG_THUMB2_KERNEL is not set -CONFIG_TICK_ONESHOT=y - -CONFIG_ARM_ASM_UNIFIED=y -CONFIG_ARM_CPU_TOPOLOGY=y -CONFIG_ARM_DMA_MEM_BUFFERABLE=y - -CONFIG_ARM_ERRATA_720789=y -CONFIG_ARM_ERRATA_751472=y -CONFIG_ARM_ERRATA_753970=y - -CONFIG_ARM_GIC=y -CONFIG_ARM_L1_CACHE_SHIFT=5 - -CONFIG_ARM_THUMB=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_ARM_UNWIND=y - -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_IMAGEBLIT=y - -CONFIG_TOUCHSCREEN_ADS7846=m - -CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20" - -CONFIG_SERIO_AMBAKMI=m -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y - -CONFIG_FB_ARMCLCD=m - -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_DW=m -# CONFIG_MMC_DW_IDMAC is not set - -# CONFIG_ARM_CHARLCD is not set -CONFIG_PL330_DMA=y -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y - -CONFIG_I2C_VERSATILE=m - -CONFIG_OC_ETM=y - -CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y -CONFIG_ARM_THUMBEE=y -CONFIG_SWP_EMULATE=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_CACHE_L2X0=y -CONFIG_ARM_ERRATA_430973=y -CONFIG_ARM_ERRATA_458693=y -CONFIG_ARM_ERRATA_460075=y -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_ARM_ERRATA_743622=y -CONFIG_ARM_ERRATA_754322=y -CONFIG_PL310_ERRATA_769419=y -CONFIG_NEON=y -CONFIG_PATA_PLATFORM=m -CONFIG_PATA_OF_PLATFORM=m -# CONFIG_NET_VENDOR_BROADCOM is not set - diff --git a/config-armv7 b/config-armv7 index 63b59873d..e4ffa9848 100644 --- a/config-armv7 +++ b/config-armv7 @@ -251,8 +251,12 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m # ST Ericsson # CONFIG_I2C_NOMADIK is not set +# OMAP +# CONFIG_SENSORS_LIS3_I2C is not set + # General ARM drivers # Device tree +CONFIG_DTC=y CONFIG_OF=y CONFIG_USE_OF=y CONFIG_OF_DEVICE=y diff --git a/kernel.spec b/kernel.spec index 7f387cad9..e5ab06438 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2303,6 +2303,10 @@ fi # ||----w | # || || %changelog +* Sun Jan 20 2013 Peter Robinson +- Remove obsolete ARM configs +- Update OMAP config for TI AM35XX SoCs + * Sat Jan 19 2013 Justin M. Forbes - 3.8.0-0.rc4.git1.1 - Linux v3.8-rc4-42-g5da1f88