upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move ohci files to their proper place in the tree for atmel.

Browse source 
Fix when it is included (we don't have a at91rm9200 device).
From a similar patch in the PR, with tweaked names.

PR: 206229
This commit is contained in:
Warner Losh 2016-01-16 04:47:32 +00:00
parent 477bffbe4d
commit 64535e84f6
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
sys/dev/usb/controller/ohci_atmelarm.c → sys/arm/at91/at91_ohci.c
View file

0
sys/dev/usb/controller/ohci_fdt.c → sys/arm/at91/at91_ohci_fdt.c
View file

11
sys/arm/at91/files.at91
View file

@ -9,6 +9,8 @@ arm/at91/at91_smc.c standard
arm/at91/at91_cfata.c optional at91_cfata
arm/at91/at91_common.c optional fdt
arm/at91/at91_mci.c optional at91_mci
arm/at91/at91_ohci.c optional ohci ! fdt
arm/at91/at91_ohci_fdt.c optional ohci fdt
arm/at91/at91_pinctrl.c optional fdt fdt_pinctrl
arm/at91/at91_pit.c optional at91sam9
arm/at91/at91_reset.S optional at91sam9
@ -58,8 +60,11 @@ arm/at91/board_tsc4370.c optional at91_board_tsc4370
#
# usb
#
# XXX these should likely move to sys/at91 as well. They are also
# XXX slightly inconsistent with sys/conf/files and that ambiguity
# XXX should be fixed when this can be tested on real kit. The dci
# XXX code has hard-coded GPIO pins which is almost certainly wrong.
dev/usb/controller/at91dci.c optional at91_dci
dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt
dev/usb/controller/ohci_atmelarm.c optional ohci !fdt
dev/usb/controller/at91dci_atmelarm.c optional at91_dci ! fdt
dev/usb/controller/at91dci_fdt.c optional at91_dci fdt
dev/usb/controller/ohci_fdt.c optional ohci fdt

1
sys/conf/files
View file

@ -2561,7 +2561,6 @@ dev/usb/controller/dwc_otg_fdt.c optional dwcotg fdt
dev/usb/controller/ehci.c optional ehci
dev/usb/controller/ehci_pci.c optional ehci pci
dev/usb/controller/ohci.c optional ohci
dev/usb/controller/ohci_atmelarm.c optional ohci at91rm9200
dev/usb/controller/ohci_pci.c optional ohci pci
dev/usb/controller/uhci.c optional uhci
dev/usb/controller/uhci_pci.c optional uhci pci