diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-01-19 09:58:16 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-01-19 09:58:16 +0000 |
| commit | 1b273cbc8dcbe16bc48a069bdb7ac5ed09125403 (patch) | |
| tree | fb8c4884517641b87dcabbbdfd9954cc349cf7ba /config-armv7 | |
| parent | 697e916fdee1538757771f06e87fb47130735c8e (diff) | |
| download | kernel-1b273cbc8dcbe16bc48a069bdb7ac5ed09125403.tar.gz kernel-1b273cbc8dcbe16bc48a069bdb7ac5ed09125403.tar.xz kernel-1b273cbc8dcbe16bc48a069bdb7ac5ed09125403.zip | |
- Move Rockchip to ARMv7 generic to support rk32xx on LPAE
- Enable Device Tree Overlays for dynamic DTB
- ARM config updates
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/config-armv7 b/config-armv7 index 223684aef..090ca3781 100644 --- a/config-armv7 +++ b/config-armv7 @@ -9,7 +9,6 @@ CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_QCOM=y -CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_U8500=y # CONFIG_ARCH_VIRT is not set @@ -256,10 +255,9 @@ CONFIG_SND_OMAP_SOC=m CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_OMAP_SOC_AM3517EVM=m CONFIG_SND_OMAP_SOC_DMIC=m -CONFIG_SND_OMAP_SOC_HDMI=m +CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m CONFIG_SND_OMAP_SOC_MCBSP=m CONFIG_SND_OMAP_SOC_MCPDM=m -CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m @@ -376,6 +374,7 @@ CONFIG_SOC_IMX6SX=y # CONFIG_SOC_LS1021A is not set # CONFIG_SOC_VF610 is not set CONFIG_ARM_IMX6Q_CPUFREQ=m +CONFIG_POWER_RESET_IMX=y CONFIG_PCI_IMX6=y CONFIG_IMX_THERMAL=m CONFIG_IMX_SDMA=m @@ -414,7 +413,6 @@ CONFIG_RTC_DRV_SNVS=m # CONFIG_FB_MX3 is not set # CONFIG_FB_IMX is not set # CONFIG_FB_MXS is not set -# CONFIG_POWER_RESET_IMX is not set CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_ASOC_CARD=m @@ -463,8 +461,6 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_VIDEO_CODA=m -CONFIG_MFD_SYSCON=y -CONFIG_GPIO_SYSCON=m CONFIG_SENSORS_MC13783_ADC=m CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_MC13783=m @@ -512,25 +508,6 @@ CONFIG_AK8975=m CONFIG_CM36651=m CONFIG_KEYBOARD_SAMSUNG=m -# Rockchips -CONFIG_I2C_RK3X=m -CONFIG_SPI_ROCKCHIP=m -CONFIG_SND_SOC_ROCKCHIP=m -CONFIG_PWM_ROCKCHIP=m -CONFIG_ROCKCHIP_SARADC=m -CONFIG_ROCKCHIP_IODOMAIN=m -CONFIG_MMC_DW_ROCKCHIP=m -CONFIG_EMAC_ROCKCHIP=m -CONFIG_MFD_RK808=m -CONFIG_COMMON_CLK_RK808=m -CONFIG_REGULATOR_RK808=m -CONFIG_RTC_DRV_HYM8563=m -CONFIG_ROCKCHIP_SARADC=m -CONFIG_ROCKCHIP_IOMMU=y -CONFIG_SND_SOC_ROCKCHIP_I2S=m -CONFIG_ROCKCHIP_THERMAL=m -CONFIG_DRM_ROCKCHIP=m - # ST Ericsson CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y @@ -624,6 +601,7 @@ CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_COMMON_CLK_AXI_CLKGEN=m CONFIG_COMMON_CLK_SI570=m +CONFIG_COMMON_CLK_XLNX_CLKWZRD=m CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_LATTICE_ECP3_CONFIG=m CONFIG_NET_VENDOR_XILINX=y |