[LEDE-DEV] [PATCH 3/4] x86: Move USB support from subtargets to target config

Mon Jul 17 15:11:28 PDT 2017

On Mon, Jul 17, 2017 at 03:56:20PM -0600, Philip Prindeville wrote:
> Am I the only one who would prefer all of the virtualization support to be selected and default to off?
> 
> All the fuss we have about not burdening images with unnecessary functionality, yet no one blinks at this...

This is x86, not exactly space-constrained.

As a trade-off against more complexity and buildbot ressources, it makes
sense to push more functionalities in a reduced number of build variants.

> > On Jul 15, 2017, at 10:48 AM, Baptiste Jonglez <baptiste at bitsofnetworks.org> wrote:
> > 
> > From: Baptiste Jonglez <git at bitsofnetworks.org>
> > 
> > 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 at bitsofnetworks.org>
> > ---
> > target/linux/x86/64/config-default      |  9 ---------
> > target/linux/x86/config-4.9             | 14 +++++++++++---
> > target/linux/x86/generic/config-default |  9 ---------
> > target/linux/x86/geode/config-default   |  8 --------
> > target/linux/x86/legacy/config-default  |  9 ---------
> > 5 files changed, 11 insertions(+), 38 deletions(-)
> > 
> > diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
> > index 8288c1ade2..5d259d3656 100644
> > --- 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 8965aba474..402c5fdddb 100644
> > --- 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 cef35fd157..310c37cf11 100644
> > --- 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 2820dfbf7d..69d31b00a5 100644
> > --- 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 0802ee65e7..3e0b065253 100644
> > --- 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
> > -- 
> > 2.13.3
> > 
> > 
> > _______________________________________________
> > Lede-dev mailing list
> > Lede-dev at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/lede-dev
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/lede-dev/attachments/20170718/8c732fd4/attachment-0001.sig>