[Utopic] UBUNTU: (config) Built-in ohci-pci (again)

[Stefan Bader]

On 18.09.2014 15:25, Tim Gardner wrote:
> On 09/18/2014 07:08 AM, Stefan Bader wrote:
>> From b9d92e0980cfb606a7018aca4f829dddad6595db Mon Sep 17 00:00:00 2001
>> From: Stefan Bader <stefan.bader at canonical.com>
>> Date: Thu, 18 Sep 2014 14:59:07 +0200
>> Subject: [PATCH] UBUNTU: (config) Built-in ohci-pci (again)
>>
>> BugLink: http://bugs.launchpad.net/bugs/1244176
>>
>> We had this problem already in the past. At some point upstream
>> made a split to have the actual pci controller a seperate option.
>> Part this is that the module is not listed in d-i and so the debian
>> install (which is still used for server and netinst) will not be
>> able to talk to usb keyboards (at least those USB 1.1).
>>
>> Since we build the ehci pci code in, and had the ohci pci code
>> built-in for Trusty, I would propose to do the same again (if
>> nothing caused real issues when we did that).
>>
>> Also adding the module to d-i just in case this becomes a module
>> for some reason, again.
>>
>> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
>> ---
>>  debian.master/config/config.common.ubuntu | 2 +-
>>  debian.master/d-i/modules/usb-modules     | 1 +
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
>> index cb31cbe..b6f19b0 100644
>> --- a/debian.master/config/config.common.ubuntu
>> +++ b/debian.master/config/config.common.ubuntu
>> @@ -7437,7 +7437,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
>>  CONFIG_USB_OHCI_EXYNOS=y
>>  CONFIG_USB_OHCI_HCD=y
>>  CONFIG_USB_OHCI_HCD_OMAP3=m
>> -CONFIG_USB_OHCI_HCD_PCI=m
>> +CONFIG_USB_OHCI_HCD_PCI=y
>>  # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
>>  CONFIG_USB_OHCI_LITTLE_ENDIAN=y
>>  CONFIG_USB_OTG=y
>> diff --git a/debian.master/d-i/modules/usb-modules b/debian.master/d-i/modules/usb-modules
>> index e149134..50969ce 100644
>> --- a/debian.master/d-i/modules/usb-modules
>> +++ b/debian.master/d-i/modules/usb-modules
>> @@ -2,6 +2,7 @@ ehci-hcd ?
>>  isp116x-hcd ?
>>  isp1760 ?
>>  ohci-hcd ?
>> +ohci-pci ?
>>  r8a66597-hcd ?
>>  sl811_cs ?
>>  sl811-hcd ?
>>
> 
> Do you think we can get by with just adding the module to d-i ?
> 
> rtg
> 
Yeah, I guess that should be sufficient. Building it in was just because we do
the same with the ehci part. Maybe something to generalize in U+1.

-Stefan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20140918/3afd3be9/attachment.sig>