Mercurial > illumos > illumos-gate
changeset 10891:805b7ab7ad22
PSARC 2009/578 Remove SDcard support on SPARC
6894965 don't deliver sdcard drivers on SPARC
| author | Garrett D'Amore <Garrett.Damore@Sun.COM> |
|---|---|
| date | Tue, 27 Oct 2009 15:23:19 -0700 |
| parents | 499786962772 |
| children | 980c145933a7 |
| files | usr/src/pkgdefs/Makefile usr/src/pkgdefs/SUNWsdcard/prototype_sparc usr/src/uts/sparc/Makefile.sparc.shared usr/src/uts/sparc/sda/Makefile usr/src/uts/sparc/sdcard/Makefile usr/src/uts/sparc/sdhost/Makefile usr/src/uts/sparc/warlock/Makefile |
| diffstat | 7 files changed, 1 insertions(+), 402 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkgdefs/Makefile Tue Oct 27 15:14:40 2009 -0600 +++ b/usr/src/pkgdefs/Makefile Tue Oct 27 15:23:19 2009 -0700 @@ -159,6 +159,7 @@ SUNWrum \ SUNWrwd \ SUNWrwn \ + SUNWsdcard \ SUNWsi3124 \ SUNWuath \ SUNWural \ @@ -451,7 +452,6 @@ SUNWscplp \ SUNWscsa1394 \ SUNWscsip \ - SUNWsdcard \ SUNWses \ SUNWsfe \ SUNWslpr \
--- a/usr/src/pkgdefs/SUNWsdcard/prototype_sparc Tue Oct 27 15:14:40 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# - -# SDcard drivers -d none kernel/drv/sparcv9 0755 root sys -f none kernel/drv/sparcv9/sdcard 0755 root sys -f none kernel/drv/sparcv9/sdhost 0755 root sys -d none kernel/misc/sparcv9 0755 root sys -f none kernel/misc/sparcv9/sda 0755 root sys
--- a/usr/src/uts/sparc/Makefile.sparc.shared Tue Oct 27 15:14:40 2009 -0600 +++ b/usr/src/uts/sparc/Makefile.sparc.shared Tue Oct 27 15:23:19 2009 -0700 @@ -302,8 +302,6 @@ DRV_KMODS += fcsm DRV_KMODS += fp DRV_KMODS += qlc -DRV_KMODS += sdcard -DRV_KMODS += sdhost DRV_KMODS += dda DRV_KMODS += dmd DRV_KMODS += stmf @@ -431,7 +429,6 @@ MISC_KMODS += qlc_fw_6322 MISC_KMODS += qlc_fw_8100 MISC_KMODS += blk2scsa -MISC_KMODS += sda MISC_KMODS += spuni MISC_KMODS += hwa1480_fw uwba MISC_KMODS += mii
--- a/usr/src/uts/sparc/sda/Makefile Tue Oct 27 15:14:40 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +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 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# uts/sparc/sda/Makefile -# -# This makefile drives the production of the sda "misc" -# kernel module. -# -# sparc architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = sda -OBJECTS = $(SDA_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SDA_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(SDA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# dependency on blk2scsa module, scope limiting mapfile -# Note that we have to allow CTFMERGE to use fuzzy matching -# -MAPFILE = $(UTSBASE)/common/io/sdcard/impl/mapfile -LDFLAGS += -dy -Nmisc/blk2scsa -B reduce -M $(MAPFILE) -CTFMRGFLAGS += -f - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ - -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sdcard/impl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
--- a/usr/src/uts/sparc/sdcard/Makefile Tue Oct 27 15:14:40 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +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 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# uts/sparc/sdcard/Makefile -# -# This makefile drives the production of the sdcard driver. -# -# sparc architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = sdcard -OBJECTS = $(SDCARD_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SDCARD_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# dependency on sda module -# -LDFLAGS += -dy -N misc/sda - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ
--- a/usr/src/uts/sparc/sdhost/Makefile Tue Oct 27 15:14:40 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +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 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# uts/sparc/sdhost/Makefile -# -# This makefile drives the production of the sdhost driver -# kernel module. -# -# sparc architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = sdhost -OBJECTS = $(SDHOST_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SDHOST_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(SDHOST_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# dependency on scsi module -# -LDFLAGS += -dy -Nmisc/sda - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ - -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -SDA_LLS = $(SDA_OBJS:%.o= -l ../sda/%.ll) -BLK2SCSA_LLS = $(BLK2SCSA_OBJS:%.o= -l ../blk2scsa/%.ll) - -warlock: $(WARLOCK_OK) - -blk2scsa.wl: - @cd ../blk2scsa; pwd; $(MAKE) warlock - -sda.wl: - @cd ../sda; pwd; $(MAKE) warlock - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sdhost.wlcmd blk2scsa.wl sda.wl - $(WARLOCK) -c $(WLCMD_DIR)/sdhost.wlcmd $(WARLOCK_OUT) \ - $(SDA_LLS) $(BLK2SCSA_LLS) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sdcard/adapters/sdhost/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $<
--- a/usr/src/uts/sparc/warlock/Makefile Tue Oct 27 15:14:40 2009 -0600 +++ b/usr/src/uts/sparc/warlock/Makefile Tue Oct 27 15:23:19 2009 -0700 @@ -127,9 +127,5 @@ $(CLOSED_BUILD) @cd $(CLOSED)/uts/sparc/marvell88sx; \ $(MAKE) clean; $(MAKE) warlock -warlock.sdcard: - @cd ../sda; $(MAKE) clean; $(MAKE) warlock - @cd ../sdhost; $(MAKE) clean; $(MAKE) warlock - warlock.wc: @cd ../wc; $(MAKE) clean; $(MAKE) warlock