From e723e1d4b16947cf20ca51c977d1c470dd8b5dd2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 25 Mar 2021 11:27:31 +0100 Subject: [PATCH] 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 --- target/linux/generic/config-5.4 | 1 + target/linux/rockchip/armv8/config-5.10 | 1 - target/linux/rockchip/armv8/config-5.4 | 1 - target/linux/tegra/config-5.4 | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 6620239e52..4d7120df41 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -6271,6 +6271,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 b646ae1b68..baecfaf94e 100644 --- a/target/linux/rockchip/armv8/config-5.10 +++ b/target/linux/rockchip/armv8/config-5.10 @@ -656,7 +656,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 0a83d520e4..83df63a634 100644 --- a/target/linux/rockchip/armv8/config-5.4 +++ b/target/linux/rockchip/armv8/config-5.4 @@ -629,7 +629,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