Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
- index d230adbe150a..55e46e50bd7b 100644
- --- a/arch/arm/configs/multi_v7_defconfig
- +++ b/arch/arm/configs/multi_v7_defconfig
- @@ -128,6 +128,7 @@ CONFIG_KEXEC=y
- CONFIG_CPU_FREQ=y
- CONFIG_CPU_FREQ_STAT_DETAILS=y
- CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
- +CONFIG_QORIQ_CPUFREQ=y
- CONFIG_CPU_IDLE=y
- CONFIG_ARM_CPUIDLE=y
- CONFIG_NEON=y
- @@ -172,6 +173,7 @@ CONFIG_DMA_CMA=y
- CONFIG_CMA_SIZE_MBYTES=64
- CONFIG_OMAP_OCP2SCP=y
- CONFIG_SIMPLE_PM_BUS=y
- +CONFIG_SUNXI_RSB=m
- CONFIG_MTD=y
- CONFIG_MTD_CMDLINE_PARTS=y
- CONFIG_MTD_BLOCK=y
- @@ -181,8 +183,11 @@ CONFIG_MTD_NAND_ATMEL=y
- CONFIG_MTD_NAND_BRCMNAND=y
- CONFIG_MTD_NAND_DAVINCI=y
- CONFIG_MTD_SPI_NOR=y
- +CONFIG_SPI_FSL_QUADSPI=m
- CONFIG_MTD_UBI=y
- CONFIG_BLK_DEV_LOOP=y
- +CONFIG_BLK_DEV_RAM=y
- +CONFIG_BLK_DEV_RAM_SIZE=65536
- CONFIG_AD525X_DPOT=y
- CONFIG_AD525X_DPOT_I2C=y
- CONFIG_ATMEL_TCLIB=y
- @@ -192,7 +197,6 @@ CONFIG_QCOM_COINCELL=m
- CONFIG_APDS9802ALS=y
- CONFIG_ISL29003=y
- CONFIG_EEPROM_AT24=y
- -CONFIG_EEPROM_SUNXI_SID=y
- CONFIG_BLK_DEV_SD=y
- CONFIG_BLK_DEV_SR=y
- CONFIG_SCSI_MULTI_LUN=y
- @@ -210,6 +214,7 @@ CONFIG_HIX5HD2_GMAC=y
- CONFIG_SUN4I_EMAC=y
- CONFIG_MACB=y
- CONFIG_NET_CALXEDA_XGMAC=y
- +CONFIG_GIANFAR=y
- CONFIG_IGB=y
- CONFIG_MV643XX_ETH=y
- CONFIG_MVNETA=y
- @@ -226,6 +231,7 @@ CONFIG_MARVELL_PHY=y
- CONFIG_SMSC_PHY=y
- CONFIG_BROADCOM_PHY=y
- CONFIG_ICPLUS_PHY=y
- +CONFIG_REALTEK_PHY=y
- CONFIG_MICREL_PHY=y
- CONFIG_FIXED_PHY=y
- CONFIG_USB_PEGASUS=y
- @@ -257,7 +263,7 @@ CONFIG_TOUCHSCREEN_SUN4I=y
- CONFIG_TOUCHSCREEN_WM97XX=m
- CONFIG_INPUT_MISC=y
- CONFIG_INPUT_MPU3050=y
- -CONFIG_INPUT_AXP20X_PEK=y
- +CONFIG_INPUT_AXP20X_PEK=m
- CONFIG_INPUT_ADXL34X=m
- CONFIG_SERIO_AMBAKMI=y
- CONFIG_SERIAL_8250=y
- @@ -310,6 +316,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
- CONFIG_I2C_DIGICOLOR=m
- CONFIG_I2C_GPIO=m
- CONFIG_I2C_EXYNOS5=y
- +CONFIG_I2C_IMX=m
- CONFIG_I2C_MV64XXX=y
- CONFIG_I2C_RIIC=y
- CONFIG_I2C_RK3X=y
- @@ -328,6 +335,7 @@ CONFIG_SPI=y
- CONFIG_SPI_ATMEL=m
- CONFIG_SPI_CADENCE=y
- CONFIG_SPI_DAVINCI=y
- +CONFIG_SPI_FSL_DSPI=m
- CONFIG_SPI_OMAP24XX=y
- CONFIG_SPI_ORION=y
- CONFIG_SPI_PL022=y
- @@ -378,6 +386,7 @@ CONFIG_BATTERY_MAX17042=m
- CONFIG_CHARGER_MAX14577=m
- CONFIG_CHARGER_MAX77693=m
- CONFIG_CHARGER_TPS65090=y
- +CONFIG_AXP20X_POWER=m
- CONFIG_POWER_RESET_AS3722=y
- CONFIG_POWER_RESET_GPIO=y
- CONFIG_POWER_RESET_GPIO_RESTART=y
- @@ -401,6 +410,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
- CONFIG_ORION_WATCHDOG=y
- CONFIG_ST_LPC_WATCHDOG=y
- CONFIG_SUNXI_WATCHDOG=y
- +CONFIG_IMX2_WDT=y
- CONFIG_TEGRA_WATCHDOG=m
- CONFIG_MESON_WATCHDOG=y
- CONFIG_DIGICOLOR_WATCHDOG=y
- @@ -409,6 +419,8 @@ CONFIG_MFD_AS3722=y
- CONFIG_MFD_ATMEL_FLEXCOM=y
- CONFIG_MFD_BCM590XX=y
- CONFIG_MFD_AXP20X=y
- +CONFIG_MFD_AXP20X_I2C=m
- +CONFIG_MFD_AXP20X_RSB=m
- CONFIG_MFD_CROS_EC=y
- CONFIG_MFD_CROS_EC_I2C=m
- CONFIG_MFD_CROS_EC_SPI=y
- @@ -430,7 +442,7 @@ CONFIG_REGULATOR_AB8500=y
- CONFIG_REGULATOR_ACT8865=y
- CONFIG_REGULATOR_AS3711=y
- CONFIG_REGULATOR_AS3722=y
- -CONFIG_REGULATOR_AXP20X=y
- +CONFIG_REGULATOR_AXP20X=m
- CONFIG_REGULATOR_BCM590XX=y
- CONFIG_REGULATOR_DA9210=y
- CONFIG_REGULATOR_FAN53555=y
- @@ -517,6 +529,7 @@ CONFIG_SND_USB_AUDIO=y
- CONFIG_SND_SOC=m
- CONFIG_SND_ATMEL_SOC=m
- CONFIG_SND_ATMEL_SOC_WM8904=m
- +CONFIG_SND_SOC_FSL_SAI=m
- CONFIG_SND_SOC_SH4_FSI=m
- CONFIG_SND_SOC_RCAR=m
- CONFIG_SND_SOC_RSRC_CARD=m
- @@ -529,6 +542,7 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
- CONFIG_SND_SOC_TEGRA_ALC5632=m
- CONFIG_SND_SOC_TEGRA_MAX98090=m
- CONFIG_SND_SOC_AK4642=m
- +CONFIG_SND_SOC_SGTL5000=m
- CONFIG_SND_SOC_WM8978=m
- CONFIG_USB=y
- CONFIG_USB_XHCI_HCD=y
- @@ -569,6 +583,7 @@ CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_PLTFM=y
- CONFIG_MMC_SDHCI_OF_ARASAN=y
- CONFIG_MMC_SDHCI_OF_AT91=y
- +CONFIG_MMC_SDHCI_OF_ESDHC=m
- CONFIG_MMC_SDHCI_ESDHC_IMX=y
- CONFIG_MMC_SDHCI_DOVE=y
- CONFIG_MMC_SDHCI_TEGRA=y
- @@ -641,6 +656,7 @@ CONFIG_DMADEVICES=y
- CONFIG_DW_DMAC=y
- CONFIG_AT_HDMAC=y
- CONFIG_AT_XDMAC=y
- +CONFIG_FSL_EDMA=m
- CONFIG_MV_XOR=y
- CONFIG_TEGRA20_APB_DMA=y
- CONFIG_SH_DMAE=y
- @@ -672,6 +688,7 @@ CONFIG_QCOM_SMD_RPM=y
- CONFIG_QCOM_SMP2P=y
- CONFIG_QCOM_SMSM=y
- CONFIG_QCOM_WCNSS_CTRL=m
- +CONFIG_ROCKCHIP_PM_DOMAINS=y
- CONFIG_COMMON_CLK_QCOM=y
- CONFIG_CHROME_PLATFORMS=y
- CONFIG_CROS_EC_CHARDEV=m
- @@ -700,6 +717,7 @@ CONFIG_AK8975=y
- CONFIG_PWM=y
- CONFIG_PWM_ATMEL=m
- CONFIG_PWM_ATMEL_TCB=m
- +CONFIG_PWM_FSL_FTM=m
- CONFIG_PWM_RENESAS_TPU=y
- CONFIG_PWM_ROCKCHIP=m
- CONFIG_PWM_SAMSUNG=m
- @@ -722,6 +740,8 @@ CONFIG_PHY_STIH407_USB=y
- CONFIG_PHY_SUN4I_USB=y
- CONFIG_PHY_SUN9I_USB=y
- CONFIG_PHY_SAMSUNG_USB2=m
- +CONFIG_NVMEM=y
- +CONFIG_NVMEM_SUNXI_SID=y
- CONFIG_EXT4_FS=y
- CONFIG_AUTOFS4_FS=y
- CONFIG_MSDOS_FS=y
Add Comment
Please, Sign In to add comment