diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_SUNXI b/configs/fedora/generic/arm/CONFIG_AHCI_SUNXI
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_AHCI_SUNXI
rename to configs/fedora/generic/arm/CONFIG_AHCI_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_SUNXI b/configs/fedora/generic/arm/CONFIG_ARCH_SUNXI
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_ARCH_SUNXI
rename to configs/fedora/generic/arm/CONFIG_ARCH_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUNXI b/configs/fedora/generic/arm/CONFIG_DWMAC_SUNXI
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUNXI
rename to configs/fedora/generic/arm/CONFIG_DWMAC_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IR_SUNXI b/configs/fedora/generic/arm/CONFIG_IR_SUNXI
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_IR_SUNXI
rename to configs/fedora/generic/arm/CONFIG_IR_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MMC_SUNXI b/configs/fedora/generic/arm/CONFIG_MMC_SUNXI
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_MMC_SUNXI
rename to configs/fedora/generic/arm/CONFIG_MMC_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG b/configs/fedora/generic/arm/CONFIG_SUNXI_WATCHDOG
similarity index 100%
rename from configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG
rename to configs/fedora/generic/arm/CONFIG_SUNXI_WATCHDOG
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI
deleted file mode 100644
index 91560d628..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AHCI_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI
deleted file mode 100644
index 6cf4026fd..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_SUNXI=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI
deleted file mode 100644
index 254fc7d8a..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI
deleted file mode 100644
index fe2dc68a6..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IR_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI
deleted file mode 100644
index 0f6eda36b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG b/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG
deleted file mode 100644
index 9b58f97fb..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUNXI_WATCHDOG=m