diff --git a/configs/fedora/generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX b/configs/fedora/generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
index 47ee7d9bc..f4fefc08a 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
+++ b/configs/fedora/generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
@@ -1 +1 @@
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
diff --git a/configs/fedora/generic/CONFIG_LCD_LD9040 b/configs/fedora/generic/CONFIG_LCD_LD9040
deleted file mode 100644
index 42d731c1b..000000000
--- a/configs/fedora/generic/CONFIG_LCD_LD9040
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LCD_LD9040 is not set
diff --git a/configs/fedora/generic/CONFIG_LCD_S6E63M0 b/configs/fedora/generic/CONFIG_LCD_S6E63M0
deleted file mode 100644
index e2c3a22a8..000000000
--- a/configs/fedora/generic/CONFIG_LCD_S6E63M0
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LCD_S6E63M0 is not set
diff --git a/configs/fedora/generic/CONFIG_QCOM_Q6V5_WCSS b/configs/fedora/generic/CONFIG_QCOM_Q6V5_WCSS
deleted file mode 100644
index e2f4c6117..000000000
--- a/configs/fedora/generic/CONFIG_QCOM_Q6V5_WCSS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_QCOM_Q6V5_WCSS is not set
diff --git a/configs/fedora/generic/CONFIG_TSL2772 b/configs/fedora/generic/CONFIG_TSL2772
index 5a6ef0c7a..eebc41ad7 100644
--- a/configs/fedora/generic/CONFIG_TSL2772
+++ b/configs/fedora/generic/CONFIG_TSL2772
@@ -1 +1 @@
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
diff --git a/configs/fedora/generic/CONFIG_UBIFS_FS_AUTHENTICATION b/configs/fedora/generic/CONFIG_UBIFS_FS_AUTHENTICATION
new file mode 100644
index 000000000..ed28cdf4b
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_UBIFS_FS_AUTHENTICATION
@@ -0,0 +1 @@
+CONFIG_UBIFS_FS_AUTHENTICATION=y
diff --git a/configs/fedora/generic/CONFIG_USB_EHCI_MV b/configs/fedora/generic/CONFIG_USB_EHCI_MV
deleted file mode 100644
index dbbc3345f..000000000
--- a/configs/fedora/generic/CONFIG_USB_EHCI_MV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_USB_EHCI_MV is not set
diff --git a/configs/fedora/generic/CONFIG_VIDEO_SUNXI_CEDRUS b/configs/fedora/generic/CONFIG_VIDEO_SUNXI_CEDRUS
deleted file mode 100644
index 3e52e5f9b..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_SUNXI_CEDRUS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
diff --git a/configs/fedora/generic/CONFIG_VL53L0X_I2C b/configs/fedora/generic/CONFIG_VL53L0X_I2C
index 2ee7f58bb..349942df4 100644
--- a/configs/fedora/generic/CONFIG_VL53L0X_I2C
+++ b/configs/fedora/generic/CONFIG_VL53L0X_I2C
@@ -1 +1 @@
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
diff --git a/configs/fedora/generic/CONFIG_ARMADA_37XX_WATCHDOG b/configs/fedora/generic/arm/CONFIG_ARMADA_37XX_WATCHDOG
similarity index 100%
rename from configs/fedora/generic/CONFIG_ARMADA_37XX_WATCHDOG
rename to configs/fedora/generic/arm/CONFIG_ARMADA_37XX_WATCHDOG
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_DT_BL_CPUFREQ b/configs/fedora/generic/arm/CONFIG_ARM_DT_BL_CPUFREQ
deleted file mode 100644
index af9b58a3e..000000000
--- a/configs/fedora/generic/arm/CONFIG_ARM_DT_BL_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MMC_STM32_SDMMC b/configs/fedora/generic/arm/CONFIG_MMC_STM32_SDMMC
index a4209fe9c..faec6b41c 100644
--- a/configs/fedora/generic/arm/CONFIG_MMC_STM32_SDMMC
+++ b/configs/fedora/generic/arm/CONFIG_MMC_STM32_SDMMC
@@ -1 +1 @@
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_OPTEE b/configs/fedora/generic/arm/CONFIG_OPTEE
new file mode 100644
index 000000000..3b51ba097
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_OPTEE
@@ -0,0 +1 @@
+CONFIG_OPTEE=m
diff --git a/configs/fedora/generic/arm/CONFIG_OPTEE_SHM_NUM_PRIV_PAGES b/configs/fedora/generic/arm/CONFIG_OPTEE_SHM_NUM_PRIV_PAGES
new file mode 100644
index 000000000..da8e8911c
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_OPTEE_SHM_NUM_PRIV_PAGES
@@ -0,0 +1 @@
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
diff --git a/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_INNO_HDMI b/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_INNO_HDMI
index 226a7e325..e501f0b8c 100644
--- a/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_INNO_HDMI
+++ b/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_INNO_HDMI
@@ -1 +1 @@
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC b/configs/fedora/generic/arm/CONFIG_SND_SUN8I_CODEC
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC
rename to configs/fedora/generic/arm/CONFIG_SND_SUN8I_CODEC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC_ANALOG b/configs/fedora/generic/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN8I_CODEC_ANALOG
rename to configs/fedora/generic/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_QCOM_QSPI b/configs/fedora/generic/arm/CONFIG_SPI_QCOM_QSPI
deleted file mode 100644
index aaed52cce..000000000
--- a/configs/fedora/generic/arm/CONFIG_SPI_QCOM_QSPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPI_QCOM_QSPI is not set
diff --git a/configs/fedora/generic/arm/CONFIG_TEE b/configs/fedora/generic/arm/CONFIG_TEE
new file mode 100644
index 000000000..85be673c5
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_TEE
@@ -0,0 +1 @@
+CONFIG_TEE=m
diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_SUNXI_CEDRUS b/configs/fedora/generic/arm/CONFIG_VIDEO_SUNXI_CEDRUS
new file mode 100644
index 000000000..9540295da
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_VIDEO_SUNXI_CEDRUS
@@ -0,0 +1 @@
+CONFIG_VIDEO_SUNXI_CEDRUS=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARMADA_37XX_WATCHDOG b/configs/fedora/generic/arm/aarch64/CONFIG_ARMADA_37XX_WATCHDOG
new file mode 100644
index 000000000..1c8838873
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARMADA_37XX_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_ARMADA_37XX_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_NITROX_CNN55XX b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
new file mode 100644
index 000000000..47ee7d9bc
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_NITROX_CNN55XX
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ENA_ETHERNET b/configs/fedora/generic/arm/aarch64/CONFIG_ENA_ETHERNET
new file mode 100644
index 000000000..64c0a73c1
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ENA_ETHERNET
@@ -0,0 +1 @@
+CONFIG_ENA_ETHERNET=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_ADSP_PIL b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_ADSP_PIL
deleted file mode 100644
index 0aa258124..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_ADSP_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_ADSP_PIL=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_MDT_LOADER b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_MDT_LOADER
new file mode 100644
index 000000000..93cab91a2
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_MDT_LOADER
@@ -0,0 +1 @@
+CONFIG_QCOM_MDT_LOADER=m
diff --git a/configs/fedora/generic/arm/CONFIG_QCOM_Q6V5_ADSP b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_ADSP
similarity index 100%
rename from configs/fedora/generic/arm/CONFIG_QCOM_Q6V5_ADSP
rename to configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_ADSP
diff --git a/configs/fedora/generic/arm/CONFIG_QCOM_Q6V5_MSS b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_MSS
similarity index 100%
rename from configs/fedora/generic/arm/CONFIG_QCOM_Q6V5_MSS
rename to configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_MSS
diff --git a/configs/fedora/generic/arm/CONFIG_QCOM_Q6V5_PAS b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_PAS
similarity index 100%
rename from configs/fedora/generic/arm/CONFIG_QCOM_Q6V5_PAS
rename to configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_PAS
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_PIL b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_PIL
deleted file mode 100644
index 18d8fb792..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_Q6V5_PIL=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_WCSS b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_WCSS
new file mode 100644
index 000000000..059b8adb8
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_Q6V5_WCSS
@@ -0,0 +1 @@
+CONFIG_QCOM_Q6V5_WCSS=m
diff --git a/configs/fedora/generic/arm/CONFIG_QCOM_SYSMON b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_SYSMON
similarity index 100%
rename from configs/fedora/generic/arm/CONFIG_QCOM_SYSMON
rename to configs/fedora/generic/arm/aarch64/CONFIG_QCOM_SYSMON
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_QCOM_QSPI b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_QCOM_QSPI
new file mode 100644
index 000000000..cab602512
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_QCOM_QSPI
@@ -0,0 +1 @@
+CONFIG_SPI_QCOM_QSPI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_LCD_LD9040 b/configs/fedora/generic/arm/armv7/CONFIG_LCD_LD9040
deleted file mode 100644
index fe70c624e..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_LCD_LD9040
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LCD_LD9040=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_LCD_S6E63M0 b/configs/fedora/generic/arm/armv7/CONFIG_LCD_S6E63M0
deleted file mode 100644
index 1d2cf3547..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_LCD_S6E63M0
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LCD_S6E63M0=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN8I_CODEC b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN8I_CODEC
deleted file mode 100644
index c30f94369..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN8I_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN8I_CODEC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
deleted file mode 100644
index 28ea30190..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL b/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
deleted file mode 100644
index 0aa258124..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_ADSP_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_ADSP_PIL=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL b/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
deleted file mode 100644
index 18d8fb792..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_Q6V5_PIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QCOM_Q6V5_PIL=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SMEM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SMEM
index f91ef8cda..59069977e 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SMEM
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SMEM
@@ -1 +1 @@
-CONFIG_QCOM_SMEM=m
+# CONFIG_QCOM_SMEM is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SYSMON b/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SYSMON
new file mode 100644
index 000000000..98e043661
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_QCOM_SYSMON
@@ -0,0 +1 @@
+# CONFIG_QCOM_SYSMON is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_8250_PXA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_8250_PXA
new file mode 100644
index 000000000..14b7d7cbe
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_8250_PXA
@@ -0,0 +1 @@
+CONFIG_SERIAL_8250_PXA=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_PXA_SOC_SSP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_PXA_SOC_SSP
new file mode 100644
index 000000000..ed42bbdd7
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_PXA_SOC_SSP
@@ -0,0 +1 @@
+CONFIG_SND_PXA_SOC_SSP=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
index f862f05a7..620531081 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
@@ -1 +1 @@
-CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_PXA2XX b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_PXA2XX
new file mode 100644
index 000000000..99db8d26f
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_PXA2XX
@@ -0,0 +1 @@
+CONFIG_SPI_PXA2XX=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_QCOM_QSPI b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_QCOM_QSPI
new file mode 100644
index 000000000..cab602512
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_QCOM_QSPI
@@ -0,0 +1 @@
+CONFIG_SPI_QCOM_QSPI=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MV b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MV
new file mode 100644
index 000000000..9dd714d30
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MV
@@ -0,0 +1 @@
+CONFIG_USB_EHCI_MV=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MV_U2O b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MV_U2O
new file mode 100644
index 000000000..2a788c52f
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_EHCI_MV_U2O
@@ -0,0 +1 @@
+# CONFIG_USB_EHCI_MV_U2O is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_MV_OTG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_MV_OTG
new file mode 100644
index 000000000..838f7cd5d
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_MV_OTG
@@ -0,0 +1 @@
+# CONFIG_USB_MV_OTG is not set
diff --git a/configs/process_configs.sh b/configs/process_configs.sh
index 4de45d65a..7517e6de1 100755
--- a/configs/process_configs.sh
+++ b/configs/process_configs.sh
@@ -87,7 +87,7 @@ function process_configs()
 		fi
 		rm .newoptions
 
