From 7d7fb75df5735a089d183ca3d24c06d4b5178dc8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 12 May 2016 16:52:36 +0200 Subject: [PATCH] x86: remove the kvm_guest subtarget 32-bit only hardware that supports kvm is very rare. It's not worth keeping a separate subtarget for this. Signed-off-by: Felix Fietkau --- package/kernel/linux/modules/virtual.mk | 48 ------- target/linux/x86/Makefile | 2 +- target/linux/x86/kvm_guest/config-default | 136 ------------------ .../x86/kvm_guest/profiles/000-Generic.mk | 15 -- target/linux/x86/kvm_guest/target.mk | 4 - 5 files changed, 1 insertion(+), 204 deletions(-) delete mode 100644 target/linux/x86/kvm_guest/config-default delete mode 100644 target/linux/x86/kvm_guest/profiles/000-Generic.mk delete mode 100644 target/linux/x86/kvm_guest/target.mk diff --git a/package/kernel/linux/modules/virtual.mk b/package/kernel/linux/modules/virtual.mk index 61a8a87609..e18c376d3e 100644 --- a/package/kernel/linux/modules/virtual.mk +++ b/package/kernel/linux/modules/virtual.mk @@ -7,54 +7,6 @@ VIRTUAL_MENU:=Virtualization Support -define KernelPackage/virtio-balloon - SUBMENU:=$(VIRTUAL_MENU) - TITLE:=VirtIO balloon driver - DEPENDS:=@TARGET_x86_kvm_guest - KCONFIG:=CONFIG_VIRTIO_BALLOON - FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko - AUTOLOAD:=$(call AutoLoad,06,virtio-balloon) -endef - -define KernelPackage/virtio-balloon/description - Kernel module for VirtIO memory ballooning support -endef - -$(eval $(call KernelPackage,virtio-balloon)) - - -define KernelPackage/virtio-net - SUBMENU:=$(VIRTUAL_MENU) - TITLE:=VirtIO network driver - DEPENDS:=@TARGET_x86_kvm_guest - KCONFIG:=CONFIG_VIRTIO_NET - FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko - AUTOLOAD:=$(call AutoLoad,50,virtio_net) -endef - -define KernelPackage/virtio-net/description - Kernel module for the VirtIO paravirtualized network device -endef - -$(eval $(call KernelPackage,virtio-net)) - - -define KernelPackage/virtio-random - SUBMENU:=$(VIRTUAL_MENU) - TITLE:=VirtIO Random Number Generator support - DEPENDS:=@TARGET_x86_kvm_guest - KCONFIG:=CONFIG_HW_RANDOM_VIRTIO - FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko - AUTOLOAD:=$(call AutoLoad,09,virtio-rng) -endef - -define KernelPackage/virtio-random/description - Kernel module for the VirtIO Random Number Generator -endef - -$(eval $(call KernelPackage,virtio-random)) - - define KernelPackage/xen-privcmd SUBMENU:=$(VIRTUAL_MENU) TITLE:=Xen private commands diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 1e51d7117e..1eae227f85 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -10,7 +10,7 @@ ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz -SUBTARGETS=generic xen_domu geode kvm_guest 64 +SUBTARGETS=generic xen_domu geode 64 MAINTAINER:=Felix Fietkau DEFAULT_PACKAGES += partx-utils diff --git a/target/linux/x86/kvm_guest/config-default b/target/linux/x86/kvm_guest/config-default deleted file mode 100644 index 9de0bf609e..0000000000 --- a/target/linux/x86/kvm_guest/config-default +++ /dev/null @@ -1,136 +0,0 @@ -CONFIG_ACPI=y -# CONFIG_ACPI_AC is not set -# CONFIG_ACPI_BATTERY is not set -CONFIG_ACPI_BUTTON=y -# CONFIG_ACPI_CMPC is not set -# CONFIG_ACPI_CONTAINER is not set -CONFIG_ACPI_CPU_FREQ_PSS=y -# CONFIG_ACPI_CUSTOM_DSDT is not set -# CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_DEBUGGER is not set -# CONFIG_ACPI_DOCK is not set -# CONFIG_ACPI_EC_DEBUGFS is not set -# CONFIG_ACPI_FAN is not set -CONFIG_ACPI_HOTPLUG_IOAPIC=y -# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y -# CONFIG_ACPI_NFIT is not set -# CONFIG_ACPI_PCI_SLOT is not set -CONFIG_ACPI_PROCESSOR=y -# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set -CONFIG_ACPI_PROCESSOR_IDLE=y -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y -# CONFIG_ACPI_SBS is not set -CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y -# CONFIG_ACPI_THERMAL is not set -# CONFIG_ACPI_VIDEO is not set -# CONFIG_ACPI_WMI is not set -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y -# CONFIG_BACKLIGHT_APPLE is not set -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_CPU_RMAP=y -# CONFIG_EFI is not set -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_HAVE_ACPI_APEI=y -CONFIG_HAVE_ACPI_APEI_NMI=y -CONFIG_HAVE_ARCH_HUGE_VMAP=y -# CONFIG_HIGHMEM64G is not set -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=y -# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_CPCI is not set -# CONFIG_HOTPLUG_PCI_IBM is not set -CONFIG_HOTPLUG_PCI_PCIE=y -# CONFIG_HOTPLUG_PCI_SHPC is not set -# CONFIG_HPET is not set -# CONFIG_HP_ACCEL is not set -CONFIG_HVC_DRIVER=y -# CONFIG_HW_RANDOM_VIRTIO is not set -CONFIG_HYPERVISOR_GUEST=y -# CONFIG_INTEL_IPS is not set -# CONFIG_INTEL_PMC_IPC is not set -CONFIG_IOMMU_HELPER=y -# CONFIG_ISCSI_IBFT_FIND is not set -# CONFIG_KVM is not set -# CONFIG_KVM_DEBUG_FS is not set -CONFIG_KVM_GUEST=y -# CONFIG_LGUEST is not set -# CONFIG_LGUEST_GUEST is not set -CONFIG_LOCK_SPIN_ON_OWNER=y -# CONFIG_M486 is not set -# CONFIG_MFD_INTEL_LPSS_ACPI is not set -CONFIG_MPENTIUM4=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NLS=y -CONFIG_NO_HZ=y -CONFIG_NR_CPUS=4 -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set -CONFIG_PARAVIRT_SPINLOCKS=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_PCIEAER=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_LABEL=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PGTABLE_LEVELS=3 -CONFIG_PHYS_ADDR_T_64BIT=y -# CONFIG_PMIC_OPREGION is not set -CONFIG_PNP=y -CONFIG_PNPACPI=y -CONFIG_PNP_DEBUG_MESSAGES=y -# CONFIG_PVPANIC is not set -CONFIG_QUEUED_RWLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y -CONFIG_RAS=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -# CONFIG_SAMSUNG_Q10 is not set -CONFIG_SERIAL_8250_PNP=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SMP=y -# CONFIG_SURFACE_PRO3_BUTTON is not set -CONFIG_SWIOTLB=y -# CONFIG_TOSHIBA_BT_RFKILL is not set -CONFIG_TREE_RCU=y -# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set -# CONFIG_VHOST_NET is not set -CONFIG_VIRTIO=y -CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_CONSOLE=y -# CONFIG_VIRTIO_NET is not set -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTUALIZATION=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_X86_32_SMP=y -# CONFIG_X86_ACPI_CPUFREQ is not set -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set -# CONFIG_X86_BIGSMP is not set -CONFIG_X86_CMOV=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_DEBUGCTLMSR=y -# CONFIG_X86_E_POWERSAVER is not set -# CONFIG_X86_GENERIC is not set -# CONFIG_X86_INTEL_LPSS is not set -CONFIG_X86_INTERNODE_CACHE_SHIFT=7 -CONFIG_X86_L1_CACHE_SHIFT=7 -# CONFIG_X86_LONGHAUL is not set -CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_X86_PAE=y -# CONFIG_X86_PAT is not set -# CONFIG_X86_PCC_CPUFREQ is not set -# CONFIG_X86_PMEM_LEGACY is not set -CONFIG_X86_PM_TIMER=y -CONFIG_X86_TSC=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_XPS=y diff --git a/target/linux/x86/kvm_guest/profiles/000-Generic.mk b/target/linux/x86/kvm_guest/profiles/000-Generic.mk deleted file mode 100644 index ccd125afa2..0000000000 --- a/target/linux/x86/kvm_guest/profiles/000-Generic.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Generic - NAME:=Generic -endef - -define Profile/Generic/Description - Generic Profile -endef -$(eval $(call Profile,Generic)) diff --git a/target/linux/x86/kvm_guest/target.mk b/target/linux/x86/kvm_guest/target.mk deleted file mode 100644 index 9970d73277..0000000000 --- a/target/linux/x86/kvm_guest/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -BOARDNAME:=KVM Guest -FEATURES:=ext4 pci usb -DEFAULT_PACKAGES += kmod-button-hotplug kmod-virtio-balloon kmod-virtio-net kmod-virtio-random -CPU_TYPE := pentium4 -- 2.30.2