diff --git a/configs/fedora/generic/arm/CONFIG_ARMADA_37XX_WATCHDOG b/configs/fedora/generic/arm/CONFIG_ARMADA_37XX_WATCHDOG
new file mode 100644
index 000000000..a2e4adede
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_ARMADA_37XX_WATCHDOG
@@ -0,0 +1 @@
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
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/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