-		make ARCH=$arch KCONFIG_CONFIG=$cfg oldnoconfig > /dev/null || exit 1
+		make ARCH=$arch KCONFIG_CONFIG=$cfg olddefconfig > /dev/null || exit 1
 		echo "# $arch" > ${cfgtmp}
 		cat "${cfg}" >> ${cfgtmp}
 		if test -n "$CHECKOPTIONS"
diff --git a/cpupower.config b/cpupower.config
deleted file mode 100644
index 8629a4a3e..000000000
--- a/cpupower.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# See 'cpupower help' and cpupower(1) for more info
-CPUPOWER_START_OPTS="frequency-set -g performance"
-CPUPOWER_STOP_OPTS="frequency-set -g ondemand"
diff --git a/cpupower.service b/cpupower.service
deleted file mode 100644
index 5f10ab7ee..000000000
--- a/cpupower.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Configure CPU power related settings
-After=syslog.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/sysconfig/cpupower
-ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS
-ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/filter-i686.sh b/filter-i686.sh
index 29f2b3aa2..1a13ddf60 100644
--- a/filter-i686.sh
+++ b/filter-i686.sh
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio uwb w1"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw hid-asus"
diff --git a/filter-modules.sh b/filter-modules.sh
index e4f4267eb..eb246e157 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -36,7 +36,7 @@ drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon"
 
 iiodrvs="accel adc afe common dac gyro health humidity light magnetometer multiplexer orientation potentiometer potentiostat pressure temperature"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw hid-asus"
 
 # Grab the arch-specific filter list overrides
 source ./filter-$2.sh
