some fixups for general fedpkg prep on 4.21

27 files changed, 42 insertions, 88 deletions

diff --git a/configs/fedora/generic/arm/CONFIG_PHY_OCELOT_SERDES b/configs/fedora/generic/CONFIG_PHY_OCELOT_SERDES
index 58eceea1d..58eceea1d 100644
--- a/configs/fedora/generic/arm/CONFIG_PHY_OCELOT_SERDES
+++ b/configs/fedora/generic/CONFIG_PHY_OCELOT_SERDES
diff --git a/configs/fedora/generic/CONFIG_PINCTRL_OCELOT b/configs/fedora/generic/CONFIG_PINCTRL_OCELOT
new file mode 100644
index 000000000..60a20dba7
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_PINCTRL_OCELOT
@@ -0,0 +1 @@
+# CONFIG_PINCTRL_OCELOT is not set
diff --git a/configs/fedora/generic/arm/CONFIG_IMX_SCU_PD b/configs/fedora/generic/arm/CONFIG_IMX_SCU_PD
new file mode 100644
index 000000000..3a55f90f4
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_IMX_SCU_PD
@@ -0,0 +1 @@
+# CONFIG_IMX_SCU_PD is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MESON_CLK_MEASURE b/configs/fedora/generic/arm/CONFIG_MESON_CLK_MEASURE
new file mode 100644
index 000000000..fa444b939
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MESON_CLK_MEASURE
@@ -0,0 +1 @@
+# CONFIG_MESON_CLK_MEASURE is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_PD b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_PD
new file mode 100644
index 000000000..42e185466
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_PD
@@ -0,0 +1 @@
+CONFIG_IMX_SCU_PD=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PM8916_WATCHDOG b/configs/fedora/generic/arm/aarch64/CONFIG_PM8916_WATCHDOG
new file mode 100644
index 000000000..98f687101
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PM8916_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_PM8916_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2_PM_DOMAINS b/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2_PM_DOMAINS
new file mode 100644
index 000000000..f45e4aedd
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2_PM_DOMAINS
@@ -0,0 +1 @@
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PM8916_WATCHDOG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_PM8916_WATCHDOG
new file mode 100644
index 000000000..98f687101
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_PM8916_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_PM8916_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMX_SC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMX_SC
new file mode 100644
index 000000000..6a1c16217
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMX_SC
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_IMX_SC=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_IMX7ULP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_IMX7ULP
new file mode 100644
index 000000000..3ffc33027
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SOC_IMX7ULP
@@ -0,0 +1 @@
+CONFIG_SOC_IMX7ULP=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TEGRA20_EMC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_TEGRA20_EMC
new file mode 100644
index 000000000..dc98c3eea
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_TEGRA20_EMC
@@ -0,0 +1 @@
+CONFIG_TEGRA20_EMC=y
diff --git a/configs/fedora/generic/powerpc/CONFIG_VFIO_PCI_NVLINK2 b/configs/fedora/generic/powerpc/CONFIG_VFIO_PCI_NVLINK2
new file mode 100644
index 000000000..cbaca83de
--- /dev/null
+++ b/configs/fedora/generic/powerpc/CONFIG_VFIO_PCI_NVLINK2
@@ -0,0 +1 @@
+CONFIG_VFIO_PCI_NVLINK2=y
diff --git a/configs/fedora/generic/x86/CONFIG_TQMX86_WDT b/configs/fedora/generic/x86/CONFIG_TQMX86_WDT
new file mode 100644
index 000000000..3cd849478
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_TQMX86_WDT
@@ -0,0 +1 @@
+CONFIG_TQMX86_WDT=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c736c02ca..2a48ae13e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2383,10 +2383,9 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
-# CONFIG_IMX_SCU_PD is not set
+CONFIG_IMX_SCU_PD=y
 CONFIG_INA2XX_ADC=m
 CONFIG_INDIRECT_PIO=y
 CONFIG_INET6_AH=m
@@ -4469,7 +4468,7 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_PM8916_WATCHDOG=m
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4960,7 +4959,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5908,7 +5906,6 @@ CONFIG_SND_YMFPCI=m
 CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
