summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2013-07-30 02:26:06 +0000
committerrpaulo <rpaulo@FreeBSD.org>2013-07-30 02:26:06 +0000
commit975454212145290ba072dbd5f59b617c460c7158 (patch)
tree90843af690757014466faeeef96e3ee1ad276065 /sys/modules
parent56bac42471ec8b35638e305a9569e75b7c2e35a0 (diff)
downloadFreeBSD-src-975454212145290ba072dbd5f59b617c460c7158.zip
FreeBSD-src-975454212145290ba072dbd5f59b617c460c7158.tar.gz
Move runfw to modules/usb.
While there, respect MK_SOURCELESS_UCODE. Discussed with: kevlo
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile2
-rw-r--r--sys/modules/usb/Makefile11
-rw-r--r--sys/modules/usb/runfw/Makefile (renamed from sys/modules/runfw/Makefile)0
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 063aa04..7f3d174 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -285,7 +285,6 @@ SUBDIR= \
re \
reiserfs \
rl \
- ${_runfw} \
${_s3} \
${_safe} \
${_sbni} \
@@ -450,7 +449,6 @@ _fxp= fxp
_ispfw= ispfw
_mwlfw= mwlfw
_ralfw= ralfw
-_runfw= runfw
_sf= sf
_sn= sn
_ti= ti
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index 8ec4107..325b00d 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -32,8 +32,9 @@
SUBDIR = usb
SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} \
- ${_atmegadci} ${_avr32dci} rsu rsufw
-SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw} urtwn urtwnfw
+ ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw}
+SUBDIR += ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw}
+SUBDIR += ${_urtwn} ${_urtwnfw}
SUBDIR += atp uhid ukbd ums udbp ufm uep
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
umct umcs umodem umoscom uplcom uslcom uvisor uvscom
@@ -54,6 +55,12 @@ _rum= rum
_uath= uath
_zyd= zyd
_kue= kue
+_urtwn= urtwn
+_urtwnfw= urtwnfw
+_run= run
+_runfw= runfw
+_rsu= rsu
+_rsufw= rsufw
.endif
.if ${MACHINE_CPUARCH} == "amd64"
diff --git a/sys/modules/runfw/Makefile b/sys/modules/usb/runfw/Makefile
index c6e7884..c6e7884 100644
--- a/sys/modules/runfw/Makefile
+++ b/sys/modules/usb/runfw/Makefile
OpenPOWER on IntegriCloud