diff --git a/gitrev b/gitrev
index e95b689c8..f73e5994f 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-8adcc59974b8a65b7eac7d503364837c297139bc
+8053e5b93eca9b011f7b79bb019bf1eeaaf96c4b
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index da6e11ca0..a777d4970 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -317,7 +317,7 @@ CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VHE=y
 CONFIG_ARM64=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
+CONFIG_ARMADA_37XX_WATCHDOG=m
 CONFIG_ARMADA_AP806_SYSCON=y
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
@@ -337,7 +337,6 @@ CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -1684,7 +1683,7 @@ CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENA_ETHERNET is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2979,13 +2978,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -3502,7 +3499,7 @@ CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
 CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
@@ -4284,6 +4281,8 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
@@ -4476,7 +4475,7 @@ CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -4675,7 +4674,6 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
@@ -4700,12 +4698,12 @@ CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_Q6V5_ADSP=m
 CONFIG_QCOM_Q6V5_MSS=m
 CONFIG_QCOM_Q6V5_PAS=m
-CONFIG_QCOM_Q6V5_PIL=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
+CONFIG_QCOM_Q6V5_WCSS=m
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_RMTFS_MEM=m
@@ -6015,7 +6013,7 @@ CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_QCOM_GENI is not set
-# CONFIG_SPI_QCOM_QSPI is not set
+CONFIG_SPI_QCOM_QSPI=m
 CONFIG_SPI_QUP=m
 CONFIG_SPI_ROCKCHIP=m
 # CONFIG_SPI_SC18IS602 is not set