-# CONFIG_SOC_IMX7ULP is not set
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
@@ -6142,7 +6139,6 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEGRA210_ADMA=y
 CONFIG_TEGRA_ACONNECT=m
 CONFIG_TEGRA_AHB=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a1ba57e18..8ea52b984 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2366,10 +2366,9 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
-# CONFIG_IMX_SCU_PD is not set
+CONFIG_IMX_SCU_PD=y
 CONFIG_INA2XX_ADC=m
 CONFIG_INDIRECT_PIO=y
 CONFIG_INET6_AH=m
@@ -4448,7 +4447,7 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_PM8916_WATCHDOG=m
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4938,7 +4937,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5885,7 +5883,6 @@ CONFIG_SND_YMFPCI=m
 CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
-# CONFIG_SOC_IMX7ULP is not set
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
@@ -6119,7 +6116,6 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEGRA210_ADMA=y
 CONFIG_TEGRA_ACONNECT=m
 CONFIG_TEGRA_AHB=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b1850b42c..e6466cf58 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2488,7 +2488,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
 # CONFIG_IMX_IRQSTEER is not set
@@ -4714,7 +4714,7 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_PM8916_WATCHDOG=m
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -5225,7 +5225,7 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_IMXDI=m
-# CONFIG_RTC_DRV_IMX_SC is not set
+CONFIG_RTC_DRV_IMX_SC=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -6275,7 +6275,7 @@ CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX7D=y
-# CONFIG_SOC_IMX7ULP is not set
+CONFIG_SOC_IMX7ULP=y
 # CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_OMAP5=y
@@ -6533,7 +6533,7 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
+CONFIG_TEGRA20_EMC=y
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_BPMP is not set
 CONFIG_TEGRA_GMI=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index a772df971..6f55ca95b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2373,7 +2373,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
@@ -4481,7 +4480,6 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4935,7 +4933,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5907,7 +5904,6 @@ CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5800=y
 # CONFIG_SOC_IMX6SLL is not set
-# CONFIG_SOC_IMX7ULP is not set
 # CONFIG_SOC_OMAP5 is not set
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
@@ -6141,7 +6137,6 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_BPMP is not set
 CONFIG_TEGRA_GMI=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 716719ae3..726a9c6d7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2357,7 +2357,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
@@ -4461,7 +4460,6 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4914,7 +4912,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5885,7 +5882,6 @@ CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5800=y
 # CONFIG_SOC_IMX6SLL is not set
-# CONFIG_SOC_IMX7ULP is not set
 # CONFIG_SOC_OMAP5 is not set
 CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
@@ -6119,7 +6115,6 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_BPMP is not set
 CONFIG_TEGRA_GMI=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 607db2fa8..4b82b243e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2472,7 +2472,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
 # CONFIG_IMX_IRQSTEER is not set
@@ -4694,7 +4694,7 @@ CONFIG_PLATFORM_MHU=m
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
+CONFIG_PM8916_WATCHDOG=m
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -5204,7 +5204,7 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_IMXDI=m
-# CONFIG_RTC_DRV_IMX_SC is not set
+CONFIG_RTC_DRV_IMX_SC=m
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -6253,7 +6253,7 @@ CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_IMX6UL=y
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX7D=y
-# CONFIG_SOC_IMX7ULP is not set
+CONFIG_SOC_IMX7ULP=y
 # CONFIG_SOC_LS1021A is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_OMAP5=y
