kernel: Deactivate CONFIG_VFIO in generic kernel config

Instead of deactivating this in every target config, deactivate it once
in the generic kernel config. I was asked for this config option in a
x86 64 build in OpenWrt 21.02.

Fixes: 87046e87e229 ("kernel: add missing kernel config symbol")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 0f6d3d7791d795f60732364c3eaaf7f9384336d7..1dc97ce745981f7998d626afd7ecf54f9983c0ae 100644 (file)
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -6259,6 +6259,7 @@ CONFIG_VDSO=y
 # CONFIG_VF610_ADC is not set
 # CONFIG_VF610_DAC is not set
 # CONFIG_VFAT_FS is not set
+# CONFIG_VFIO is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VGA_ARB is not set
 # CONFIG_VGA_SWITCHEROO is not set

diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10
index 3a8b534bd57d923741f4db0d56dff0ac890db59d..fedbeb5c4e54e9061daf8dd21c2bfb5f2edf8922 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.10
+++ b/target/linux/rockchip/armv8/config-5.10
@@ -645,7 +645,6 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PLATFORM=y
 # CONFIG_USERIO is not set
-# CONFIG_VFIO is not set
 # CONFIG_VIRTIO_MENU is not set
 CONFIG_VMAP_STACK=y
 CONFIG_VM_EVENT_COUNTERS=y

diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
index 53adaf7760e0b21509913f4280beb678859c771d..a1663b19988f64333753dbdad7b6e671ee4bfc66 100644 (file)
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -617,7 +617,6 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PLATFORM=y
 # CONFIG_USERIO is not set
-# CONFIG_VFIO is not set
 # CONFIG_VIRTIO_MENU is not set
 CONFIG_VMAP_STACK=y
 CONFIG_VM_EVENT_COUNTERS=y

diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 00fc11a69bae76a1e36392d05714b329f96c16cd..c5e37f8d3bb03a1c171cf49ae8b463c6d6a632b3 100644 (file)
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -553,7 +553,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 # CONFIG_USERIO is not set
 CONFIG_USE_OF=y
-# CONFIG_VFIO is not set
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_WATCHDOG_CORE=y