@@ -6204,7 +6202,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA210_ADMA=y
@@ -6415,7 +6413,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6450,6 +6448,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6563,7 +6562,6 @@ CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -7012,7 +7010,7 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
+CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -7050,7 +7048,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index da5f0287c..f860b797d 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -317,7 +317,7 @@ CONFIG_ARM64_VA_BITS=48
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VHE=y
 CONFIG_ARM64=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
+CONFIG_ARMADA_37XX_WATCHDOG=m
 CONFIG_ARMADA_AP806_SYSCON=y
 CONFIG_ARMADA_THERMAL=m
 CONFIG_ARM_AMBA=y
@@ -337,7 +337,6 @@ CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -1674,7 +1673,7 @@ CONFIG_EMAC_ROCKCHIP=m
 # CONFIG_EMBEDDED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENA_ETHERNET is not set
+CONFIG_ENA_ETHERNET=m
 # CONFIG_ENC28J60 is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=y
@@ -2959,13 +2958,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -3481,7 +3478,7 @@ CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
 CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
@@ -4262,6 +4259,8 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
@@ -4454,7 +4453,7 @@ CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -4652,7 +4651,6 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_APCS_IPC=m
 CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
@@ -4677,12 +4675,12 @@ CONFIG_QCOM_IRQ_COMBINER=y
 CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
 # CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_Q6V5_ADSP=m
 CONFIG_QCOM_Q6V5_MSS=m
 CONFIG_QCOM_Q6V5_PAS=m
-CONFIG_QCOM_Q6V5_PIL=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
+CONFIG_QCOM_Q6V5_WCSS=m
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_RMTFS_MEM=m
@@ -5991,7 +5989,7 @@ CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_QCOM_GENI is not set
-# CONFIG_SPI_QCOM_QSPI is not set
+CONFIG_SPI_QCOM_QSPI=m
 CONFIG_SPI_QUP=m
 CONFIG_SPI_ROCKCHIP=m
 # CONFIG_SPI_SC18IS602 is not set
