aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-03-25 11:27:31 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-03-27 16:26:56 +0100
commit112d1052ac5687bec2b666e5b1a62acbf614ce2c (patch)
tree9d7f8e196910fb3e4611b713a911b7dbf81e5b61
parent2464a9a8a4a3c7b4a0cb63db42b9906a0297979a (diff)
downloadupstream-112d1052ac5687bec2b666e5b1a62acbf614ce2c.tar.gz
upstream-112d1052ac5687bec2b666e5b1a62acbf614ce2c.tar.bz2
upstream-112d1052ac5687bec2b666e5b1a62acbf614ce2c.zip
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. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 7d6553c72edada262ada8dbe871243c35400573d)
-rw-r--r--target/linux/generic/config-5.41
-rw-r--r--target/linux/rockchip/armv8/config-5.41
-rw-r--r--target/linux/tegra/config-5.41
3 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index a0193ca718..9ca6b7573e 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -6224,6 +6224,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.4 b/target/linux/rockchip/armv8/config-5.4
index bea1dbc741..c528f01c97 100644
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -502,7 +502,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_VM_EVENT_COUNTERS=y
CONFIG_VT=y
diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 6bc96d13ce..a5ea2423bc 100644
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -554,7 +554,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