ARM updates for 4.18, cleanup some dropped config options

64 files changed, 28 insertions, 34 deletions

diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_RENESAS b/configs/fedora/generic/arm/CONFIG_ARCH_RENESAS
index 0fa3a2ec3..0fa3a2ec3 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_RENESAS
+++ b/configs/fedora/generic/arm/CONFIG_ARCH_RENESAS
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_CCI_PMU b/configs/fedora/generic/arm/CONFIG_ARM_CCI_PMU
new file mode 100644
index 000000000..f8a610a6c
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_ARM_CCI_PMU
@@ -0,0 +1 @@
+CONFIG_ARM_CCI_PMU=m
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO b/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO
index 667874abd..3b9e5e47f 100644
--- a/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO
+++ b/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO
@@ -1 +1 @@
-# CONFIG_ARM_QCOM_CPUFREQ_KRYO is not set
+CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
diff --git a/configs/fedora/generic/arm/CONFIG_BCM2835_VCHIQ b/configs/fedora/generic/arm/CONFIG_BCM2835_VCHIQ
new file mode 100644
index 000000000..8da2b01c5
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_BCM2835_VCHIQ
@@ -0,0 +1 @@
+CONFIG_BCM2835_VCHIQ=m
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_SUN6I_DSI b/configs/fedora/generic/arm/CONFIG_DRM_SUN6I_DSI
new file mode 100644
index 000000000..a3694e398
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_DRM_SUN6I_DSI
@@ -0,0 +1 @@
+CONFIG_DRM_SUN6I_DSI=m
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_V3D b/configs/fedora/generic/arm/CONFIG_DRM_V3D
new file mode 100644
index 000000000..fac570b0b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_DRM_V3D
@@ -0,0 +1 @@
+# CONFIG_DRM_V3D is not set
diff --git a/configs/fedora/generic/arm/CONFIG_OF_MDIO b/configs/fedora/generic/arm/CONFIG_OF_MDIO
index cbdf2ee2f..e022a134b 100644
--- a/configs/fedora/generic/arm/CONFIG_OF_MDIO
+++ b/configs/fedora/generic/arm/CONFIG_OF_MDIO
@@ -1 +1 @@
-CONFIG_OF_MDIO=y
+CONFIG_OF_MDIO=m
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_DW_PLAT_HOST b/configs/fedora/generic/arm/CONFIG_PCIE_DW_PLAT_HOST
new file mode 100644
index 000000000..05f32f5e7
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_PCIE_DW_PLAT_HOST
@@ -0,0 +1 @@
+CONFIG_PCIE_DW_PLAT_HOST=y
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP
deleted file mode 100644
index dc8453f93..000000000
--- a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCIE_ROCKCHIP=y
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST
new file mode 100644
index 000000000..416bd56df
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP_HOST
@@ -0,0 +1 @@
+CONFIG_PCIE_ROCKCHIP_HOST=m
diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_SY8106A b/configs/fedora/generic/arm/CONFIG_REGULATOR_SY8106A
new file mode 100644
index 000000000..f058ce6ca
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_SY8106A
@@ -0,0 +1 @@
+CONFIG_REGULATOR_SY8106A=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SPI_MEM b/configs/fedora/generic/arm/CONFIG_SPI_MEM
index 118458c27..118458c27 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_SPI_MEM
+++ b/configs/fedora/generic/arm/CONFIG_SPI_MEM
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_CCU b/configs/fedora/generic/arm/CONFIG_SUNXI_CCU
index 30e6d69d1..30e6d69d1 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_CCU
+++ b/configs/fedora/generic/arm/CONFIG_SUNXI_CCU
diff --git a/configs/fedora/generic/arm/CONFIG_SWIOTLB b/configs/fedora/generic/arm/CONFIG_SWIOTLB
deleted file mode 100644
index 5405b65b4..000000000
--- a/configs/fedora/generic/arm/CONFIG_SWIOTLB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SWIOTLB=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SM4_ARM64_CE b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SM4_ARM64_CE
new file mode 100644
index 000000000..5aa28cca8
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SM4_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SM4_ARM64_CE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC b/configs/fedora/generic/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC
deleted file mode 100644
index f03be8a8f..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HOTPLUG_PCI_SHPC is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM
deleted file mode 100644
index cdb6169bd..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_DW_HOST_ECAM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCIE_DW_HOST_ECAM=y
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_HISI_STB b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_HISI_STB
index 40c67db5f..40c67db5f 100644
--- a/configs/fedora/generic/arm/CONFIG_PCIE_HISI_STB
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_HISI_STB
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_APR b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_APR
new file mode 100644
index 000000000..d3b61239a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_APR
@@ -0,0 +1 @@
+CONFIG_QCOM_APR=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_COMMAND_DB b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_COMMAND_DB
new file mode 100644
index 000000000..0a34c3a7e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_COMMAND_DB
@@ -0,0 +1 @@
+CONFIG_QCOM_COMMAND_DB=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE
new file mode 100644
index 000000000..40adfb485
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QCOM_GENI_SE
@@ -0,0 +1 @@
+CONFIG_QCOM_GENI_SE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI
new file mode 100644
index 000000000..64dbc4cc8
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_QCOM_GENI
@@ -0,0 +1 @@
+CONFIG_SERIAL_QCOM_GENI=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MSM8996 b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MSM8996
new file mode 100644
index 000000000..b8524f897
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MSM8996
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8996=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_QDSP6 b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_QDSP6
new file mode 100644
index 000000000..f9632751b
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_QDSP6
@@ -0,0 +1 @@
+CONFIG_SND_SOC_QDSP6=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_H6_R_CCU b/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_H6_R_CCU
new file mode 100644
index 000000000..073d6bdf6
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_H6_R_CCU
@@ -0,0 +1 @@
+CONFIG_SUN50I_H6_R_CCU=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_DWC3_QCOM b/configs/fedora/generic/arm/aarch64/CONFIG_USB_DWC3_QCOM
new file mode 100644
index 000000000..deca51a0a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_USB_DWC3_QCOM
@@ -0,0 +1 @@
+CONFIG_USB_DWC3_QCOM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_RENESAS b/configs/fedora/generic/arm/armv7/CONFIG_ARCH_RENESAS
deleted file mode 100644
index 0fa3a2ec3..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_RENESAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_RENESAS is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI b/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI
deleted file mode 100644
index a65e4de45..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SHMOBILE_MULTI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMC b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMC
new file mode 100644
index 000000000..761cf114e
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_FIMC
@@ -0,0 +1 @@
+CONFIG_DRM_EXYNOS_FIMC=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_GSC b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_GSC
new file mode 100644
index 000000000..cf2c394a6
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_GSC
@@ -0,0 +1 @@
+CONFIG_DRM_EXYNOS_GSC=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR
new file mode 100644
index 000000000..b994e95b5
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_ROTATOR
@@ -0,0 +1 @@
+CONFIG_DRM_EXYNOS_ROTATOR=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_SCALER b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_SCALER
new file mode 100644
index 000000000..7931aa6cb
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_DRM_EXYNOS_SCALER
@@ -0,0 +1 @@
+CONFIG_DRM_EXYNOS_SCALER=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_GPIO_MAX732X b/configs/fedora/generic/arm/armv7/CONFIG_GPIO_MAX732X
new file mode 100644
index 000000000..972022c9b
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_GPIO_MAX732X
@@ -0,0 +1 @@
+CONFIG_GPIO_MAX732X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MDIO_BUS_MUX b/configs/fedora/generic/arm/armv7/CONFIG_MDIO_BUS_MUX
deleted file mode 100644
index 19416a6ca..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MDIO_BUS_MUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_BUS_MUX=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_QCOM_APR b/configs/fedora/generic/arm/armv7/CONFIG_QCOM_APR
new file mode 100644
index 000000000..7453bb3c6
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_QCOM_APR
@@ -0,0 +1 @@
+# CONFIG_QCOM_APR is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_QCOM_COMMAND_DB b/configs/fedora/generic/arm/armv7/CONFIG_QCOM_COMMAND_DB
new file mode 100644
index 000000000..50311c7b5
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_QCOM_COMMAND_DB
@@ -0,0 +1 @@
+# CONFIG_QCOM_COMMAND_DB is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_QCOM_GENI_SE b/configs/fedora/generic/arm/armv7/CONFIG_QCOM_GENI_SE
new file mode 100644
index 000000000..ac6e62679
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_QCOM_GENI_SE
@@ -0,0 +1 @@
+# CONFIG_QCOM_GENI_SE is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_CCU b/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_CCU
deleted file mode 100644
index 30e6d69d1..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_CCU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUNXI_CCU=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_CPUFREQ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_CPUFREQ
new file mode 100644
index 000000000..2b0026025
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_CPUFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA20_CPUFREQ=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OMAP_MUX b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OMAP_MUX
deleted file mode 100644
index ac0115315..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OMAP_MUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_MUX=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
deleted file mode 100644
index b6c2ad2cf..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OMAP_MUX_WARNINGS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OMAP_MUX_WARNINGS=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_POWER_AVS b/configs/fedora/generic/arm/armv7/armv7/CONFIG_POWER_AVS
deleted file mode 100644
index f58c71a0d..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_POWER_AVS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_AVS=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TEGRA20_MC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_TEGRA20_MC
deleted file mode 100644
index c627c9d0c..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_TEGRA20_MC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEGRA20_MC=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_DWC3_QCOM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_DWC3_QCOM
new file mode 100644
index 000000000..449bcde83
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_USB_DWC3_QCOM
@@ -0,0 +1 @@
+# CONFIG_USB_DWC3_QCOM is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_XEN b/configs/fedora/generic/arm/armv7/armv7/CONFIG_XEN
deleted file mode 100644
index f154fee42..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_XEN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN is not set
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_HVC_XEN b/configs/fedora/generic/arm/armv7/lpae/CONFIG_HVC_XEN
deleted file mode 100644
index df97a05c7..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_HVC_XEN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HVC_XEN=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND
deleted file mode 100644
index 02ccaac13..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_HVC_XEN_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HVC_XEN_FRONTEND=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
deleted file mode 100644
index 9703adaf4..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_TEGRA20_MC b/configs/fedora/generic/arm/armv7/lpae/CONFIG_TEGRA20_MC
deleted file mode 100644
index e046eac20..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_TEGRA20_MC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TEGRA20_MC is not set
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN
deleted file mode 100644
index f154fee42..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN is not set
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XENFS b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XENFS
deleted file mode 100644
index 2a9db2ee7..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XENFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XENFS=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BACKEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BACKEND
deleted file mode 100644
index b15ca354b..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BACKEND=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BALLOON b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BALLOON
deleted file mode 100644
index 1210e9672..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BALLOON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN_BALLOON is not set
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND
deleted file mode 100644
index 214dd3c75..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BLKDEV_BACKEND=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND
deleted file mode 100644
index 5b1ec5f14..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_BLKDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BLKDEV_FRONTEND=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS
deleted file mode 100644
index 280bc95c8..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_COMPAT_XENFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_COMPAT_XENFS=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN
deleted file mode 100644
index a198d3b62..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_DEV_EVTCHN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_DEV_EVTCHN=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND
deleted file mode 100644
index a0d0c69b8..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_FBDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_FBDEV_FRONTEND=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_GNTDEV b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_GNTDEV
deleted file mode 100644
index 423af3d00..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_GNTDEV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_GNTDEV=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC
deleted file mode 100644
index 9c4e42ad1..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_GRANT_DEV_ALLOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_GRANT_DEV_ALLOC=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND
deleted file mode 100644
index 8f3e152d3..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_NETDEV_BACKEND=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND
deleted file mode 100644
index eb86ad0f8..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_NETDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_NETDEV_FRONTEND=m
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR
deleted file mode 100644
index a8ff9c8e6..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_SYS_HYPERVISOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_WDT b/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_WDT
deleted file mode 100644
index 333aa5528..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_XEN_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_WDT=m