@@ -6180,7 +6178,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA210_ADMA=y
@@ -6391,7 +6389,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6426,6 +6424,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6539,7 +6538,6 @@ CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -6988,7 +6986,7 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
+CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -7026,7 +7024,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 2777939b0..3a4f12d91 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -317,7 +317,6 @@ CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_411920 is not set
 CONFIG_ARM_ERRATA_430973=y
@@ -1172,7 +1171,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_OMAP=m
@@ -3120,13 +3119,11 @@ CONFIG_LCD_HX8357=m
 CONFIG_LCD_ILI922X=m
 CONFIG_LCD_ILI9320=m
 CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LD9040=m
 CONFIG_LCD_LMS283GF05=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_LTV350QV=m
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 # CONFIG_LDM_DEBUG is not set
@@ -3677,7 +3674,7 @@ CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
 CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
@@ -4530,6 +4527,8 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
@@ -4730,7 +4729,7 @@ CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -4949,7 +4948,6 @@ CONFIG_PXA_DMA=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_APCS_IPC=m
 # CONFIG_QCOM_APR is not set
 CONFIG_QCOM_BAM_DMA=m
@@ -4971,24 +4969,19 @@ CONFIG_QCOM_IOMMU=y
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_PM=y
-CONFIG_QCOM_Q6V5_ADSP=m
-CONFIG_QCOM_Q6V5_MSS=m
-CONFIG_QCOM_Q6V5_PAS=m
-CONFIG_QCOM_Q6V5_PIL=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_SMEM=m
+# CONFIG_QCOM_SMEM is not set
 CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPMI_VADC=m
-CONFIG_QCOM_SYSMON=m
+# CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 CONFIG_QCOM_WCNSS_PIL=m
@@ -5806,6 +5799,7 @@ CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PXA=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
@@ -6096,7 +6090,7 @@ CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_PXA910_SOC=m
-# CONFIG_SND_PXA_SOC_SSP is not set
+CONFIG_SND_PXA_SOC_SSP=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME9652=m
@@ -6198,7 +6192,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
@@ -6425,8 +6418,8 @@ CONFIG_SPI_MXS=m
 CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_QCOM_QSPI is not set
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_QCOM_QSPI=m
 CONFIG_SPI_QUP=m
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_S3C64XX=m
@@ -6628,7 +6621,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA_AHB=y
@@ -6852,7 +6845,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6894,6 +6887,7 @@ CONFIG_TYPHOON=m
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -7013,7 +7007,8 @@ CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_STI=m
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_MV=m
+# CONFIG_USB_EHCI_MV_U2O is not set
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
@@ -7160,6 +7155,7 @@ CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_SUNXI=m
 # CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_USB_MV_OTG is not set
 # CONFIG_USB_MV_U3D is not set
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MXS_PHY=m
@@ -7508,7 +7504,7 @@ CONFIG_VIDEO_STI_HVA=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
+CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -7546,7 +7542,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 5803d7632..54dd829b4 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -307,7 +307,6 @@ CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_411920 is not set
 CONFIG_ARM_ERRATA_430973=y
@@ -1125,7 +1124,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
@@ -2983,13 +2982,11 @@ CONFIG_LCD_HX8357=m
 CONFIG_LCD_ILI922X=m
 CONFIG_LCD_ILI9320=m
 CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LD9040=m
 CONFIG_LCD_LMS283GF05=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_LTV350QV=m
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 # CONFIG_LDM_DEBUG is not set
@@ -3519,7 +3516,7 @@ CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
 CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
@@ -4313,6 +4310,8 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
@@ -4503,7 +4502,7 @@ CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -4710,15 +4709,10 @@ CONFIG_QCOM_HFPLL=m
 # CONFIG_QCOM_LLCC is not set
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
-CONFIG_QCOM_Q6V5_ADSP=m
-CONFIG_QCOM_Q6V5_MSS=m
-CONFIG_QCOM_Q6V5_PAS=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_QCOM_SYSMON=m
 CONFIG_QCS_GCC_404=m
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -6039,7 +6033,6 @@ CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_QCOM_QSPI is not set
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_S3C64XX=m
 # CONFIG_SPI_SC18IS602 is not set
