diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-05-03 11:21:48 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-05-03 11:21:48 +0100 |
| commit | 566e158188b14fa483a8a8155e1a5a7ba3500e12 (patch) | |
| tree | daf8cbf881559455c0b96c09dbe081ec2b166c7d /config-armv7 | |
| parent | 9c6ca1788c0fe07eea0cc9072f7eadfc85c89a3f (diff) | |
| download | kernel-566e158188b14fa483a8a8155e1a5a7ba3500e12.tar.gz kernel-566e158188b14fa483a8a8155e1a5a7ba3500e12.tar.xz kernel-566e158188b14fa483a8a8155e1a5a7ba3500e12.zip | |
ARM 3.10 merge and general cleanup, Drop dedicated tegra kernel as now Multiplatform enabled, Enable Tegra and UX500 (Snowball) in Multiplatform
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 97 |
1 files changed, 87 insertions, 10 deletions
diff --git a/config-armv7 b/config-armv7 index 4f27e5c06..18230bb7e 100644 --- a/config-armv7 +++ b/config-armv7 @@ -1,19 +1,17 @@ # ARM unified arch kernel -CONFIG_CPU_V7=y -# 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 -# This is V6 so we'll eventually support it in v5 unified kernels + # CONFIG_ARCH_BCM is not set CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_MVEBU=y # CONFIG_ARCH_MXC is not set CONFIG_ARCH_OMAP2PLUS=y CONFIG_ARCH_PICOXCELL=y +# CONFIG_ARCH_SIRF is not set CONFIG_ARCH_SOCFPGA=y +# CONFIG_PLAT_SPEAR is not set CONFIG_ARCH_SUNXI=y +CONFIG_ARCH_TEGRA=y +CONFIG_ARCH_U8500=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_DT=y CONFIG_ARCH_VIRT=y @@ -235,7 +233,7 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_HW_RANDOM_OMAP=m -# CONFIG_DRM_TILCDC is not set +CONFIG_DRM_TILCDC=m CONFIG_DRM_OMAP=m CONFIG_DRM_OMAP_NUM_CRTCS=2 CONFIG_OMAP2_VRAM=y @@ -391,8 +389,85 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m CONFIG_HW_RANDOM_PICOXCELL=m # ST Ericsson -# CONFIG_I2C_NOMADIK is not set -# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_MACH_HREFV60=y +CONFIG_MACH_SNOWBALL=y +CONFIG_MACH_UX500_DT=y + +CONFIG_UX500_DEBUG_UART=2 +CONFIG_AB8500_CORE=y +CONFIG_PINCTRL_ABX500=y +CONFIG_PINCTRL_AB8500=y +CONFIG_I2C_NOMADIK=m +CONFIG_KEYBOARD_NOMADIK=m +CONFIG_DB8500_THERMAL=y +CONFIG_UX500_WATCHDOG=m +CONFIG_SND_SOC_UX500=m +CONFIG_SND_SOC_UX500_PLAT_DMA=m +CONFIG_STE_DMA40=y +CONFIG_HSEM_U8500=m +CONFIG_CLKSRC_DBX500_PRCMU=y +CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y +CONFIG_CRYPTO_DEV_UX500=m +CONFIG_CRYPTO_DEV_UX500_CRYP=m +CONFIG_CRYPTO_DEV_UX500_HASH=m +CONFIG_SENSORS_LIS3_I2C=m + +# tegra +CONFIG_ARCH_TEGRA_2x_SOC=y +CONFIG_ARCH_TEGRA_3x_SOC=y +# CONFIG_ARCH_TEGRA_114_SOC is not set + +CONFIG_SERIAL_TEGRA=y + +CONFIG_TEGRA_PCI=y +CONFIG_TEGRA_IOMMU_GART=y +CONFIG_TEGRA_IOMMU_SMMU=y +CONFIG_MMC_SDHCI_TEGRA=m + +CONFIG_I2C_TEGRA=m + +CONFIG_TEGRA_SYSTEM_DMA=y +CONFIG_TEGRA_EMC_SCALING_ENABLE=y +CONFIG_TEGRA_AHB=y +CONFIG_TEGRA20_APB_DMA=y +# CONFIG_SPI_TEGRA114 is not set +CONFIG_SPI_TEGRA20_SFLASH=m +CONFIG_SPI_TEGRA20_SLINK=m + +CONFIG_KEYBOARD_TEGRA=m +CONFIG_PINCTRL_TEGRA=y +CONFIG_PINCTRL_TEGRA20=y +CONFIG_PINCTRL_TEGRA30=y +CONFIG_USB_EHCI_TEGRA=y +CONFIG_RTC_DRV_TEGRA=y + +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA_ALC5632=m +CONFIG_SND_SOC_TEGRA_WM8753=m +CONFIG_SND_SOC_TEGRA_WM8903=m +CONFIG_SND_SOC_TEGRA_WM9712=m +CONFIG_SND_SOC_TEGRA_TRIMSLICE=m +CONFIG_SND_SOC_TEGRA30_AHUB=m +CONFIG_SND_SOC_TEGRA30_I2S=m +CONFIG_SND_SOC_TEGRA20_AC97=m + +# AC100 (PAZ00) +CONFIG_MFD_NVEC=y +CONFIG_MFD_TPS80031=y +CONFIG_KEYBOARD_NVEC=y +CONFIG_SERIO_NVEC_PS2=y +CONFIG_NVEC_POWER=y +CONFIG_POWER_SUPPLY=y +CONFIG_NVEC_LEDS=y +CONFIG_NVEC_PAZ00=y + +CONFIG_PWM_TEGRA=m + +CONFIG_DRM_TEGRA=m + +CONFIG_CRYPTO_DEV_TEGRA_AES=m + +CONFIG_LEDS_RENESAS_TPU=y # ZYNQ CONFIG_LATTICE_ECP3_CONFIG=m @@ -496,3 +571,5 @@ CONFIG_REGULATOR_LP8755=m # CONFIG_POWER_RESET_QNAP is not set # CONFIG_POWER_RESET_RESTART is not set # CONFIG_OMAP2_DSS_DEBUG is not set +# CONFIG_DRM_TEGRA_DEBUG is not set +# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set |