[OS-BUILD PATCH] fedora: arm: Update some meson config options

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)gmail.com&gt;

---
 .../configs/fedora/generic/arm/{armv7 => }/CONFIG_MESON_WATCHDOG | 0
 redhat/configs/fedora/generic/arm/{armv7 => }/CONFIG_REGMAP_MMIO | 0
 .../fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_PHASE     | 1 +
 .../fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_SCLK_DIV  | 1 +
 redhat/configs/fedora/generic/arm/aarch64/CONFIG_MESON_WATCHDOG  | 1 -
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename redhat/configs/fedora/generic/arm/{armv7 => }/CONFIG_MESON_WATCHDOG (100%)
 rename redhat/configs/fedora/generic/arm/{armv7 => }/CONFIG_REGMAP_MMIO (100%)
 create mode 100644
redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_PHASE
 create mode 100644
redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_SCLK_DIV
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_MESON_WATCHDOG

diff --git a/redhat/configs/fedora/generic/arm/armv7/CONFIG_MESON_WATCHDOG
b/redhat/configs/fedora/generic/arm/CONFIG_MESON_WATCHDOG
similarity index 100%
rename from redhat/configs/fedora/generic/arm/armv7/CONFIG_MESON_WATCHDOG
rename to redhat/configs/fedora/generic/arm/CONFIG_MESON_WATCHDOG
diff --git a/redhat/configs/fedora/generic/arm/armv7/CONFIG_REGMAP_MMIO
b/redhat/configs/fedora/generic/arm/CONFIG_REGMAP_MMIO
similarity index 100%
rename from redhat/configs/fedora/generic/arm/armv7/CONFIG_REGMAP_MMIO
rename to redhat/configs/fedora/generic/arm/CONFIG_REGMAP_MMIO
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_PHASE
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_PHASE
new file mode 100644
index 000000000000..598cca1eb0c9
--- /dev/null
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_PHASE
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_MESON_PHASE=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_SCLK_DIV
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_SCLK_DIV
new file mode 100644
index 000000000000..e8843db239cc
--- /dev/null
+++ b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_MESON_SCLK_DIV
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_MESON_WATCHDOG
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_MESON_WATCHDOG
deleted file mode 100644
index 2e5c153a9a1f..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_MESON_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MESON_WATCHDOG is not set
-- 
GitLab