@@ -6229,7 +6222,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA_AHB=y
@@ -6442,7 +6435,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6478,6 +6471,7 @@ CONFIG_TYPHOON=m
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6593,7 +6587,6 @@ CONFIG_USB_EHCI_EXYNOS=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -7058,7 +7051,7 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
+CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -7096,7 +7089,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ce4b53a6d..aae578055 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -306,7 +306,6 @@ CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_411920 is not set
 CONFIG_ARM_ERRATA_430973=y
@@ -1123,7 +1122,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
@@ -2963,13 +2962,11 @@ CONFIG_LCD_HX8357=m
 CONFIG_LCD_ILI922X=m
 CONFIG_LCD_ILI9320=m
 CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LD9040=m
 CONFIG_LCD_LMS283GF05=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_LTV350QV=m
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 # CONFIG_LDM_DEBUG is not set
@@ -3498,7 +3495,7 @@ CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
 CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
@@ -4291,6 +4288,8 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
@@ -4481,7 +4480,7 @@ CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -4687,15 +4686,10 @@ CONFIG_QCOM_HFPLL=m
 # CONFIG_QCOM_LLCC is not set
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
-CONFIG_QCOM_Q6V5_ADSP=m
-CONFIG_QCOM_Q6V5_MSS=m
-CONFIG_QCOM_Q6V5_PAS=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SPMI_ADC5=m
-CONFIG_QCOM_SYSMON=m
 CONFIG_QCS_GCC_404=m
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -6015,7 +6009,6 @@ CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_QCOM_QSPI is not set
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_S3C64XX=m
 # CONFIG_SPI_SC18IS602 is not set
@@ -6205,7 +6198,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA_AHB=y
@@ -6418,7 +6411,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6454,6 +6447,7 @@ CONFIG_TYPHOON=m
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6569,7 +6563,6 @@ CONFIG_USB_EHCI_EXYNOS=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -7034,7 +7027,7 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
+CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -7072,7 +7065,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d4d7c92ba..78b0eebeb 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -316,7 +316,6 @@ CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_ERRATA_326103 is not set
 # CONFIG_ARM_ERRATA_411920 is not set
 CONFIG_ARM_ERRATA_430973=y
@@ -1170,7 +1169,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_OMAP=m
@@ -3100,13 +3099,11 @@ CONFIG_LCD_HX8357=m
 CONFIG_LCD_ILI922X=m
 CONFIG_LCD_ILI9320=m
 CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LD9040=m
 CONFIG_LCD_LMS283GF05=m
 CONFIG_LCD_LMS501KF03=m
 CONFIG_LCD_LTV350QV=m
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
 CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 # CONFIG_LDM_DEBUG is not set
@@ -3656,7 +3653,7 @@ CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_STM32_SDMMC=y
+# CONFIG_MMC_STM32_SDMMC is not set
 CONFIG_MMC_SUNXI=m
 # CONFIG_MMC_TEST is not set
 CONFIG_MMC_TIFM_SD=m
@@ -4508,6 +4505,8 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_VXLAN=m
 # CONFIG_OPROFILE is not set
 CONFIG_OPT3001=m
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_OPTPROBES=y
 CONFIG_ORANGEFS_FS=m
@@ -4708,7 +4707,7 @@ CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
-CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
@@ -4926,7 +4925,6 @@ CONFIG_PXA_DMA=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
 CONFIG_QCOM_A53PLL=m
-CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_APCS_IPC=m
 # CONFIG_QCOM_APR is not set
 CONFIG_QCOM_BAM_DMA=m
@@ -4948,24 +4946,19 @@ CONFIG_QCOM_IOMMU=y
 CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_PM=y
-CONFIG_QCOM_Q6V5_ADSP=m
-CONFIG_QCOM_Q6V5_MSS=m
-CONFIG_QCOM_Q6V5_PAS=m
-CONFIG_QCOM_Q6V5_PIL=m
-# CONFIG_QCOM_Q6V5_WCSS is not set
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_SMEM=m
+# CONFIG_QCOM_SMEM is not set
 CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SMSM=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
 CONFIG_QCOM_SPMI_VADC=m
