summaryrefslogtreecommitdiff
path: root/usr/src/uts/sparc
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2020-07-06 11:47:10 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2020-07-06 11:47:10 +0000
commit5a48332bdd33ee30e11da23e1e8b2c020bde0d61 (patch)
treedb489b42f6c99a8610d178331b002f3b5bb772de /usr/src/uts/sparc
parentd5d018dd406ed42eb59c272bbd8f49fe791f4256 (diff)
parentcf7690ebb38fa81bd6f3904ba5ad4649c0ea3c0b (diff)
downloadillumos-joyent-5a48332bdd33ee30e11da23e1e8b2c020bde0d61.tar.gz
[illumos-gate merge]
commit cf7690ebb38fa81bd6f3904ba5ad4649c0ea3c0b 12897 bhyve mevent can mistakenly handle events twice commit 60bd1e6666ad0da8ddf73bbaaca7709c40c560ab 12886 ccid: add sparc build commit 875000d3c627d9be03a7f83a026d1ea45d9680d6 12884 stabs: gcc false positive clobbered warning commit f896265fea0bec895c572a888206977854310034 12883 stabs: variable 'orig' set but not used commit 56f23fa092900d6145428feaadd69e5157186680 12898 ctf enum size detection should use DW_AT_byte_size commit 6ecc470585ed07369dd51b0ed85f5cf848e5b5c2 12867 Mis-programmed pcie bridge leaves 64-bit device unusable 12873 pci_autoconf: Makefile and compiler warning cleanup
Diffstat (limited to 'usr/src/uts/sparc')
-rw-r--r--usr/src/uts/sparc/Makefile.sparc25
-rw-r--r--usr/src/uts/sparc/ccid/Makefile42
2 files changed, 64 insertions, 3 deletions
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc
index e592b8a8ff..5033722aba 100644
--- a/usr/src/uts/sparc/Makefile.sparc
+++ b/usr/src/uts/sparc/Makefile.sparc
@@ -290,13 +290,32 @@ DRV_KMODS += bge dmfe eri fas hme qfe
DRV_KMODS += openeepr options sd ses st
DRV_KMODS += ssd
DRV_KMODS += ecpp
-DRV_KMODS += hid hubd ehci ohci uhci usb_mid usb_ia scsa2usb usbprn ugen
-DRV_KMODS += usbser usbsacm usbsksp usbsprl
-DRV_KMODS += usb_as usb_ac
+
+#
+# USB specific modules
+#
+DRV_KMODS += ccid
+DRV_KMODS += hid
+DRV_KMODS += hubd
+DRV_KMODS += ehci
+DRV_KMODS += ohci
+DRV_KMODS += uhci
+DRV_KMODS += usb_mid
+DRV_KMODS += usb_ia
+DRV_KMODS += scsa2usb
+DRV_KMODS += usbprn
+DRV_KMODS += ugen
+DRV_KMODS += usbser
+DRV_KMODS += usbsacm
+DRV_KMODS += usbsksp
+DRV_KMODS += usbsprl
+DRV_KMODS += usb_as
+DRV_KMODS += usb_ac
DRV_KMODS += usbskel
DRV_KMODS += usbvc
DRV_KMODS += usbftdi
DRV_KMODS += usbecm
+
DRV_KMODS += hci1394 av1394 scsa1394 dcam1394
DRV_KMODS += sbp2
DRV_KMODS += ib ibp eibnx eoib rdsib sdp iser daplt hermon tavor sol_ucma sol_uverbs
diff --git a/usr/src/uts/sparc/ccid/Makefile b/usr/src/uts/sparc/ccid/Makefile
new file mode 100644
index 0000000000..b3684e93af
--- /dev/null
+++ b/usr/src/uts/sparc/ccid/Makefile
@@ -0,0 +1,42 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2019, Joyent, Inc.
+#
+
+UTSBASE = ../..
+
+MODULE = ccid
+OBJECTS = $(CCID_OBJS:%=$(OBJS_DIR)/%)
+ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
+
+include $(UTSBASE)/sparc/Makefile.sparc
+
+ALL_TARGET = $(BINARY)
+INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
+CPPFLAGS += -I$(SRC)/common/ccid
+
+LDFLAGS += -dy -N misc/usba
+
+.KEEP_STATE:
+
+def: $(DEF_DEPS)
+
+all: $(ALL_DEPS)
+
+clean: $(CLEAN_DEPS)
+
+clobber: $(CLOBBER_DEPS)
+
+install: $(INSTALL_DEPS)
+
+include $(UTSBASE)/sparc/Makefile.targ