summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/CONFIG_CHARGER_CPCAP1
-rw-r--r--baseconfig/CONFIG_CPCAP_ADC1
-rw-r--r--baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT2
-rw-r--r--baseconfig/CONFIG_DRM_MXSFB2
-rw-r--r--baseconfig/CONFIG_DRM_PANEL_LG_LG4573 (renamed from baseconfig/x86/CONFIG_DRM_PANEL_LG_LG4573)0
-rw-r--r--baseconfig/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 (renamed from baseconfig/powerpc/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00)0
-rw-r--r--baseconfig/CONFIG_DRM_PANEL_SAMSUNG_LD9040 (renamed from baseconfig/x86/CONFIG_DRM_PANEL_SAMSUNG_LD9040)0
-rw-r--r--baseconfig/CONFIG_IIO_CROS_EC_SENSORS_COR1
-rw-r--r--baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON1
-rw-r--r--baseconfig/CONFIG_INPUT_MMA84502
-rw-r--r--baseconfig/CONFIG_KEYBOARD_QT10702
-rw-r--r--baseconfig/CONFIG_LEDS_CPCAP1
-rw-r--r--baseconfig/CONFIG_MAX13632
-rw-r--r--baseconfig/CONFIG_MFD_CPCAP2
-rw-r--r--baseconfig/CONFIG_MFD_EXYNOS_LPASS1
-rw-r--r--baseconfig/CONFIG_PCI_ENDPOINT2
-rw-r--r--baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS1
-rw-r--r--baseconfig/CONFIG_PCI_EPF_TEST1
-rw-r--r--baseconfig/CONFIG_REGULATOR_CPCAP1
-rw-r--r--baseconfig/CONFIG_RTC_DRV_CPCAP1
-rw-r--r--baseconfig/CONFIG_SENSORS_ADS10152
-rw-r--r--baseconfig/CONFIG_SND_BCM28A351
-rw-r--r--baseconfig/CONFIG_SPI_ROCKCHIP (renamed from baseconfig/x86/CONFIG_SPI_ROCKCHIP)0
-rw-r--r--baseconfig/CONFIG_TI_ADS10152
-rw-r--r--baseconfig/arm/CONFIG_BCM_VIDEOCORE (renamed from baseconfig/CONFIG_BCM_VIDEOCORE)0
-rw-r--r--baseconfig/arm/CONFIG_CROS_EC_CHARDEV (renamed from baseconfig/arm/armv7/CONFIG_CROS_EC_CHARDEV)0
-rw-r--r--baseconfig/arm/CONFIG_CROS_EC_PROTO (renamed from baseconfig/arm/armv7/CONFIG_CROS_EC_PROTO)0
-rw-r--r--baseconfig/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR (renamed from baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR)0
-rw-r--r--baseconfig/arm/CONFIG_DRM_LVDS_ENCODER1
-rw-r--r--baseconfig/arm/CONFIG_DRM_TOSHIBA_TC3587671
-rw-r--r--baseconfig/arm/CONFIG_I2C_CROS_EC_TUNNEL (renamed from baseconfig/arm/armv7/CONFIG_I2C_CROS_EC_TUNNEL)0
-rw-r--r--baseconfig/arm/CONFIG_IIO_CROS_EC_BARO1
-rw-r--r--baseconfig/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX (renamed from baseconfig/CONFIG_IIO_CROS_EC_LIGHT_PROX)0
-rw-r--r--baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS (renamed from baseconfig/CONFIG_IIO_CROS_EC_SENSORS)0
-rw-r--r--baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE (renamed from baseconfig/CONFIG_IIO_CROS_EC_SENSORS_CORE)0
-rw-r--r--baseconfig/arm/CONFIG_KEYBOARD_ADC1
-rw-r--r--baseconfig/arm/CONFIG_KEYBOARD_CROS_EC (renamed from baseconfig/arm/armv7/CONFIG_KEYBOARD_CROS_EC)0
-rw-r--r--baseconfig/arm/CONFIG_MFD_CROS_EC (renamed from baseconfig/arm/armv7/CONFIG_MFD_CROS_EC)0
-rw-r--r--baseconfig/arm/CONFIG_MFD_CROS_EC_I2C (renamed from baseconfig/arm/armv7/CONFIG_MFD_CROS_EC_I2C)0
-rw-r--r--baseconfig/arm/CONFIG_MFD_CROS_EC_SPI (renamed from baseconfig/arm/armv7/CONFIG_MFD_CROS_EC_SPI)0
-rw-r--r--baseconfig/arm/CONFIG_PWM_CROS_EC (renamed from baseconfig/arm/armv7/CONFIG_PWM_CROS_EC)0
-rw-r--r--baseconfig/arm/CONFIG_QCOM_SPMI_IADC1
-rw-r--r--baseconfig/arm/CONFIG_QCOM_SPMI_VADC1
-rw-r--r--baseconfig/arm/CONFIG_REGULATOR_FAN535552
-rw-r--r--baseconfig/arm/CONFIG_REGULATOR_QCOM_SPMI1
-rw-r--r--baseconfig/arm/CONFIG_VIDEO_BCM2835 (renamed from baseconfig/CONFIG_VIDEO_BCM2835)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN2
-rw-r--r--baseconfig/arm/arm64/CONFIG_AXP20X_ADC (renamed from baseconfig/arm/CONFIG_AXP20X_ADC)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X (renamed from baseconfig/arm/CONFIG_BATTERY_AXP20X)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL1
-rw-r--r--baseconfig/arm/arm64/CONFIG_GPIO_PCA953X1
-rw-r--r--baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL (renamed from baseconfig/CONFIG_QCOM_ADSP_PIL)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER (renamed from baseconfig/arm/CONFIG_QCOM_IRQ_COMBINER)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL2
-rw-r--r--baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL2
-rw-r--r--baseconfig/arm/arm64/CONFIG_REGMAP_SPMI (renamed from baseconfig/arm/CONFIG_REGMAP_SPMI)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_SPMI (renamed from baseconfig/arm/CONFIG_SPMI)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_AXP20X_ADC1
-rw-r--r--baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_LG_LG45731
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N001
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_LD90401
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA01
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LQ101R1SX011
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LS043T1LE011
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_PANEL_SIMPLE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_MMA84521
-rw-r--r--baseconfig/arm/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM1
-rw-r--r--baseconfig/arm/armv7/CONFIG_REGULATOR_FAN535551
-rw-r--r--baseconfig/arm/armv7/CONFIG_SND_SOC_MAX980901
-rw-r--r--baseconfig/arm/armv7/CONFIG_UBIFS_FS1
-rw-r--r--baseconfig/arm/armv7/CONFIG_UBIFS_FS_ADVANCED_COMPR1
-rw-r--r--baseconfig/arm/armv7/CONFIG_UBIFS_FS_LZO1
-rw-r--r--baseconfig/arm/armv7/CONFIG_UBIFS_FS_ZLIB1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KXSD91
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_FAN535551
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_SPMI1
-rw-r--r--baseconfig/s390x/CONFIG_CRASH_DUMP1
-rw-r--r--baseconfig/x86/CONFIG_DRM_PANEL (renamed from baseconfig/arm/armv7/CONFIG_DRM_PANEL)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N001
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH (renamed from baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH)0
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH (renamed from baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)0
-rw-r--r--baseconfig/x86/i686/CONFIG_DRM_PANEL1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_DRM_PANEL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DRM_PANEL1
95 files changed, 33 insertions, 50 deletions
diff --git a/baseconfig/CONFIG_CHARGER_CPCAP b/baseconfig/CONFIG_CHARGER_CPCAP
deleted file mode 100644
index dd7985cf1..000000000
--- a/baseconfig/CONFIG_CHARGER_CPCAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_CPCAP is not set
diff --git a/baseconfig/CONFIG_CPCAP_ADC b/baseconfig/CONFIG_CPCAP_ADC
deleted file mode 100644
index 9371bbcea..000000000
--- a/baseconfig/CONFIG_CPCAP_ADC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CPCAP_ADC is not set
diff --git a/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT b/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
index 95f043d68..83b61e1e1 100644
--- a/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
+++ b/baseconfig/CONFIG_CROS_KBD_LED_BACKLIGHT
@@ -1 +1 @@
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
diff --git a/baseconfig/CONFIG_DRM_MXSFB b/baseconfig/CONFIG_DRM_MXSFB
index e24a8952c..550352f6d 100644
--- a/baseconfig/CONFIG_DRM_MXSFB
+++ b/baseconfig/CONFIG_DRM_MXSFB
@@ -1 +1 @@
-CONFIG_DRM_MXSFB=m
+# CONFIG_DRM_MXSFB is not set
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL_LG_LG4573 b/baseconfig/CONFIG_DRM_PANEL_LG_LG4573
index 35ecd6eba..35ecd6eba 100644
--- a/baseconfig/x86/CONFIG_DRM_PANEL_LG_LG4573
+++ b/baseconfig/CONFIG_DRM_PANEL_LG_LG4573
diff --git a/baseconfig/powerpc/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 b/baseconfig/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
index 5b25d7565..5b25d7565 100644
--- a/baseconfig/powerpc/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
+++ b/baseconfig/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL_SAMSUNG_LD9040 b/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_LD9040
index 8aae09888..8aae09888 100644
--- a/baseconfig/x86/CONFIG_DRM_PANEL_SAMSUNG_LD9040
+++ b/baseconfig/CONFIG_DRM_PANEL_SAMSUNG_LD9040
diff --git a/baseconfig/CONFIG_IIO_CROS_EC_SENSORS_COR b/baseconfig/CONFIG_IIO_CROS_EC_SENSORS_COR
deleted file mode 100644
index f3d54f70e..000000000
--- a/baseconfig/CONFIG_IIO_CROS_EC_SENSORS_COR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IIO_CROS_EC_SENSORS_COR=m
diff --git a/baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON b/baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON
deleted file mode 100644
index 8bb21d01a..000000000
--- a/baseconfig/CONFIG_INPUT_CPCAP_PWRBUTTON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_CPCAP_PWRBUTTON is not set
diff --git a/baseconfig/CONFIG_INPUT_MMA8450 b/baseconfig/CONFIG_INPUT_MMA8450
index 68519d153..105180917 100644
--- a/baseconfig/CONFIG_INPUT_MMA8450
+++ b/baseconfig/CONFIG_INPUT_MMA8450
@@ -1 +1 @@
-CONFIG_INPUT_MMA8450=m
+# CONFIG_INPUT_MMA8450 is not set
diff --git a/baseconfig/CONFIG_KEYBOARD_QT1070 b/baseconfig/CONFIG_KEYBOARD_QT1070
index 7deb75f9a..f9f0b0a84 100644
--- a/baseconfig/CONFIG_KEYBOARD_QT1070
+++ b/baseconfig/CONFIG_KEYBOARD_QT1070
@@ -1 +1 @@
-# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT1070=m
diff --git a/baseconfig/CONFIG_LEDS_CPCAP b/baseconfig/CONFIG_LEDS_CPCAP
deleted file mode 100644
index 6874ecff2..000000000
--- a/baseconfig/CONFIG_LEDS_CPCAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LEDS_CPCAP is not set
diff --git a/baseconfig/CONFIG_MAX1363 b/baseconfig/CONFIG_MAX1363
index d0090112c..08e944fb7 100644
--- a/baseconfig/CONFIG_MAX1363
+++ b/baseconfig/CONFIG_MAX1363
@@ -1 +1 @@
-# CONFIG_MAX1363 is not set
+CONFIG_MAX1363=m
diff --git a/baseconfig/CONFIG_MFD_CPCAP b/baseconfig/CONFIG_MFD_CPCAP
index acf5bd3fe..0f0408181 100644
--- a/baseconfig/CONFIG_MFD_CPCAP
+++ b/baseconfig/CONFIG_MFD_CPCAP
@@ -1 +1 @@
-CONFIG_MFD_CPCAP=m
+# CONFIG_MFD_CPCAP is not set
diff --git a/baseconfig/CONFIG_MFD_EXYNOS_LPASS b/baseconfig/CONFIG_MFD_EXYNOS_LPASS
deleted file mode 100644
index d733b0518..000000000
--- a/baseconfig/CONFIG_MFD_EXYNOS_LPASS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_EXYNOS_LPASS is not set
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT b/baseconfig/CONFIG_PCI_ENDPOINT
index 187b028d7..d90e2a4f7 100644
--- a/baseconfig/CONFIG_PCI_ENDPOINT
+++ b/baseconfig/CONFIG_PCI_ENDPOINT
@@ -1 +1 @@
-CONFIG_PCI_ENDPOINT=y
+# CONFIG_PCI_ENDPOINT is not set
diff --git a/baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS b/baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS
deleted file mode 100644
index 9763ac775..000000000
--- a/baseconfig/CONFIG_PCI_ENDPOINT_CONFIGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_ENDPOINT_CONFIGFS=y
diff --git a/baseconfig/CONFIG_PCI_EPF_TEST b/baseconfig/CONFIG_PCI_EPF_TEST
deleted file mode 100644
index 5b77c0678..000000000
--- a/baseconfig/CONFIG_PCI_EPF_TEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_EPF_TEST is not set
diff --git a/baseconfig/CONFIG_REGULATOR_CPCAP b/baseconfig/CONFIG_REGULATOR_CPCAP
deleted file mode 100644
index 02e701e66..000000000
--- a/baseconfig/CONFIG_REGULATOR_CPCAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_CPCAP=m
diff --git a/baseconfig/CONFIG_RTC_DRV_CPCAP b/baseconfig/CONFIG_RTC_DRV_CPCAP
deleted file mode 100644
index 1b1f9af60..000000000
--- a/baseconfig/CONFIG_RTC_DRV_CPCAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RTC_DRV_CPCAP is not set
diff --git a/baseconfig/CONFIG_SENSORS_ADS1015 b/baseconfig/CONFIG_SENSORS_ADS1015
index 4fc01f323..928b4f25f 100644
--- a/baseconfig/CONFIG_SENSORS_ADS1015
+++ b/baseconfig/CONFIG_SENSORS_ADS1015
@@ -1 +1 @@
-CONFIG_SENSORS_ADS1015=m
+# CONFIG_SENSORS_ADS1015 is not set
diff --git a/baseconfig/CONFIG_SND_BCM28A35 b/baseconfig/CONFIG_SND_BCM28A35
deleted file mode 100644
index 1f8870c58..000000000
--- a/baseconfig/CONFIG_SND_BCM28A35
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_BCM28A35 is not set
diff --git a/baseconfig/x86/CONFIG_SPI_ROCKCHIP b/baseconfig/CONFIG_SPI_ROCKCHIP
index bf067a3e5..bf067a3e5 100644
--- a/baseconfig/x86/CONFIG_SPI_ROCKCHIP
+++ b/baseconfig/CONFIG_SPI_ROCKCHIP
diff --git a/baseconfig/CONFIG_TI_ADS1015 b/baseconfig/CONFIG_TI_ADS1015
index 8a8d511c6..f57c3fdc4 100644
--- a/baseconfig/CONFIG_TI_ADS1015
+++ b/baseconfig/CONFIG_TI_ADS1015
@@ -1 +1 @@
-# CONFIG_TI_ADS1015 is not set
+CONFIG_TI_ADS1015=m
diff --git a/baseconfig/CONFIG_BCM_VIDEOCORE b/baseconfig/arm/CONFIG_BCM_VIDEOCORE
index 6897b418e..6897b418e 100644
--- a/baseconfig/CONFIG_BCM_VIDEOCORE
+++ b/baseconfig/arm/CONFIG_BCM_VIDEOCORE
diff --git a/baseconfig/arm/armv7/CONFIG_CROS_EC_CHARDEV b/baseconfig/arm/CONFIG_CROS_EC_CHARDEV
index a3df83240..a3df83240 100644
--- a/baseconfig/arm/armv7/CONFIG_CROS_EC_CHARDEV
+++ b/baseconfig/arm/CONFIG_CROS_EC_CHARDEV
diff --git a/baseconfig/arm/armv7/CONFIG_CROS_EC_PROTO b/baseconfig/arm/CONFIG_CROS_EC_PROTO
index 96a1e9bcb..96a1e9bcb 100644
--- a/baseconfig/arm/armv7/CONFIG_CROS_EC_PROTO
+++ b/baseconfig/arm/CONFIG_CROS_EC_PROTO
diff --git a/baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR b/baseconfig/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR
index 03757767c..03757767c 100644
--- a/baseconfig/arm/armv7/CONFIG_DEFAULT_MMAP_MIN_ADDR
+++ b/baseconfig/arm/CONFIG_DEFAULT_MMAP_MIN_ADDR
diff --git a/baseconfig/arm/CONFIG_DRM_LVDS_ENCODER b/baseconfig/arm/CONFIG_DRM_LVDS_ENCODER
new file mode 100644
index 000000000..53f0efb59
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_LVDS_ENCODER
@@ -0,0 +1 @@
+CONFIG_DRM_LVDS_ENCODER=m
diff --git a/baseconfig/arm/CONFIG_DRM_TOSHIBA_TC358767 b/baseconfig/arm/CONFIG_DRM_TOSHIBA_TC358767
new file mode 100644
index 000000000..dd9667384
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DRM_TOSHIBA_TC358767
@@ -0,0 +1 @@
+CONFIG_DRM_TOSHIBA_TC358767=m
diff --git a/baseconfig/arm/armv7/CONFIG_I2C_CROS_EC_TUNNEL b/baseconfig/arm/CONFIG_I2C_CROS_EC_TUNNEL
index f32c67849..f32c67849 100644
--- a/baseconfig/arm/armv7/CONFIG_I2C_CROS_EC_TUNNEL
+++ b/baseconfig/arm/CONFIG_I2C_CROS_EC_TUNNEL
diff --git a/baseconfig/arm/CONFIG_IIO_CROS_EC_BARO b/baseconfig/arm/CONFIG_IIO_CROS_EC_BARO
new file mode 100644
index 000000000..c64555bfa
--- /dev/null
+++ b/baseconfig/arm/CONFIG_IIO_CROS_EC_BARO
@@ -0,0 +1 @@
+CONFIG_IIO_CROS_EC_BARO=m
diff --git a/baseconfig/CONFIG_IIO_CROS_EC_LIGHT_PROX b/baseconfig/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX
index deb1a6eb5..deb1a6eb5 100644
--- a/baseconfig/CONFIG_IIO_CROS_EC_LIGHT_PROX
+++ b/baseconfig/arm/CONFIG_IIO_CROS_EC_LIGHT_PROX
diff --git a/baseconfig/CONFIG_IIO_CROS_EC_SENSORS b/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS
index e93e4c8f0..e93e4c8f0 100644
--- a/baseconfig/CONFIG_IIO_CROS_EC_SENSORS
+++ b/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS
diff --git a/baseconfig/CONFIG_IIO_CROS_EC_SENSORS_CORE b/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE
index baf78d1ad..baf78d1ad 100644
--- a/baseconfig/CONFIG_IIO_CROS_EC_SENSORS_CORE
+++ b/baseconfig/arm/CONFIG_IIO_CROS_EC_SENSORS_CORE
diff --git a/baseconfig/arm/CONFIG_KEYBOARD_ADC b/baseconfig/arm/CONFIG_KEYBOARD_ADC
new file mode 100644
index 000000000..d9b66de57
--- /dev/null
+++ b/baseconfig/arm/CONFIG_KEYBOARD_ADC
@@ -0,0 +1 @@
+CONFIG_KEYBOARD_ADC=m
diff --git a/baseconfig/arm/armv7/CONFIG_KEYBOARD_CROS_EC b/baseconfig/arm/CONFIG_KEYBOARD_CROS_EC
index 0444103f7..0444103f7 100644
--- a/baseconfig/arm/armv7/CONFIG_KEYBOARD_CROS_EC
+++ b/baseconfig/arm/CONFIG_KEYBOARD_CROS_EC
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_CROS_EC b/baseconfig/arm/CONFIG_MFD_CROS_EC
index 3600231f6..3600231f6 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_CROS_EC
+++ b/baseconfig/arm/CONFIG_MFD_CROS_EC
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_CROS_EC_I2C b/baseconfig/arm/CONFIG_MFD_CROS_EC_I2C
index e67f4a1e6..e67f4a1e6 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_CROS_EC_I2C
+++ b/baseconfig/arm/CONFIG_MFD_CROS_EC_I2C
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_CROS_EC_SPI b/baseconfig/arm/CONFIG_MFD_CROS_EC_SPI
index 3b26eb47d..3b26eb47d 100644
--- a/baseconfig/arm/armv7/CONFIG_MFD_CROS_EC_SPI
+++ b/baseconfig/arm/CONFIG_MFD_CROS_EC_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_PWM_CROS_EC b/baseconfig/arm/CONFIG_PWM_CROS_EC
index b3e721134..b3e721134 100644
--- a/baseconfig/arm/armv7/CONFIG_PWM_CROS_EC
+++ b/baseconfig/arm/CONFIG_PWM_CROS_EC
diff --git a/baseconfig/arm/CONFIG_QCOM_SPMI_IADC b/baseconfig/arm/CONFIG_QCOM_SPMI_IADC
deleted file mode 100644
index 1b31637a0..000000000
--- a/baseconfig/arm/CONFIG_QCOM_SPMI_IADC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_SPMI_IADC is not set
diff --git a/baseconfig/arm/CONFIG_QCOM_SPMI_VADC b/baseconfig/arm/CONFIG_QCOM_SPMI_VADC
deleted file mode 100644
index 54e057273..000000000
--- a/baseconfig/arm/CONFIG_QCOM_SPMI_VADC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_SPMI_VADC is not set
diff --git a/baseconfig/arm/CONFIG_REGULATOR_FAN53555 b/baseconfig/arm/CONFIG_REGULATOR_FAN53555
index d62314c7d..5534cc406 100644
--- a/baseconfig/arm/CONFIG_REGULATOR_FAN53555
+++ b/baseconfig/arm/CONFIG_REGULATOR_FAN53555
@@ -1 +1 @@
-# CONFIG_REGULATOR_FAN53555 is not set
+CONFIG_REGULATOR_FAN53555=m
diff --git a/baseconfig/arm/CONFIG_REGULATOR_QCOM_SPMI b/baseconfig/arm/CONFIG_REGULATOR_QCOM_SPMI
deleted file mode 100644
index fe224dc89..000000000
--- a/baseconfig/arm/CONFIG_REGULATOR_QCOM_SPMI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_QCOM_SPMI is not set
diff --git a/baseconfig/CONFIG_VIDEO_BCM2835 b/baseconfig/arm/CONFIG_VIDEO_BCM2835
index 192fdf645..192fdf645 100644
--- a/baseconfig/CONFIG_VIDEO_BCM2835
+++ b/baseconfig/arm/CONFIG_VIDEO_BCM2835
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN b/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
index 3b878e832..294c8ec50 100644
--- a/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_SW_TTBR0_PAN
@@ -1 +1 @@
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
+CONFIG_ARM64_SW_TTBR0_PAN=y
diff --git a/baseconfig/arm/CONFIG_AXP20X_ADC b/baseconfig/arm/arm64/CONFIG_AXP20X_ADC
index 025239f25..025239f25 100644
--- a/baseconfig/arm/CONFIG_AXP20X_ADC
+++ b/baseconfig/arm/arm64/CONFIG_AXP20X_ADC
diff --git a/baseconfig/arm/CONFIG_BATTERY_AXP20X b/baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X
index 75591a277..75591a277 100644
--- a/baseconfig/arm/CONFIG_BATTERY_AXP20X
+++ b/baseconfig/arm/arm64/CONFIG_BATTERY_AXP20X
diff --git a/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL b/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL
new file mode 100644
index 000000000..61cb97435
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CRYPTO_DEV_SAFEXCEL
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
diff --git a/baseconfig/arm/arm64/CONFIG_GPIO_PCA953X b/baseconfig/arm/arm64/CONFIG_GPIO_PCA953X
deleted file mode 100644
index 15f1c9373..000000000
--- a/baseconfig/arm/arm64/CONFIG_GPIO_PCA953X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_PCA953X=m
diff --git a/baseconfig/CONFIG_QCOM_ADSP_PIL b/baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL
index 0aa258124..0aa258124 100644
--- a/baseconfig/CONFIG_QCOM_ADSP_PIL
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_ADSP_PIL
diff --git a/baseconfig/arm/CONFIG_QCOM_IRQ_COMBINER b/baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER
index 6c23d15f7..6c23d15f7 100644
--- a/baseconfig/arm/CONFIG_QCOM_IRQ_COMBINER
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_IRQ_COMBINER
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL b/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL
index b749a7daa..18d8fb792 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_Q6V5_PIL
@@ -1 +1 @@
-# CONFIG_QCOM_Q6V5_PIL is not set
+CONFIG_QCOM_Q6V5_PIL=m
diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL b/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL
index bb8c24d61..b13cefb38 100644
--- a/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL
+++ b/baseconfig/arm/arm64/CONFIG_QCOM_WCNSS_PIL
@@ -1 +1 @@
-# CONFIG_QCOM_WCNSS_PIL is not set
+CONFIG_QCOM_WCNSS_PIL=m
diff --git a/baseconfig/arm/CONFIG_REGMAP_SPMI b/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
index 0c319596b..0c319596b 100644
--- a/baseconfig/arm/CONFIG_REGMAP_SPMI
+++ b/baseconfig/arm/arm64/CONFIG_REGMAP_SPMI
diff --git a/baseconfig/arm/CONFIG_SPMI b/baseconfig/arm/arm64/CONFIG_SPMI
index b340c89e6..b340c89e6 100644
--- a/baseconfig/arm/CONFIG_SPMI
+++ b/baseconfig/arm/arm64/CONFIG_SPMI
diff --git a/baseconfig/arm/armv7/CONFIG_AXP20X_ADC b/baseconfig/arm/armv7/CONFIG_AXP20X_ADC
new file mode 100644
index 000000000..025239f25
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_AXP20X_ADC
@@ -0,0 +1 @@
+CONFIG_AXP20X_ADC=m
diff --git a/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X b/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X
new file mode 100644
index 000000000..75591a277
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_BATTERY_AXP20X
@@ -0,0 +1 @@
+CONFIG_BATTERY_AXP20X=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_LG_LG4573 b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_LG_LG4573
deleted file mode 100644
index bdb9d96a2..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_LG_LG4573
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_LG_LG4573=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
deleted file mode 100644
index 6a1aa6578..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_LD9040 b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_LD9040
deleted file mode 100644
index aa66847bb..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_LD9040
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
deleted file mode 100644
index 8e8122a2d..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
deleted file mode 100644
index e5e36406d..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LQ101R1SX01
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LS043T1LE01 b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
deleted file mode 100644
index e3649f9de..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SHARP_LS043T1LE01
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SIMPLE b/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SIMPLE
deleted file mode 100644
index 1c716c97c..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL_SIMPLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_SIMPLE=m
diff --git a/baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO b/baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO
deleted file mode 100644
index 7b38ce09b..000000000
--- a/baseconfig/arm/armv7/CONFIG_IIO_CROS_EC_BARO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IIO_CROS_EC_BARO is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MMA8452 b/baseconfig/arm/armv7/CONFIG_MMA8452
new file mode 100644
index 000000000..44b2d2ae8
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MMA8452
@@ -0,0 +1 @@
+CONFIG_MMA8452=m
diff --git a/baseconfig/arm/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM b/baseconfig/arm/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
deleted file mode 100644
index 69966daab..000000000
--- a/baseconfig/arm/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_FAN53555 b/baseconfig/arm/armv7/CONFIG_REGULATOR_FAN53555
deleted file mode 100644
index 5534cc406..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_FAN53555
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_FAN53555=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090 b/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090
new file mode 100644
index 000000000..c22ad4a46
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_MAX98090
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MAX98090=m
diff --git a/baseconfig/arm/armv7/CONFIG_UBIFS_FS b/baseconfig/arm/armv7/CONFIG_UBIFS_FS
deleted file mode 100644
index e71980df4..000000000
--- a/baseconfig/arm/armv7/CONFIG_UBIFS_FS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UBIFS_FS=m
diff --git a/baseconfig/arm/armv7/CONFIG_UBIFS_FS_ADVANCED_COMPR b/baseconfig/arm/armv7/CONFIG_UBIFS_FS_ADVANCED_COMPR
deleted file mode 100644
index f91c8cd6c..000000000
--- a/baseconfig/arm/armv7/CONFIG_UBIFS_FS_ADVANCED_COMPR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
diff --git a/baseconfig/arm/armv7/CONFIG_UBIFS_FS_LZO b/baseconfig/arm/armv7/CONFIG_UBIFS_FS_LZO
deleted file mode 100644
index e743a6b32..000000000
--- a/baseconfig/arm/armv7/CONFIG_UBIFS_FS_LZO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UBIFS_FS_LZO=y
diff --git a/baseconfig/arm/armv7/CONFIG_UBIFS_FS_ZLIB b/baseconfig/arm/armv7/CONFIG_UBIFS_FS_ZLIB
deleted file mode 100644
index 18bffa1f1..000000000
--- a/baseconfig/arm/armv7/CONFIG_UBIFS_FS_ZLIB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UBIFS_FS_ZLIB=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB
new file mode 100644
index 000000000..e24a8952c
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MXSFB
@@ -0,0 +1 @@
+CONFIG_DRM_MXSFB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9 b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9
new file mode 100644
index 000000000..090669c9c
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9
@@ -0,0 +1 @@
+CONFIG_KXSD9=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C
new file mode 100644
index 000000000..3d2256700
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C
@@ -0,0 +1 @@
+CONFIG_KXSD9_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI
new file mode 100644
index 000000000..f4da57bbc
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI
@@ -0,0 +1 @@
+CONFIG_KXSD9_SPI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C b/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C
new file mode 100644
index 000000000..2e9c7cc45
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C
@@ -0,0 +1 @@
+CONFIG_MPU3050_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
new file mode 100644
index 000000000..0aa258124
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
@@ -0,0 +1 @@
+CONFIG_QCOM_ADSP_PIL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
index b749a7daa..18d8fb792 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
@@ -1 +1 @@
-# CONFIG_QCOM_Q6V5_PIL is not set
+CONFIG_QCOM_Q6V5_PIL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
new file mode 100644
index 000000000..7155372b9
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SPMI_TEMP_ALARM
@@ -0,0 +1 @@
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
index bb8c24d61..b13cefb38 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
+++ b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_WCNSS_PIL
@@ -1 +1 @@
-# CONFIG_QCOM_WCNSS_PIL is not set
+CONFIG_QCOM_WCNSS_PIL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI b/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI
new file mode 100644
index 000000000..0c319596b
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_REGMAP_SPMI
@@ -0,0 +1 @@
+CONFIG_REGMAP_SPMI=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_FAN53555 b/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_FAN53555
deleted file mode 100644
index 5534cc406..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_REGULATOR_FAN53555
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_FAN53555=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SPMI b/baseconfig/arm/armv7/armv7/CONFIG_SPMI
new file mode 100644
index 000000000..b340c89e6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SPMI
@@ -0,0 +1 @@
+CONFIG_SPMI=m
diff --git a/baseconfig/s390x/CONFIG_CRASH_DUMP b/baseconfig/s390x/CONFIG_CRASH_DUMP
deleted file mode 100644
index 84bb04c03..000000000
--- a/baseconfig/s390x/CONFIG_CRASH_DUMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRASH_DUMP=y
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_PANEL b/baseconfig/x86/CONFIG_DRM_PANEL
index de8a9c247..de8a9c247 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_PANEL
+++ b/baseconfig/x86/CONFIG_DRM_PANEL
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 b/baseconfig/x86/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
deleted file mode 100644
index 5b25d7565..000000000
--- a/baseconfig/x86/CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
diff --git a/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
index 0697694f9..0697694f9 100644
--- a/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
+++ b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
diff --git a/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
index db07e5fb0..db07e5fb0 100644
--- a/baseconfig/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
+++ b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
diff --git a/baseconfig/x86/i686/CONFIG_DRM_PANEL b/baseconfig/x86/i686/CONFIG_DRM_PANEL
deleted file mode 100644
index de8a9c247..000000000
--- a/baseconfig/x86/i686/CONFIG_DRM_PANEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL b/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL
deleted file mode 100644
index de8a9c247..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DRM_PANEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL=y
diff --git a/baseconfig/x86/x86_64/CONFIG_DRM_PANEL b/baseconfig/x86/x86_64/CONFIG_DRM_PANEL
deleted file mode 100644
index de8a9c247..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DRM_PANEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL=y