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 14:34:00 +0100
commit7d6553c72edada262ada8dbe871243c35400573d (patch)
tree065c288a29d370f59e3193f0ef7ed18f0ab50530
parent87046e87e2298759d14de2438bdaca7491c17776 (diff)
downloadupstream-7d6553c72edada262ada8dbe871243c35400573d.tar.gz
upstream-7d6553c72edada262ada8dbe871243c35400573d.tar.bz2
upstream-7d6553c72edada262ada8dbe871243c35400573d.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. Fixes: 87046e87e229 ("kernel: add missing kernel config symbol") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/generic/config-5.41
-rw-r--r--target/linux/rockchip/armv8/config-5.101
-rw-r--r--target/linux/rockchip/armv8/config-5.41
-rw-r--r--target/linux/tegra/config-5.41
4 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 0f6d3d7791..1dc97ce745 100644
--- 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 3a8b534bd5..fedbeb5c4e 100644
--- 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 53adaf7760..a1663b1998 100644
--- 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 00fc11a69b..c5e37f8d3b 100644
--- 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