From 617de1a00a3bde555f52e945e39261c5cfde1533 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 10 Jul 2018 13:00:40 -0400 Subject: [PATCH] bmake-ify mr_sas --- kernel/drivers/scsi/Makefile | 3 +- kernel/drivers/scsi/mr_sas/Makefile | 14 ++++ .../drivers/scsi}/mr_sas/THIRDPARTYLICENSE | 0 .../drivers/scsi}/mr_sas/THIRDPARTYLICENSE.descrip | 0 .../io => kernel/drivers/scsi}/mr_sas/fusion.h | 0 .../io => kernel/drivers/scsi}/mr_sas/ld_pd_map.c | 0 .../io => kernel/drivers/scsi}/mr_sas/ld_pd_map.h | 0 .../io => kernel/drivers/scsi}/mr_sas/mr_sas.c | 0 .../io => kernel/drivers/scsi}/mr_sas/mr_sas.conf | 0 .../io => kernel/drivers/scsi}/mr_sas/mr_sas.h | 0 .../drivers/scsi}/mr_sas/mr_sas_list.c | 0 .../drivers/scsi}/mr_sas/mr_sas_list.h | 0 .../drivers/scsi}/mr_sas/mr_sas_tbolt.c | 0 usr/src/cmd/mdb/intel/amd64/mr_sas/Makefile | 2 +- usr/src/pkg/manifests/developer-debug-mdb.mf | 4 +- usr/src/pkg/manifests/driver-storage-mr_sas.mf | 4 +- usr/src/uts/common/Makefile.files | 5 -- usr/src/uts/common/Makefile.rules | 4 -- usr/src/uts/intel/Makefile.intel | 1 - usr/src/uts/intel/mr_sas/Makefile | 82 ---------------------- 20 files changed, 21 insertions(+), 98 deletions(-) create mode 100644 kernel/drivers/scsi/mr_sas/Makefile rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/THIRDPARTYLICENSE (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/THIRDPARTYLICENSE.descrip (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/fusion.h (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/ld_pd_map.c (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/ld_pd_map.h (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/mr_sas.c (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/mr_sas.conf (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/mr_sas.h (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/mr_sas_list.c (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/mr_sas_list.h (100%) rename {usr/src/uts/common/io => kernel/drivers/scsi}/mr_sas/mr_sas_tbolt.c (100%) delete mode 100644 usr/src/uts/intel/mr_sas/Makefile diff --git a/kernel/drivers/scsi/Makefile b/kernel/drivers/scsi/Makefile index 4ad60453b1..0b002c606e 100644 --- a/kernel/drivers/scsi/Makefile +++ b/kernel/drivers/scsi/Makefile @@ -1,4 +1,5 @@ SUBDIR = targets \ - mega_sas + mega_sas \ + mr_sas .include diff --git a/kernel/drivers/scsi/mr_sas/Makefile b/kernel/drivers/scsi/mr_sas/Makefile new file mode 100644 index 0000000000..06f2b32a4a --- /dev/null +++ b/kernel/drivers/scsi/mr_sas/Makefile @@ -0,0 +1,14 @@ +MODULE= mr_sas +MODULE_TYPE= drv +MODULE_DEPS= misc/scsi +MODULE_CONF= mr_sas.conf +SRCS= ld_pd_map.c \ + mr_sas.c \ + mr_sas_tbolt.c \ + mr_sas_list.c + +CERRWARN += -Wno-unused-label +CERRWARN += -Wno-switch +CERRWARN += -Wno-uninitialized + +.include diff --git a/usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE b/kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE similarity index 100% rename from usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE rename to kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE diff --git a/usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE.descrip b/kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE.descrip similarity index 100% rename from usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE.descrip rename to kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE.descrip diff --git a/usr/src/uts/common/io/mr_sas/fusion.h b/kernel/drivers/scsi/mr_sas/fusion.h similarity index 100% rename from usr/src/uts/common/io/mr_sas/fusion.h rename to kernel/drivers/scsi/mr_sas/fusion.h diff --git a/usr/src/uts/common/io/mr_sas/ld_pd_map.c b/kernel/drivers/scsi/mr_sas/ld_pd_map.c similarity index 100% rename from usr/src/uts/common/io/mr_sas/ld_pd_map.c rename to kernel/drivers/scsi/mr_sas/ld_pd_map.c diff --git a/usr/src/uts/common/io/mr_sas/ld_pd_map.h b/kernel/drivers/scsi/mr_sas/ld_pd_map.h similarity index 100% rename from usr/src/uts/common/io/mr_sas/ld_pd_map.h rename to kernel/drivers/scsi/mr_sas/ld_pd_map.h diff --git a/usr/src/uts/common/io/mr_sas/mr_sas.c b/kernel/drivers/scsi/mr_sas/mr_sas.c similarity index 100% rename from usr/src/uts/common/io/mr_sas/mr_sas.c rename to kernel/drivers/scsi/mr_sas/mr_sas.c diff --git a/usr/src/uts/common/io/mr_sas/mr_sas.conf b/kernel/drivers/scsi/mr_sas/mr_sas.conf similarity index 100% rename from usr/src/uts/common/io/mr_sas/mr_sas.conf rename to kernel/drivers/scsi/mr_sas/mr_sas.conf diff --git a/usr/src/uts/common/io/mr_sas/mr_sas.h b/kernel/drivers/scsi/mr_sas/mr_sas.h similarity index 100% rename from usr/src/uts/common/io/mr_sas/mr_sas.h rename to kernel/drivers/scsi/mr_sas/mr_sas.h diff --git a/usr/src/uts/common/io/mr_sas/mr_sas_list.c b/kernel/drivers/scsi/mr_sas/mr_sas_list.c similarity index 100% rename from usr/src/uts/common/io/mr_sas/mr_sas_list.c rename to kernel/drivers/scsi/mr_sas/mr_sas_list.c diff --git a/usr/src/uts/common/io/mr_sas/mr_sas_list.h b/kernel/drivers/scsi/mr_sas/mr_sas_list.h similarity index 100% rename from usr/src/uts/common/io/mr_sas/mr_sas_list.h rename to kernel/drivers/scsi/mr_sas/mr_sas_list.h diff --git a/usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c b/kernel/drivers/scsi/mr_sas/mr_sas_tbolt.c similarity index 100% rename from usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c rename to kernel/drivers/scsi/mr_sas/mr_sas_tbolt.c diff --git a/usr/src/cmd/mdb/intel/amd64/mr_sas/Makefile b/usr/src/cmd/mdb/intel/amd64/mr_sas/Makefile index e9387c4688..aed9da88ef 100644 --- a/usr/src/cmd/mdb/intel/amd64/mr_sas/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/mr_sas/Makefile @@ -28,7 +28,7 @@ MDBTGT = kvm MODSRCS = mr_sas.c -MRSASBASE = ../../../../../uts/common/io/mr_sas +MRSASBASE = $(SRCTOP)/kernel/drivers/scsi/mr_sas include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf index 8a4606f2a4..1ebe0f7e4e 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb.mf @@ -184,5 +184,5 @@ license cr_Sun license=cr_Sun license kernel/zmod/THIRDPARTYLICENSE license=kernel/zmod/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE -license usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE \ - license=usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE +license kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE \ + license=kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.mf b/usr/src/pkg/manifests/driver-storage-mr_sas.mf index 6168276051..16b3b271e9 100644 --- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mr_sas.mf @@ -58,5 +58,5 @@ file path=kernel/drv/mr_sas group=sys file path=kernel/drv/mr_sas.conf group=sys file path=usr/share/man/man7d/mr_sas.7d license cr_Sun license=cr_Sun -license usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE \ - license=usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE +license kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE \ + license=kernel/drivers/scsi/mr_sas/THIRDPARTYLICENSE diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files index 5675d5dba8..a940abf7e9 100644 --- a/usr/src/uts/common/Makefile.files +++ b/usr/src/uts/common/Makefile.files @@ -1717,11 +1717,6 @@ SDA_OBJS = sda_cmd.o sda_host.o sda_init.o sda_mem.o sda_mod.o sda_slot.o SDHOST_OBJS = sdhost.o # -# MR_SAS module -# -MR_SAS_OBJS = ld_pd_map.o mr_sas.o mr_sas_tbolt.o mr_sas_list.o - -# # CPQARY3 module # CPQARY3_OBJS = cpqary3.o cpqary3_noe.o cpqary3_talk2ctlr.o \ diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules index ac69f73d66..aa02f74594 100644 --- a/usr/src/uts/common/Makefile.rules +++ b/usr/src/uts/common/Makefile.rules @@ -698,10 +698,6 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/common/io/mac/plugins/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -$(OBJS_DIR)/%.o: $(UTSBASE)/common/io/mr_sas/%.c - $(COMPILE.c) -o $@ $< - $(CTFCONVERT_O) - $(OBJS_DIR)/%.o: $(UTSBASE)/common/io/scsi/adapters/mpt_sas/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index c6091f9f27..85a7615ef4 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -256,7 +256,6 @@ DRV_KMODS += mc-amd DRV_KMODS += mm DRV_KMODS += mouse8042 DRV_KMODS += mpt_sas -DRV_KMODS += mr_sas DRV_KMODS += nsmb DRV_KMODS += nulldriver DRV_KMODS += nv_sata diff --git a/usr/src/uts/intel/mr_sas/Makefile b/usr/src/uts/intel/mr_sas/Makefile deleted file mode 100644 index 2033b40d29..0000000000 --- a/usr/src/uts/intel/mr_sas/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# uts/intel/mr_sas/Makefile -# -# This makefile drives the production of the mr_sas driver kernel module. -# -# intel implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = mr_sas -OBJECTS = $(MR_SAS_OBJS:%=$(OBJS_DIR)/%) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/mr_sas - -# -# Include common rules. -# -include $(UTSBASE)/intel/Makefile.intel - -# -# Define targets -# -ALL_TARGET = $(BINARY) $(CONFMOD) -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) - -# -# Kernel Module Dependencies -# -LDFLAGS += -dy -Nmisc/scsi - -CERRWARN += -Wno-unused-label -CERRWARN += -Wno-switch -CERRWARN += -Wno-uninitialized - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/intel/Makefile.targ -- 2.11.4.GIT