diff options
| -rw-r--r-- | Makefile.config | 8 | ||||
| -rw-r--r-- | config-arm-omap | 268 | ||||
| -rw-r--r-- | config-armv7 | 25 | ||||
| -rw-r--r-- | config-armv7-generic | 5 | ||||
| -rw-r--r-- | config-armv7-lpae | 6 |
5 files changed, 33 insertions, 279 deletions
diff --git a/Makefile.config b/Makefile.config index 140172d6c..5a15ee6bd 100644 --- a/Makefile.config +++ b/Makefile.config @@ -10,7 +10,7 @@ CONFIGFILES = \ $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \ $(CFG)-s390x.config \ $(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config\ - $(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \ + $(CFG)-armv7hl-tegra.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config @@ -44,9 +44,6 @@ temp-armv7-lpae: config-armv7-lpae temp-armv7-generic temp-arm-generic: config-arm-generic temp-generic perl merge.pl $^ > $@ -temp-armv7l-omap: config-arm-omap temp-arm-generic - perl merge.pl $^ > $@ - temp-armv7l-tegra: config-arm-tegra temp-arm-generic perl merge.pl $^ > $@ @@ -119,9 +116,6 @@ kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7 kernel-$(VERSION)-armv7hl-lpae.config: /dev/null temp-armv7-lpae perl merge.pl $^ arm > $@ -kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap - perl merge.pl $^ arm > $@ - kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra perl merge.pl $^ arm > $@ diff --git a/config-arm-omap b/config-arm-omap index 4d64f90cd..49f68235b 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -1,70 +1,6 @@ -CONFIG_ARCH_OMAP=y -CONFIG_ARCH_OMAP_OTG=y -# CONFIG_ARCH_OMAP1 is not set -# CONFIG_ARCH_MULTI_V4 is not set -# CONFIG_ARCH_MULTI_V4T is not set -# CONFIG_ARCH_MULTI_V6 is not set -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_OMAP2PLUS=y -# CONFIG_ARCH_MVEBU is not set -# CONFIG_ARCH_BCM is not set -# CONFIG_ARCH_HIGHBANK is not set -# CONFIG_ARCH_SOCFPGA is not set -# CONFIG_ARCH_SUNXI is not set -# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set -# CONFIG_ARCH_VEXPRESS_CA9X4 is not set -# CONFIG_ARCH_VIRT is not set -# CONFIG_ARCH_WM8850 is not set -# CONFIG_ARCH_ZYNQ is not set -# CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_WM8505 is not set -# CONFIG_ARM_CHARLCD is not set -# CONFIG_PATA_PLATFORM is not set -# CONFIG_I2C_VERSATILE is not set -# CONFIG_SENSORS_VEXPRESS is not set -# CONFIG_REGULATOR_VEXPRESS is not set -# CONFIG_RTC_DRV_LP8788 is not set - -# -# OMAP Feature Selections -# -CONFIG_OMAP_RESET_CLOCKS=y -CONFIG_OMAP_MUX=y -# CONFIG_OMAP_MUX_DEBUG is not set -CONFIG_OMAP_MUX_WARNINGS=y -CONFIG_OMAP_MCBSP=y -CONFIG_OMAP_MBOX_FWK=m -CONFIG_OMAP_MBOX_KFIFO_SIZE=256 -CONFIG_OMAP_32K_TIMER=y -# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set -CONFIG_OMAP_32K_TIMER_HZ=128 -CONFIG_OMAP_DM_TIMER=y -# CONFIG_OMAP_PM_NONE is not set -CONFIG_OMAP_PM_NOOP=y -CONFIG_OMAP_IOMMU=y -# CONFIG_OMAP_IOMMU_DEBUG is not set -CONFIG_OMAP3_EMU=y -CONFIG_HWSPINLOCK_OMAP=m -CONFIG_DMA_OMAP=y -# CONFIG_DMADEVICES_VDEBUG is not set - -# -# TI OMAP2/3/4 Specific Features -# -CONFIG_ARCH_OMAP2PLUS_TYPICAL=y -# CONFIG_ARCH_OMAP2 is not set -CONFIG_ARCH_OMAP3=y -CONFIG_ARCH_OMAP4=y -CONFIG_SOC_OMAP3430=y -CONFIG_SOC_TI81XX=y -CONFIG_SOC_AM33XX=y -CONFIG_SOC_OMAPTI816X=y -# CONFIG_SOC_OMAP5 is not set CONFIG_OMAP_PACKAGE_CBB=y CONFIG_OMAP_PACKAGE_CBL=y CONFIG_OMAP_PACKAGE_CBS=y -# CONFIG_OMAP4_ERRATA_I688 is not set # # OMAP Board Type @@ -119,8 +55,6 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y -CONFIG_CACHE_L2X0=y -CONFIG_CACHE_PL310=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_ERRATA_430973=y # CONFIG_ARM_ERRATA_458693 is not set @@ -160,64 +94,9 @@ CONFIG_PM_SLEEP_SMP=y CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y -# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES -CONFIG_OMAP_BANDGAP=y -CONFIG_OMAP4_THERMAL=y -CONFIG_OMAP5_THERMAL=y - -# OMAP3 thermal/power -CONFIG_POWER_AVS=y -CONFIG_POWER_AVS_OMAP=y -CONFIG_POWER_AVS_OMAP_CLASS3=y - -CONFIG_ARM_OMAP2PLUS_CPUFREQ=y - # # OMAP Hardware # -CONFIG_WL_TI=y -CONFIG_WLCORE_SDIO=m -CONFIG_WLCORE_SPI=m -CONFIG_TI_ST=m -CONFIG_TI_DAC7512=m -# CONFIG_TI_CPSW is not set -CONFIG_MTD_NAND_OMAP2=y -CONFIG_MTD_NAND_OMAP_PREFETCH=y -CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y -CONFIG_WL1251_SPI=m -CONFIG_WL12XX_SPI=m -CONFIG_WL12XX_SDIO_TEST=m -CONFIG_WL18XX=m -CONFIG_SPI_DAVINCI=m -CONFIG_SPI_OMAP24XX=y -CONFIG_MFD_TI_SSP=m -CONFIG_SPI_TI_SSP=m -CONFIG_NFC_WILINK=m -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_KEYBOARD_OMAP4=m -CONFIG_KEYBOARD_TWL4030=m -CONFIG_TOUCHSCREEN_TI_TSCADC=m -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y -CONFIG_OMAP_WATCHDOG=y -CONFIG_CLK_TWL6040=m -CONFIG_TWL4030_CORE=y -CONFIG_TWL4030_MADC=m -CONFIG_TWL4030_POWER=y -CONFIG_TWL4030_CODEC=y -CONFIG_TWL4030_WATCHDOG=m -CONFIG_GPIO_TWL4030=m -CONFIG_GPIO_TWL6040=m -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 CONFIG_LEDS_PWM=m CONFIG_LEDS_LP8788=m @@ -225,7 +104,6 @@ CONFIG_MTD_ONENAND_OMAP2=y CONFIG_HDQ_MASTER_OMAP=m CONFIG_I2C_OMAP=m CONFIG_MFD_OMAP_USB_HOST=y -CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_LP8788=y CONFIG_MFD_TPS65910=y CONFIG_GPIO_TPS65910=y @@ -233,92 +111,14 @@ 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 -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_OMAP2_VOUT=m -CONFIG_VIDEO_OMAP3=m -CONFIG_VIDEO_VPFE_CAPTURE=m -# The ones below are for TI Davinci -# CONFIG_VIDEO_VPSS_SYSTEM is not set -# CONFIG_VIDEO_DM6446_CCDC is not set -# CONFIG_VIDEO_DM644X_VPBE is not set -# CONFIG_VIDEO_DM355_CCDC is not set -# CONFIG_VIDEO_ISIF is not set -# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver -CONFIG_V4L_TEST_DRIVERS=y -CONFIG_VIDEO_VIVI=m - -CONFIG_DRM=m -CONFIG_DRM_OMAP=m -CONFIG_DRM_OMAP_NUM_CRTCS=2 -# CONFIG_DRM_EXYNOS is not set -# CONFIG_DRM_IMX is not set -# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set -# CONFIG_FB_OMAP_LCD_VGA is not set -CONFIG_OMAP2_VRAM=y -CONFIG_OMAP2_VRAM_SIZE=0 -CONFIG_OMAP2_VRFB=y -# CONFIG_FB_OMAP2 is not set - -CONFIG_OMAP2_DSS=m -CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y -# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set -CONFIG_OMAP2_DSS_DPI=y -CONFIG_OMAP2_DSS_RFBI=y -CONFIG_OMAP2_DSS_VENC=y -CONFIG_OMAP4_DSS_HDMI=y -CONFIG_OMAP2_DSS_SDI=y -CONFIG_OMAP2_DSS_DSI=y -# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set -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_LP8788=m CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_PANDORA=m - -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 -CONFIG_SND_OMAP_SOC_OMAP3EVM=m -CONFIG_SND_OMAP_SOC_AM3517EVM=m -CONFIG_SND_OMAP_SOC_SDP3430=m -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=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=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 CONFIG_USB_MUSB_OMAP2PLUS=y @@ -332,71 +132,3 @@ CONFIG_USB_OHCI_HCD_OMAP3=y # CONFIG_USB_GADGET_OMAP is not set # CONFIG_ISP1301_OMAP is not set - -# This block is temporary until we work out why the MMC modules don't work as modules -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF=y -CONFIG_MMC_SPI=y - -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y -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 -CONFIG_PWM_TWL=m -CONFIG_PWM_TWL_LED=m - -# CONFIG_IR_RX51 is not set -# CONFIG_BATTERY_RX51 is not set - -# CONFIG_TIDSPBRIDGE is not set -# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 -# CONFIG_TIDSPBRIDGE_DEBUG is not set -# CONFIG_TIDSPBRIDGE_RECOVERY=y -# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set -# CONFIG_TIDSPBRIDGE_WDT3=y -# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5 -# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set -# CONFIG_TIDSPBRIDGE_BACKTRACE is not set - -# CONFIG_OMAP_REMOTEPROC is not set -# CONFIG_OMAP_IOVMM is not set - -CONFIG_CRYPTO_DEV_OMAP_SHAM=m -CONFIG_CRYPTO_DEV_OMAP_AES=m -CONFIG_HW_RANDOM_OMAP=m - -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_MTD_NAND_OMAP_BCH is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_MFD_DA9052_I2C is not set -# CONFIG_PMIC_ADP5520 is not set -# CONFIG_MFD_MAX77686 is not set -# CONFIG_MFD_MAX77693 is not set -# CONFIG_MFD_MAX8997 is not set -# CONFIG_MFD_SEC_CORE is not set -# CONFIG_MFD_TPS65090 is not set -# CONFIG_MFD_AAT2870_CORE is not set -# CONFIG_MFD_RC5T583 is not set -# CONFIG_MFD_PALMAS is not set -# CONFIG_REGULATOR_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set - -# CONFIG_OMAP2_DSS_DEBUG is not set -# CONFIG_OMAP2_DSS_DEBUGFS is not set -# CONFIG_ARM_PSCI is not set -# CONFIG_WILINK_PLATFORM_DATA is not set - -# VIRTIO_PCI is not set -# VIRTIO_MMIO is not set -# REMOTEPROC is not set -# RPMSG is not set diff --git a/config-armv7 b/config-armv7 index 6c5ebce33..77eb406df 100644 --- a/config-armv7 +++ b/config-armv7 @@ -141,6 +141,7 @@ CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m +CONFIG_I2C_OMAP=m CONFIG_CHARGER_TWL4030=m CONFIG_OMAP_WATCHDOG=m CONFIG_TWL4030_CORE=y @@ -154,19 +155,25 @@ CONFIG_TWL6030_PWM=m CONFIG_TWL6040_CORE=y CONFIG_CLK_TWL6040=m CONFIG_MFD_OMAP_USB_HOST=y +CONFIG_MTD_ONENAND_OMAP2=m +CONFIG_HDQ_MASTER_OMAP=m CONFIG_REGULATOR_TWL4030=y CONFIG_BACKLIGHT_PANDORA=m CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_OHCI_HCD_OMAP3=y CONFIG_USB_MUSB_AM35X=m +CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_USB_MUSB_HDRC=y +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_MUSB_DEBUG is not set CONFIG_OMAP_CONTROL_USB=m CONFIG_NOP_USB_XCEIV=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m -CONFIG_RTC_DRV_TWL92330=y -CONFIG_RTC_DRV_TWL4030=y -CONFIG_RTC_DRV_OMAP=y +CONFIG_RTC_DRV_TWL92330=m +CONFIG_RTC_DRV_TWL4030=m +CONFIG_RTC_DRV_OMAP=m # Note needs to be compiled in until we build MMC modular CONFIG_DMA_OMAP=y CONFIG_OMAP_IOVMM=m @@ -299,6 +306,18 @@ CONFIG_SND_SOC_TWL4030=m CONFIG_SND_SOC_TWL6040=m CONFIG_RADIO_WL128X=m +# CONFIG_OMAP_REMOTEPROC is not set + +# CONFIG_TIDSPBRIDGE is not set +# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000 +# CONFIG_TIDSPBRIDGE_DEBUG is not set +# CONFIG_TIDSPBRIDGE_RECOVERY=y +# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set +# CONFIG_TIDSPBRIDGE_WDT3=y +# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5 +# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set +# CONFIG_TIDSPBRIDGE_BACKTRACE is not set + # CONFIG_OMAP2_DSS_DEBUGFS is not set # CONFIG_OMAP_IOMMU_DEBUG is not set # CONFIG_OMAP_MUX_DEBUG is not set diff --git a/config-armv7-generic b/config-armv7-generic index 924b0239c..c10b1ae4f 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -2,6 +2,7 @@ # generic ARM config options CONFIG_CMDLINE="" CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_HAVE_ARM_TWD=y CONFIG_AEABI=y CONFIG_VFP=y CONFIG_VFPv3=y @@ -18,6 +19,7 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_SWP_EMULATE=y CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_CACHE_L2X0=y +CONFIG_CACHE_PL310=y CONFIG_HIGHPTE=y CONFIG_AUTO_ZRELADDR=y # CONFIG_OABI_COMPAT is not set @@ -166,6 +168,9 @@ CONFIG_FB_ARMCLCD=m CONFIG_REGULATOR_VEXPRESS=m # usb +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_ULPI=y CONFIG_AX88796=m CONFIG_AX88796_93CX6=y diff --git a/config-armv7-lpae b/config-armv7-lpae index 324a31e21..7263d7608 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -61,6 +61,7 @@ CONFIG_SND_SOC_SAMSUNG=m CONFIG_USB_EHCI_S5P=y CONFIG_USB_OHCI_EXYNOS=y CONFIG_MMC_SDHCI_S3C=m +CONFIG_MMC_SDHCI_S3C_DMA=y CONFIG_RTC_DRV_S3C=m CONFIG_PWM_SAMSUNG=m CONFIG_S3C_BOOT_WATCHDOG=y @@ -73,4 +74,7 @@ CONFIG_FB_S3C_DEBUG_REGWRITE=y CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m CONFIG_USB_EHCI_S5P=y CONFIG_SAMSUNG_USBPHY=y -CONFIG_MMC_SDHCI_S3C_DMA=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_PLTFM=y +CONFIG_MMC_DW_PCI=y +CONFIG_MMC_DW_EXYNOS=y |