further exynos kernel config update, cleanup ARM config excludes to ensure consistency across v7 configs

1 files changed, 40 insertions, 30 deletions

diff --git a/config-armv7-generic b/config-armv7-generic
index a844d1d2..be7822bd 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -124,15 +124,8 @@ CONFIG_XZ_DEC_ARM=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_CC_STACKPROTECTOR=y
 
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-
 CONFIG_PCI_HOST_GENERIC=y
 
-# Root as NFS, different from mainline
-CONFIG_ROOT_NFS=y
-
 CONFIG_LBDAF=y
 
 # Device tree
@@ -234,6 +227,7 @@ CONFIG_MFD_SEC_CORE=y
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_RTC_DRV_S5M=m
 # CONFIG_RTC_DRV_S3C is not set
 
 CONFIG_EXYNOS_VIDEO=y
@@ -274,11 +268,18 @@ CONFIG_SND_SOC_SNOW=m
 # Arndale/Origen
 CONFIG_MFD_MAX8997=y
 CONFIG_MFD_MAX77686=y
-CONFIG_MFD_SEC_CORE=y
 CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_EXTCON_MAX8997=m
 
 # regmap
 CONFIG_REGMAP=y
@@ -733,52 +734,58 @@ CONFIG_KEYBOARD_CROS_EC=m
 # Should be in generic
 CONFIG_BPF_JIT=y
 
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_PATA_PLATFORM is not set
+# Needs work/investigation
+# CONFIG_ARM_KPROBES_TEST is not set
+
+# HW Enabled in armv7 not lpae
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
 # CONFIG_AHCI_IMX is not set
 # CONFIG_IMX_THERMAL is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DM9000 is not set
-# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_TI_DAC7512 is not set
+
+# Not needed on ARMv7
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
-# CONFIG_TI_DAC7512 is not set
 # CONFIG_EZX_PCAP is not set
-
-# Needs work/investigation
+# CONFIG_CS89x0 is not set
+# CONFIG_DM9000 is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
 # CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_IP_PNP_RARP is not set
+# CONFIG_SPI_PXA2XX is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_M25PXX_USE_FAST_READ is not set
 # CONFIG_SERIAL_8250_EM is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_FSL_DSPI is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
-
-# these modules all fail with missing __bad_udelay
-# http://www.spinics.net/lists/arm/msg15615.html provides some background
 # CONFIG_SUNGEM is not set
 # CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_RADEON is not set
-# CONFIG_DRM_RADEON is not set
 # CONFIG_ATM_HE is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SFC is not set
-
-# these all currently fail due to missing symbols __bad_udelay or
-# error: implicit declaration of function ‘iowrite32be’
 # CONFIG_SND_ALI5451 is not set
 # CONFIG_MLX4_EN is not set
+# CONFIG_POWER_RESET_QNAP is not set
+# CONFIG_MMC_TMIO is not set
+# CONFIG_PINCTRL_IMX35 is not set
+# CONFIG_DVB_USB_PCTV452E is not set
+
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
 
 # Debug options. We need to deal with them at some point like x86
 # CONFIG_DEBUG_USER is not set
@@ -786,3 +793,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DMADEVICES_VDEBUG is not set
 # CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
+# CONFIG_AB8500_DEBUG is not set