From 60bd1e6666ad0da8ddf73bbaaca7709c40c560ab Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 15 Apr 2020 18:09:17 +0300 Subject: 12886 ccid: add sparc build Reviewed by: Robert Mustacchi Approved by: Dan McDonald --- usr/src/lib/cfgadm_plugins/ccid/Makefile | 2 +- usr/src/lib/cfgadm_plugins/ccid/sparc/Makefile | 20 +++++++++++ usr/src/lib/cfgadm_plugins/ccid/sparcv9/Makefile | 21 ++++++++++++ usr/src/pkg/manifests/driver-misc-ccid.mf | 2 +- usr/src/uts/sparc/Makefile.sparc | 25 ++++++++++++-- usr/src/uts/sparc/ccid/Makefile | 42 ++++++++++++++++++++++++ 6 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 usr/src/lib/cfgadm_plugins/ccid/sparc/Makefile create mode 100644 usr/src/lib/cfgadm_plugins/ccid/sparcv9/Makefile create mode 100644 usr/src/uts/sparc/ccid/Makefile (limited to 'usr/src') diff --git a/usr/src/lib/cfgadm_plugins/ccid/Makefile b/usr/src/lib/cfgadm_plugins/ccid/Makefile index 7d4af31c7d..232f1ec3b5 100644 --- a/usr/src/lib/cfgadm_plugins/ccid/Makefile +++ b/usr/src/lib/cfgadm_plugins/ccid/Makefile @@ -27,7 +27,7 @@ include ../../Makefile.lib -$(INTEL_BLD)SUBDIRS = $(MACH) $(BUILD64) $(MACH64) +SUBDIRS = $(MACH) $(BUILD64) $(MACH64) all := TARGET= all clean := TARGET= clean diff --git a/usr/src/lib/cfgadm_plugins/ccid/sparc/Makefile b/usr/src/lib/cfgadm_plugins/ccid/sparc/Makefile new file mode 100644 index 0000000000..66d7a51776 --- /dev/null +++ b/usr/src/lib/cfgadm_plugins/ccid/sparc/Makefile @@ -0,0 +1,20 @@ +# +# 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. +# + +include ../Makefile.com + +.KEEP_STATE: + +install: all $(ROOTLIBS) $(ROOTLINKS) diff --git a/usr/src/lib/cfgadm_plugins/ccid/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/ccid/sparcv9/Makefile new file mode 100644 index 0000000000..f2eb3c97a2 --- /dev/null +++ b/usr/src/lib/cfgadm_plugins/ccid/sparcv9/Makefile @@ -0,0 +1,21 @@ +# +# 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. +# + +include ../Makefile.com +include ../../../Makefile.lib.64 + +.KEEP_STATE: + +install: all $(ROOTLIBS64) $(ROOTLINKS64) diff --git a/usr/src/pkg/manifests/driver-misc-ccid.mf b/usr/src/pkg/manifests/driver-misc-ccid.mf index e0d1ca0155..cdb387df3e 100644 --- a/usr/src/pkg/manifests/driver-misc-ccid.mf +++ b/usr/src/pkg/manifests/driver-misc-ccid.mf @@ -24,7 +24,7 @@ set name=pkg.description \ set name=pkg.summary value="CCID driver" set name=info.classification \ value=org.opensolaris.category.2008:System/Hardware -set name=variant.arch value=i386 +set name=variant.arch value=$(ARCH) dir path=kernel group=sys variant.opensolaris.zone=global dir path=kernel/drv group=sys variant.opensolaris.zone=global dir path=kernel/drv/$(ARCH64) group=sys variant.opensolaris.zone=global diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index c5e3581c46..8d1f64e7fe 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -289,13 +289,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 -- cgit v1.2.3