-CONFIG_QCOM_SYSMON=m
+# CONFIG_QCOM_SYSMON is not set
 CONFIG_QCOM_TSENS=m
 CONFIG_QCOM_WCNSS_CTRL=m
 CONFIG_QCOM_WCNSS_PIL=m
@@ -5783,6 +5776,7 @@ CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PXA=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
@@ -6072,7 +6066,7 @@ CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PORTMAN2X4=m
 CONFIG_SND_PXA910_SOC=m
-# CONFIG_SND_PXA_SOC_SSP is not set
+CONFIG_SND_PXA_SOC_SSP=m
 CONFIG_SND_RIPTIDE=m
 CONFIG_SND_RME32=m
 CONFIG_SND_RME9652=m
@@ -6174,7 +6168,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
@@ -6401,8 +6394,8 @@ CONFIG_SPI_MXS=m
 CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_QCOM_QSPI is not set
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_QCOM_QSPI=m
 CONFIG_SPI_QUP=m
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_S3C64XX=m
@@ -6604,7 +6597,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 CONFIG_TCS3472=m
-# CONFIG_TEE is not set
+CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_TEGRA_AHB=y
@@ -6828,7 +6821,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6870,6 +6863,7 @@ CONFIG_TYPHOON=m
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6989,7 +6983,8 @@ CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_STI=m
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
+CONFIG_USB_EHCI_MV=m
+# CONFIG_USB_EHCI_MV_U2O is not set
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
@@ -7136,6 +7131,7 @@ CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_SUNXI=m
 # CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_USB_MV_OTG is not set
 # CONFIG_USB_MV_U3D is not set
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MXS_PHY=m
@@ -7484,7 +7480,7 @@ CONFIG_VIDEO_STI_HVA=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
+CONFIG_VIDEO_SUNXI_CEDRUS=m
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 CONFIG_VIDEO_TM6000_ALSA=m
@@ -7522,7 +7518,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 673db68e8..fc9b74cd0 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -263,7 +263,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
@@ -970,7 +969,7 @@ CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
@@ -2852,13 +2851,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -4468,7 +4465,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
@@ -6041,7 +6037,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6076,6 +6072,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6154,7 +6151,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6571,7 +6567,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6608,7 +6603,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 046d4cbdb..e58bdbf77 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -262,7 +262,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASIX_PHY is not set
 CONFIG_ASUS_LAPTOP=m
@@ -966,7 +965,7 @@ CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
@@ -2829,13 +2828,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -4444,7 +4441,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
@@ -6016,7 +6012,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6051,6 +6047,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6129,7 +6126,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6546,7 +6542,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6583,7 +6578,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 6e1bb2ba3..919a673b8 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -207,7 +207,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
@@ -903,7 +902,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
@@ -2633,13 +2632,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -4204,7 +4201,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
@@ -5710,7 +5706,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -5745,6 +5741,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -5825,7 +5822,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD_PPC_OF=y
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6238,7 +6234,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6274,7 +6269,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 179751bd1..3454576bc 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -206,7 +206,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASIX_PHY is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -899,7 +898,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
@@ -2610,13 +2609,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -4178,7 +4175,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
@@ -5683,7 +5679,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -5718,6 +5714,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -5798,7 +5795,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD_PPC_OF=y
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6211,7 +6207,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6247,7 +6242,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 26ff8424c..b5b35e7bf 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -211,7 +211,6 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
@@ -905,7 +904,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2579,13 +2578,11 @@ CONFIG_LATENCYTOP=y
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 # CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LCS=m
@@ -4090,7 +4087,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QDIO=m
@@ -5606,7 +5602,7 @@ CONFIG_TR=y
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -5641,6 +5637,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -5718,7 +5715,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6129,7 +6125,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6165,7 +6160,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 54877614c..8f55fddac 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -210,7 +210,6 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASIX_PHY is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -901,7 +900,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2556,13 +2555,11 @@ CONFIG_LATENCYTOP=y
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 # CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 CONFIG_LCS=m
@@ -4064,7 +4061,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QDIO=m
@@ -5579,7 +5575,7 @@ CONFIG_TR=y
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -5614,6 +5610,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -5691,7 +5688,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6102,7 +6098,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6138,7 +6133,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 797db1ebc..edb51e08e 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -266,7 +266,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_PTDUMP=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_PTDUMP=y
 # CONFIG_AS3935 is not set
