x86: Move USB support from subtargets to target config

All x86 subtargets enable USB support, so it makes sense to enable it
in the target config instead, to avoid duplication.

Also refresh subtarget configs accordingly.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>

diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
index 8288c1ade22e61b25297963b014d665c7a7e3348..5d259d3656516012a19d06b6e374673f7ecad46c 100644 (file)
--- a/target/linux/x86/64/config-default
+++ b/target/linux/x86/64/config-default
@@ -150,7 +150,6 @@ CONFIG_HAVE_LIVEPATCH=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_GENERIC=y
 CONFIG_HID_HYPERV_MOUSE=y
@@ -278,16 +277,8 @@ CONFIG_TREE_RCU=y
 CONFIG_UCS2_STRING=y
 CONFIG_UCSI=y
 # CONFIG_UNISYSSPAR is not set
-CONFIG_USB=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_EHCI_PCI=y
-CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_STORAGE=y
-CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set

diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9
index 8965aba4742e291d6c78e4975db867fda2345e15..402c5fdddbc2fc80836cd5a0195230c90bfd7eda 100644 (file)
--- a/target/linux/x86/config-4.9
+++ b/target/linux/x86/config-4.9
@@ -216,9 +216,7 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UID16=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HID_SUPPORT=y
-CONFIG_USB_HID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
@@ -402,7 +400,17 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_TOSHIBA is not set
 CONFIG_UP_LATE_INIT=y
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_HID=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_SUPPORT=y
+CONFIG_USB_UHCI_HCD=y
 # CONFIG_USERIO is not set
 # CONFIG_USER_NS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y

diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index cef35fd157e4b9c7debc6864b06ec82776d8b77b..310c37cf11b1eb4b9040ea34123166a1af0da7cc 100644 (file)
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -154,7 +154,6 @@ CONFIG_HAVE_KVM_IRQ_ROUTING=y
 CONFIG_HAVE_KVM_MSI=y
 CONFIG_HDMI=y
 CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HPET=y
@@ -306,15 +305,7 @@ CONFIG_TASK_DELAY_ACCT=y
 # CONFIG_TOSHIBA_BT_RFKILL is not set
 CONFIG_TREE_RCU=y
 CONFIG_UCS2_STRING=y
-CONFIG_USB=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_EHCI_PCI=y
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_STORAGE=y
-CONFIG_USB_UHCI_HCD=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64

diff --git a/target/linux/x86/geode/config-default b/target/linux/x86/geode/config-default
index 2820dfbf7d972d7b92fd73d9689f4a05b7157d91..69d31b00a516cbe49b177bcf4cafc2b7ff6b34db 100644 (file)
--- a/target/linux/x86/geode/config-default
+++ b/target/linux/x86/geode/config-default
@@ -59,7 +59,6 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_WS16C48 is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_HID=y
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HPET is not set
@@ -117,14 +116,7 @@ CONFIG_SENSORS_LM90=y
 CONFIG_SERIAL_8250_PNP=y
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
-CONFIG_USB=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_EHCI_PCI=y
-CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 # CONFIG_USB_UHCI_HCD is not set
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64

diff --git a/target/linux/x86/legacy/config-default b/target/linux/x86/legacy/config-default
index 0802ee65e7e5459d009a43833007214b452a2316..3e0b065253b4c9a63c0469908a28f903a060d161 100644 (file)
--- a/target/linux/x86/legacy/config-default
+++ b/target/linux/x86/legacy/config-default
@@ -102,7 +102,6 @@ CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HDMI=y
-CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HPET=y
@@ -185,15 +184,7 @@ CONFIG_SATA_AHCI=y
 CONFIG_SERIAL_8250_PNP=y
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
-CONFIG_USB=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_EHCI_PCI=y
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_STORAGE=y
-CONFIG_USB_UHCI_HCD=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 # CONFIG_WDT is not set