[OS-BUILD PATCH] Disable liquidio driver on ark/rhel
by Herton R. Krzesinski (via Email Bridge)
From: Herton R. Krzesinski <herton(a)redhat.com>
Disable liquidio driver on ark/rhel
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1993393
liquidio driver was already disabled on Fedora, but was still being
enabled on RHEL/ark. This was enabled back in rhel8 but we got a request
to revert that later in rhel8. So there is no reason to keep it enabled
anymore in RHEL/ark too.
Disabling the driver also allowed some simplification/removal of now
uneeded config files and unification of them. While at it, I also
moved CAVIUM_PTP to m in rhel/ark as is already the case in Fedora
(afaik there is no apparent reason to keep it builtin, and was just the
result of default choice of this option looking at the option history),
and I also disabled LIQUIDIO_VF following the liquidio disabling (this
affects Fedora too where it was still enabled).
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff --git a/redhat/configs/ark/generic/CONFIG_CAVIUM_PTP b/redhat/configs/ark/generic/CONFIG_CAVIUM_PTP
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_CAVIUM_PTP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAVIUM_PTP=y
diff --git a/redhat/configs/ark/generic/CONFIG_LIQUIDIO b/redhat/configs/ark/generic/CONFIG_LIQUIDIO
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_LIQUIDIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LIQUIDIO=m
diff --git a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_BGX b/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_BGX
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_BGX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THUNDER_NIC_BGX is not set
diff --git a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_PF b/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_PF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_PF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THUNDER_NIC_PF is not set
diff --git a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_RGX b/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_RGX
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_RGX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THUNDER_NIC_RGX is not set
diff --git a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_VF b/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_VF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/CONFIG_THUNDER_NIC_VF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THUNDER_NIC_VF is not set
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_BGX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_BGX=m
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_PF b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_PF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_PF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_PF=m
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_RGX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_RGX=m
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_VF b/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_VF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_THUNDER_NIC_VF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDER_NIC_VF=m
diff --git a/redhat/configs/common/generic/CONFIG_LIQUIDIO_VF b/redhat/configs/common/generic/CONFIG_LIQUIDIO_VF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/CONFIG_LIQUIDIO_VF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LIQUIDIO_VF=m
diff --git a/redhat/configs/fedora/generic/CONFIG_NET_VENDOR_CAVIUM b/redhat/configs/common/generic/CONFIG_NET_VENDOR_CAVIUM
rename from redhat/configs/fedora/generic/CONFIG_NET_VENDOR_CAVIUM
rename to redhat/configs/common/generic/CONFIG_NET_VENDOR_CAVIUM
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_NET_VENDOR_CAVIUM
+++ b/redhat/configs/common/generic/CONFIG_NET_VENDOR_CAVIUM
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CAVIUM_PTP b/redhat/configs/common/generic/arm/aarch64/CONFIG_CAVIUM_PTP
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_CAVIUM_PTP
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_CAVIUM_PTP
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CAVIUM_PTP
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_CAVIUM_PTP
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_LIQUIDIO b/redhat/configs/common/generic/arm/aarch64/CONFIG_LIQUIDIO
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_LIQUIDIO
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_LIQUIDIO
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_LIQUIDIO
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_LIQUIDIO
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_LIQUIDIO_VF b/redhat/configs/common/generic/arm/aarch64/CONFIG_LIQUIDIO_VF
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_LIQUIDIO_VF
@@ -0,0 +1 @@
+# CONFIG_LIQUIDIO_VF is not set
diff --git a/redhat/configs/ark/generic/CONFIG_NET_VENDOR_CAVIUM b/redhat/configs/common/generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
rename from redhat/configs/ark/generic/CONFIG_NET_VENDOR_CAVIUM
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_NET_VENDOR_CAVIUM
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_CAVIUM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NET_VENDOR_CAVIUM=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1320