@@ -996,7 +995,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
@@ -2910,13 +2909,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -4508,7 +4505,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
@@ -6091,7 +6087,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6126,6 +6122,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6204,7 +6201,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6622,7 +6618,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6659,7 +6654,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index fec81c82d..f5bfc9f1e 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -265,7 +265,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_ERRATUM_858921=y
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
 # CONFIG_AS3935 is not set
 # CONFIG_ASIX_PHY is not set
 CONFIG_ASUS_LAPTOP=m
@@ -992,7 +991,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
@@ -2887,13 +2886,11 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_ILI922X is not set
 # CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_OTM3225A is not set
 CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
 # CONFIG_LDM_DEBUG is not set
@@ -4484,7 +4481,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_Q6V5_WCSS is not set
 # CONFIG_QCOM_RPMH is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QEDE=m
@@ -6066,7 +6062,7 @@ CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_TS4800_WATCHDOG is not set
 # CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
+CONFIG_TSL2772=m
 # CONFIG_TSL2x7x is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_TSYS01 is not set
@@ -6101,6 +6097,7 @@ CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPHOON=m
 CONFIG_UBIFS_ATIME_SUPPORT=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS_ENCRYPTION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
@@ -6179,7 +6176,6 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MV is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
@@ -6597,7 +6593,6 @@ CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_SUNXI_CEDRUS is not set
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TM6000=m
@@ -6634,7 +6629,7 @@ CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL53L0X_I2C is not set
+CONFIG_VL53L0X_I2C=m
 CONFIG_VL6180=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q=m
diff --git a/kernel.spec b/kernel.spec
index 1e19da8f2..1f5b509f7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 0
+%global rcrev 1
 # The git snapshot level
-%define gitrev 9
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -477,10 +477,6 @@ Source43: generate_bls_conf.sh
 # added for those wanting to do custom rebuilds with altered config opts.
 Source1000: kernel-local
 
-# Sources for kernel-tools
-Source2000: cpupower.service
-Source2001: cpupower.config
-
 # Here should be only the patches up to the upstream canonical Linus tree.
 
 # For a stable release kernel
@@ -1892,6 +1888,19 @@ fi
 #
 #
 %changelog
+* Wed Nov  7 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Initial Arm config updates for 4.20
+
+* Tue Nov 06 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc1.git1.1
+- Linux v4.20-rc1-62-g8053e5b93eca
+- Reenable debugging options.
+
+* Mon Nov 05 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc1.git0.1
+- Linux v4.20-rc1
+
+* Mon Nov 05 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
 * Fri Nov 02 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc0.git9.1
 - Linux v4.19-12532-g8adcc59974b8
 
diff --git a/scripts/check-configs.pl b/scripts/check-configs.pl
index 10282aa74..39df8f4ad 100644
--- a/scripts/check-configs.pl
+++ b/scripts/check-configs.pl
@@ -70,7 +70,7 @@ sub main {
 		}
 	}
 
-	foreach my $shipped (glob("config-*")) {
+	foreach my $shipped (glob("*.config")) {
 		my (@tmp) = parse_shipped( $shipped );
 		foreach my $ref ( @tmp ) {
 			say( STDERR "$shipped:$ref->[0]: No Kconfig symbol matches 'CONFIG_$ref->[1]'" )
diff --git a/sources b/sources
index e7df6d397..dab457a9d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-SHA512 (patch-4.19-git9.xz) = df3c024d53152b86ebe2ca9ea43d8e35fe9cdfac7f02a11f5d30af5d10caa3faa86c09d0f86d43879f66b8ed288058f2d804940959767972f03e4a504988618a
+SHA512 (patch-4.20-rc1.xz) = 60b0247b40be26429ce319cd6b27b67ca61afc4663ebe61f172349cc3e42ce6915427527693a519fc4afce43117c83513292e7dfa08b2d522baca3489cebf80a
+SHA512 (patch-4.20-rc1-git1.xz) = e4bedc5b29b3e758e698a2076a05cace815cc5fc8f11842521e6b6ba650238202596fa2ca30991ddc526a3061d503180d099a59eaabeb6c5784c5bb9a6fb54be