@@ -6511,7 +6511,7 @@ CONFIG_TCS3472=m
 CONFIG_TEE=m
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_TEGRA20_EMC is not set
+CONFIG_TEGRA20_EMC=y
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_BPMP is not set
 CONFIG_TEGRA_GMI=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 53d037587..304ca3a7a 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2215,8 +2215,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3081,7 +3079,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -4201,6 +4198,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -4242,7 +4240,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4629,7 +4626,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5743,7 +5739,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -5920,7 +5915,7 @@ CONFIG_TPM_KEY_PARSER=m
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TPS68470_PMIC_OPREGION is not set
-# CONFIG_TQMX86_WDT is not set
+CONFIG_TQMX86_WDT=m
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_EVAL_MAP_FILE=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index c648b1de3..dd3e5565a 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2197,8 +2197,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3061,7 +3059,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -4181,6 +4178,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -4222,7 +4220,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4608,7 +4605,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5721,7 +5717,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -5898,7 +5893,7 @@ CONFIG_TPM_KEY_PARSER=m
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TPS68470_PMIC_OPREGION is not set
-# CONFIG_TQMX86_WDT is not set
+CONFIG_TQMX86_WDT=m
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_EVAL_MAP_FILE=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 3b4236680..cf0bf1c8b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2043,8 +2043,6 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -2857,7 +2855,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -3919,6 +3916,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -3948,7 +3946,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4365,7 +4362,6 @@ CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5419,7 +5415,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -6025,7 +6020,7 @@ CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
 # CONFIG_VFIO_NOIOMMU is not set
 CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_NVLINK2 is not set
+CONFIG_VFIO_PCI_NVLINK2=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_ARB=y
 # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index d4ad36591..b71eb8e89 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2025,8 +2025,6 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -2836,7 +2834,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -3897,6 +3894,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -3926,7 +3924,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4342,7 +4339,6 @@ CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5395,7 +5391,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -6001,7 +5996,7 @@ CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
 # CONFIG_VFIO_NOIOMMU is not set
 CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_NVLINK2 is not set
+CONFIG_VFIO_PCI_NVLINK2=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_ARB=y
 # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 264670a33..a669bcb16 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1997,8 +1997,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -2800,7 +2798,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -2912,7 +2909,7 @@ CONFIG_MIGRATION=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
-# CONFIG_MISC_ALCOR_PCI is not set
+CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
@@ -3851,6 +3848,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -3881,7 +3879,6 @@ CONFIG_PKEY=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4255,7 +4252,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5311,7 +5307,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 4a38f32a5..ffe76f308 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1979,8 +1979,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -2779,7 +2777,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -2891,7 +2888,7 @@ CONFIG_MIGRATION=y
 CONFIG_MII=m
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
-# CONFIG_MISC_ALCOR_PCI is not set
+CONFIG_MISC_ALCOR_PCI=m
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
@@ -3829,6 +3826,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -3859,7 +3857,6 @@ CONFIG_PKEY=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4232,7 +4229,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5287,7 +5283,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c872ace4c..4358190cc 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2257,8 +2257,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3130,7 +3128,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -4239,6 +4236,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -4279,7 +4277,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4666,7 +4663,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5788,7 +5784,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -5964,7 +5959,7 @@ CONFIG_TPM_KEY_PARSER=m
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TPS68470_PMIC_OPREGION is not set
-# CONFIG_TQMX86_WDT is not set
+CONFIG_TQMX86_WDT=m
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_EVAL_MAP_FILE=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d169d8125..f0a73ce0a 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2239,8 +2239,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_GPCV2_PM_DOMAINS is not set
-# CONFIG_IMX_SCU_PD is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3110,7 +3108,6 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
-# CONFIG_MESON_CLK_MEASURE is not set
 # CONFIG_MESON_GX_PM_DOMAINS is not set
 # CONFIG_MESON_MX_EFUSE is not set
 # CONFIG_MESON_MX_SOCINFO is not set
@@ -4219,6 +4216,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -4259,7 +4257,6 @@ CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
-# CONFIG_PM8916_WATCHDOG is not set
 # CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PMBUS=m
@@ -4645,7 +4642,6 @@ CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_IMX_SC is not set
 CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_ISL12026=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5766,7 +5762,6 @@ CONFIG_TCP_MD5SIG=y
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
 # CONFIG_TEE is not set
-# CONFIG_TEGRA20_EMC is not set
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
@@ -5942,7 +5937,7 @@ CONFIG_TPM_KEY_PARSER=m
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TPS68470_PMIC_OPREGION is not set
-# CONFIG_TQMX86_WDT is not set
+CONFIG_TQMX86_WDT=m
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_EVAL_MAP_FILE=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set