[illumos-gate merge]

commit d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe
    11528 Makefile.noget can get gone
    11529 Use -Wno-maybe-initialized
commit c4ccc1f9004b70b07e4cdb57641c38ab607306c9
    11226 Remove NetraCT support
commit dcfeff93f67a1188722a358e0fbfcd604993e573
    11561 loader script needs to place .eh_frame after .text
commit a8ffe4975d219124d53dcd9de30126f3a595d28f
    11555 gptzfsboot: boot prompt is not refreshed on device change
commit 79940ff6ac581ff9431c474dcfa18c78f1cb7a50
    11556 ip_attr.c functions need to not dereference conn_ixa directly after lock drop
commit fe949611d4f0a0f42a6923a31cd3073e5b2bc97c
    10540 wsdiff much slower under python3 than python2
commit c1064fd7ce62fe763a4475e9988ffea3b22137de
    11541 allocation_classes feature must be enabled to add log device

	Conflicts:
	usr/src/uts/sparc/Makefile.sparc
	usr/src/uts/intel/dev/Makefile
	usr/src/uts/i86pc/pcie/Makefile
	usr/src/cmd/zoneadmd/Makefile

10 files changed, 7 insertions, 214 deletions

diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index 184dcd52c0..58420dd2fa 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -451,9 +451,6 @@ $(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-880.xml \
     group=sys mode=0444
 $(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire.xml group=sys \
     mode=0444
-$(sparc_ONLY)file \
-    path=etc/svc/profile/platform_SUNW,UltraSPARC-IIi-Netract.xml group=sys \
-    mode=0444
 file path=etc/svc/profile/platform_none.xml group=sys mode=0444
 $(sparc_ONLY)file path=etc/svc/profile/platform_sun4v.xml group=sys mode=0444
 file path=etc/sysevent/config/README group=sys mode=0444
@@ -1197,7 +1194,6 @@ file path=usr/lib/rcm/modules/SUNW_ip_rcm.so mode=0555
 file path=usr/lib/rcm/modules/SUNW_mpxio_rcm.so mode=0555
 file path=usr/lib/rcm/modules/SUNW_network_rcm.so mode=0555
 file path=usr/lib/rcm/modules/SUNW_swap_rcm.so mode=0555
-$(sparc_ONLY)file path=usr/lib/rcm/modules/SUNW_ttymux_rcm.so mode=0555
 file path=usr/lib/rcm/modules/SUNW_vlan_rcm.so mode=0555
 file path=usr/lib/rcm/modules/SUNW_vnic_rcm.so mode=0555
 file path=usr/lib/rcm/rcm_daemon mode=0555
@@ -1398,12 +1394,6 @@ hardlink path=etc/rc2.d/S20sysetup target=../../etc/init.d/sysetup
 hardlink path=etc/rc2.d/S89PRESERVE target=../../etc/init.d/PRESERVE
 $(sparc_ONLY)hardlink path=etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml \
     target=./platform_SUNW,Sun-Fire-880.xml
-$(sparc_ONLY)hardlink \
-    path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml \
-    target=./platform_SUNW,UltraSPARC-IIi-Netract.xml
-$(sparc_ONLY)hardlink \
-    path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-60.xml \
-    target=./platform_SUNW,UltraSPARC-IIi-Netract.xml
 hardlink path=sbin/rc5 target=../sbin/rc0
 hardlink path=sbin/rc6 target=../sbin/rc0
 hardlink path=usr/bin/$(ARCH32)/encrypt target=decrypt
diff --git a/usr/src/pkg/manifests/developer-apptrace-platform.mf b/usr/src/pkg/manifests/developer-apptrace-platform.mf
index 7b5d068301..ac3c5a93bd 100644
--- a/usr/src/pkg/manifests/developer-apptrace-platform.mf
+++ b/usr/src/pkg/manifests/developer-apptrace-platform.mf
@@ -34,8 +34,6 @@ dir path=usr group=sys
 dir path=usr/platform group=sys
 dir path=usr/platform/SUNW,A70 group=sys
 dir path=usr/platform/SUNW,A70/lib
-dir path=usr/platform/SUNW,Netra-CP2300 group=sys
-dir path=usr/platform/SUNW,Netra-CP2300/lib
 dir path=usr/platform/SUNW,Netra-CP3010 group=sys
 dir path=usr/platform/SUNW,Netra-CP3010/lib
 dir path=usr/platform/SUNW,Netra-T12 group=sys
@@ -82,12 +80,6 @@ dir path=usr/platform/SUNW,Ultra-4 group=sys
 dir path=usr/platform/SUNW,Ultra-4/lib
 dir path=usr/platform/SUNW,Ultra-Enterprise group=sys
 dir path=usr/platform/SUNW,Ultra-Enterprise/lib
-dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40 group=sys
-dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib
-dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys
-dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib
-dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract group=sys
-dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib
 legacy pkg=SUNWpstl.u arch=$(ARCH).sun4u \
     desc="Apptrace processor specific shared objects" \
     name="Platform specific apptrace support"
diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf
index 7c15402da5..65e45e1d4a 100644
--- a/usr/src/pkg/manifests/service-picl.mf
+++ b/usr/src/pkg/manifests/service-picl.mf
@@ -23,6 +23,7 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2019 Peter Tribble.
 #
 
 set name=pkg.fmri value=pkg:/service/picl@$(PKGVERS)
@@ -46,11 +47,6 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl/plugins group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins \
-    group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys
@@ -171,27 +167,6 @@ $(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so.1 \
     group=sys
 $(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/piclfrutree.conf \
     group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP2300/lib/libctsmc.so.1 \
-    group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP2300/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.RTM.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/envmond.conf \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclfrutree.so.1 \
-    group=sys
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclwd.so.1 \
-    group=sys
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/piclfrutree.conf \
     group=sys
@@ -713,17 +688,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/libprtdiag_psr.so.1 \
     target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1
 $(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so \
     target=./libpiclenvd.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/libctsmc.so \
-    target=libctsmc.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so \
-    target=libpiclenvmond.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclfrutree.so \
-    target=libpiclfrutree.so.1
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclwd.so \
-    target=libpiclwd.so.1
 $(sparc_ONLY)link \
     path=usr/platform/SUNW,Netra-T12/lib/picl/plugins/libpiclfrutree.so \
     target=libpiclfrutree.so.1
diff --git a/usr/src/pkg/manifests/system-fru-id-platform.mf b/usr/src/pkg/manifests/system-fru-id-platform.mf
index a9d20355f0..cbeff44ab8 100644
--- a/usr/src/pkg/manifests/system-fru-id-platform.mf
+++ b/usr/src/pkg/manifests/system-fru-id-platform.mf
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Peter Tribble.
 #
 
 set name=pkg.fmri value=pkg:/system/fru-id/platform@$(PKGVERS)
@@ -39,9 +40,6 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl/plugins group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/sbin
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys
@@ -139,8 +137,6 @@ dir path=usr/share/man/man1m
 $(i386_ONLY)file path=usr/lib/picl/plugins/fru_container.conf group=sys
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclfrudata.conf group=sys
-$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP2300/lib/libfruaccess.so.1 \
-    group=sys
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/libpiclfrudata.conf \
     group=sys
@@ -209,10 +205,6 @@ $(sparc_ONLY)legacy pkg=SUNWfruip.u arch=$(ARCH).sun4u \
     name="FRU ID Platform Modules (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/libfruaccess.so \
-    target=libfruaccess.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/sbin/fruadm \
-    target=../../sun4u/sbin/fruadm
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/sbin/fruadm \
     target=../../sun4u/sbin/fruadm
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T12/lib/libfruaccess.so \
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf
index 2f78c34031..f13015d5ce 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.mf
@@ -127,8 +127,6 @@ $(sparc_ONLY)dir path=usr/include/v9/sys
 dir path=usr/include/vm
 dir path=usr/platform group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/include
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/include
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys
@@ -154,9 +152,6 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-2 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-250 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-4 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract group=sys
 $(i386_ONLY)dir path=usr/platform/i86pc group=sys
 $(i386_ONLY)dir path=usr/platform/i86pc/include
 $(i386_ONLY)dir path=usr/platform/i86pc/include/sys
@@ -1534,8 +1529,6 @@ file path=usr/include/sys/ttold.h
 file path=usr/include/sys/tty.h
 file path=usr/include/sys/ttychars.h
 file path=usr/include/sys/ttydev.h
-$(sparc_ONLY)file path=usr/include/sys/ttymux.h
-$(sparc_ONLY)file path=usr/include/sys/ttymuxuser.h
 file path=usr/include/sys/tuneable.h
 file path=usr/include/sys/turnstile.h
 file path=usr/include/sys/types.h
@@ -1771,7 +1764,6 @@ $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/prom_plat.h
 $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/pte.h
 $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/sbd_ioctl.h
 $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/scb.h
-$(sparc_ONLY)file path=usr/platform/sun4u/include/sys/scsb_led.h
 $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/simmstat.h
 $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/smt.h
 $(sparc_ONLY)file path=usr/platform/sun4u/include/sys/spitregs.h
@@ -2014,12 +2006,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/include \
     target=../sun4u/include
 $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/include \
     target=../sun4u/include
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/include \
-    target=../sun4u/include
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/include \
-    target=../sun4u/include
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIi-Netract/include \
-    target=../sun4u/include
 link path=usr/share/man/man3head/LIST_CLASS_ENTRY.3head target=queue.h.3head
 link path=usr/share/man/man3head/LIST_CLASS_HEAD.3head target=queue.h.3head
 link path=usr/share/man/man3head/LIST_CONCAT.3head target=queue.h.3head
diff --git a/usr/src/pkg/manifests/system-kernel-platform-netra.mf b/usr/src/pkg/manifests/system-kernel-platform-netra.mf
index bea797da77..5e548e8f0f 100644
--- a/usr/src/pkg/manifests/system-kernel-platform-netra.mf
+++ b/usr/src/pkg/manifests/system-kernel-platform-netra.mf
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Peter Tribble.
 #
 
 #
@@ -30,82 +31,6 @@
 #
 <include global_zone_only_component>
 set name=pkg.fmri value=pkg:/system/kernel/platform/netra@$(PKGVERS)
-set name=pkg.description \
-    value="I2C and System Controller and Status Drivers for Netra ct cPCI platform"
-set name=pkg.summary value="Netra ct I2C and System Drivers"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=pkg.obsolete value=true
+set name=org.opensolaris.noincorp value=true
 set name=variant.arch value=sparc
-dir path=platform group=sys
-dir path=platform/SUNW,Netra-CP2300 group=sys
-dir path=platform/SUNW,Netra-CP2300/kernel group=sys
-dir path=platform/SUNW,Netra-CP2300/kernel/dacf group=sys
-dir path=platform/SUNW,Netra-CP2300/kernel/dacf/$(ARCH64) group=sys
-dir path=platform/SUNW,Netra-CP2300/kernel/drv group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40 group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/dacf group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/dacf/$(ARCH64) \
-    group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/$(ARCH64) \
-    group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/dacf group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/dacf/$(ARCH64) \
-    group=sys
-dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/drv group=sys
-dir path=platform/SUNW,UltraSPARC-IIi-Netract group=sys
-dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel group=sys
-dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/dacf group=sys
-dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64) group=sys
-dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv group=sys
-dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64) group=sys
-driver name=acebus
-driver name=scsb alias=nct-ATML,at27c64
-file path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/acebus.conf \
-    group=sys
-file \
-    path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64)/ttymux_dacf \
-    group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/acebus \
-    group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/pcf8574 \
-    group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/pcf8591 \
-    group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/scsb \
-    group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/scsb.conf group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/se.conf group=sys
-file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/ttymux.conf \
-    group=sys
-legacy pkg=SUNWcti2.u arch=$(ARCH).sun4u \
-    desc="I2C and System Controller and Status Drivers for Netra ct cPCI platform" \
-    name="Netra ct I2C and System Drivers"
-license cr_Sun license=cr_Sun
-license lic_CDDL license=lic_CDDL
-link path=platform/SUNW,Netra-CP2300/kernel/dacf/$(ARCH64)/ttymux_dacf \
-    target=../../../../SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64)/ttymux_dacf
-link path=platform/SUNW,Netra-CP2300/kernel/drv/ttymux.conf \
-    target=../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/ttymux.conf
-link \
-    path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/dacf/$(ARCH64)/ttymux_dacf \
-    target=../../../../SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64)/ttymux_dacf
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/$(ARCH64)/acebus \
-    target=../../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/acebus
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/$(ARCH64)/pcf8574 \
-    target=../../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/pcf8574
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/$(ARCH64)/scsb \
-    target=../../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/scsb
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/scsb.conf \
-    target=../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/scsb.conf
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/se.conf \
-    target=../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/se.conf
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/ttymux.conf \
-    target=../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/ttymux.conf
-link \
-    path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/dacf/$(ARCH64)/ttymux_dacf \
-    target=../../../../SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64)/ttymux_dacf
-link path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/drv/ttymux.conf \
-    target=../../../SUNW,UltraSPARC-IIi-Netract/kernel/drv/ttymux.conf
diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.mf
index 3e02272e42..23d97f1a3e 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.mf
+++ b/usr/src/pkg/manifests/system-kernel-platform.mf
@@ -46,14 +46,6 @@ $(sparc_ONLY)dir path=platform/SUNW,A70/kernel/crypto/$(ARCH64) group=sys
 $(sparc_ONLY)dir path=platform/SUNW,A70/kernel/drv group=sys
 $(sparc_ONLY)dir path=platform/SUNW,A70/kernel/misc group=sys
 $(sparc_ONLY)dir path=platform/SUNW,A70/kernel/misc/$(ARCH64) group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300 group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/misc group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/misc/$(ARCH64) \
-    group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/tod group=sys
-$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/tod/$(ARCH64) \
-    group=sys
 $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010 group=sys
 $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel group=sys
 $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/crypto group=sys
@@ -341,7 +333,6 @@ $(i386_ONLY)driver name=balloon perms="* 0444 root sys"
 $(sparc_ONLY)driver name=bbc_beep alias=SUNW,bbc-beep
 $(sparc_ONLY)driver name=central
 $(i386_ONLY)driver name=cpudrv alias=cpu
-$(sparc_ONLY)driver name=ctsmc alias=nct-ds80ch11-smc
 $(sparc_ONLY)driver name=db21554 \
     alias=pci108e,6300 \
     alias=pci108e,6301 \
@@ -524,12 +515,6 @@ $(sparc_ONLY)file path=platform/SUNW,A70/kernel/drv/ppm.conf group=sys
 $(sparc_ONLY)file path=platform/SUNW,A70/kernel/misc/$(ARCH64)/platmod \
     group=sys mode=0755
 $(sparc_ONLY)file \
-    path=platform/SUNW,Netra-CP2300/kernel/misc/$(ARCH64)/platmod group=sys \
-    mode=0755
-$(sparc_ONLY)file \
-    path=platform/SUNW,Netra-CP2300/kernel/tod/$(ARCH64)/todds1307 group=sys \
-    mode=0755
-$(sparc_ONLY)file \
     path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64)/platmod group=sys \
     mode=0755
 $(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/lw8 \
@@ -851,7 +836,6 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/sha1 group=sys \
 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/adm1026 group=sys
 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/adm1031 group=sys
 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/bbc_beep group=sys
-$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ctsmc group=sys
 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/db21554 group=sys
 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ebus group=sys
 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/epic group=sys
@@ -1002,7 +986,6 @@ $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/vis group=sys \
 $(sparc_ONLY)file path=usr/share/man/man4/sbus.4
 $(i386_ONLY)file path=usr/share/man/man4/sysbus.4
 $(sparc_ONLY)file path=usr/share/man/man7d/bbc_beep.7d
-$(sparc_ONLY)file path=usr/share/man/man7d/ctsmc.7d
 $(sparc_ONLY)file path=usr/share/man/man7d/dr.7d
 $(sparc_ONLY)file path=usr/share/man/man7d/fd.7d
 $(sparc_ONLY)file path=usr/share/man/man7d/gpio_87317.7d
diff --git a/usr/src/pkg/manifests/system-kernel.man7d.inc b/usr/src/pkg/manifests/system-kernel.man7d.inc
index 07da55bde8..d891935067 100644
--- a/usr/src/pkg/manifests/system-kernel.man7d.inc
+++ b/usr/src/pkg/manifests/system-kernel.man7d.inc
@@ -12,6 +12,7 @@
 #
 # Copyright 2011, Richard Lowe
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright 2019 Peter Tribble.
 # Copyright 2019 Joyent, Inc.
 #
 
@@ -45,7 +46,6 @@ file path=usr/share/man/man7d/st.7d
 file path=usr/share/man/man7d/sysmsg.7d
 file path=usr/share/man/man7d/ticlts.7d
 file path=usr/share/man/man7d/tty.7d
-file path=usr/share/man/man7d/ttymux.7d
 file path=usr/share/man/man7d/tzmon.7d
 file path=usr/share/man/man7d/ufm.7d
 file path=usr/share/man/man7d/virtualkm.7d
diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf
index a536d0b23d..859b26269d 100644
--- a/usr/src/pkg/manifests/system-kernel.mf
+++ b/usr/src/pkg/manifests/system-kernel.mf
@@ -26,6 +26,7 @@
 # Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
 # Copyright 2017 James S Blachly, MD <james.blachly@gmail.com>
+# Copyright 2019 Peter Tribble.
 # Copyright 2019 RackTop Systems
 # Copyright 2019 Joyent, Inc.
 #
@@ -279,7 +280,6 @@ driver name=tcp perms="tcp 0666 root sys"
 driver name=tcp6 perms="tcp6 0666 root sys"
 driver name=tl perms="* 0666 root sys" clone_perms="ticlts 0666 root sys" \
     clone_perms="ticots 0666 root sys" clone_perms="ticotsord 0666 root sys"
-$(sparc_ONLY)driver name=ttymux alias=multiplexer
 $(i386_ONLY)driver name=tzmon
 $(sparc_ONLY)driver name=uata \
     alias=pci1095,646 \
@@ -408,7 +408,6 @@ file path=kernel/drv/$(ARCH64)/sysmsg group=sys
 file path=kernel/drv/$(ARCH64)/tcp group=sys
 file path=kernel/drv/$(ARCH64)/tcp6 group=sys
 file path=kernel/drv/$(ARCH64)/tl group=sys
-$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/ttymux group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/tzmon group=sys
 $(sparc_ONLY)file path=kernel/drv/$(ARCH64)/uata group=sys
 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/ucode group=sys
diff --git a/usr/src/pkg/manifests/system-library-platform.mf b/usr/src/pkg/manifests/system-library-platform.mf
index e68878430c..7e18e29ce4 100644
--- a/usr/src/pkg/manifests/system-library-platform.mf
+++ b/usr/src/pkg/manifests/system-library-platform.mf
@@ -34,9 +34,6 @@ dir path=usr group=sys
 dir path=usr/platform group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/sbin
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/sbin
@@ -116,12 +113,6 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-4 group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-4/lib
 $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise group=sys
 $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract group=sys
-$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib
 $(i386_ONLY)dir path=usr/platform/i86pc group=sys
 $(i386_ONLY)dir path=usr/platform/i86pc/lib
 $(sparc_ONLY)dir path=usr/platform/sun4u group=sys
@@ -170,8 +161,6 @@ $(sparc_ONLY)file path=usr/platform/SUNW,Ultra-250/lib/libprtdiag_psr.so.1
 $(sparc_ONLY)file path=usr/platform/SUNW,Ultra-4/lib/libprtdiag_psr.so.1
 $(sparc_ONLY)file \
     path=usr/platform/SUNW,Ultra-Enterprise/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)file \
-    path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib/libprtdiag_psr.so.1
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/ac.so.1
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sbd.so.1
 $(sparc_ONLY)file path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sysctrl.so.1
@@ -212,12 +201,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,A70/sbin target=../sun4u/sbin
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-210 target=SUNW,Sun-Fire-V240
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-240 target=SUNW,Sun-Fire-V240
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-440 target=SUNW,Sun-Fire-V440
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/sbin/prtdiag \
-    target=../../sun4u/sbin/prtdiag
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/cfgadm \
     target=../../sun4u/lib/cfgadm
 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/fs \
@@ -500,27 +483,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/lib/fs \
 $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/sbin \
     target=../sun4u/sbin
 $(sparc_ONLY)link path=usr/platform/SUNW,UltraAX-i2 target=sun4u
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link \
-    path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/libprtdiag_psr.so.1 \
-    target=../../SUNW,UltraSPARC-IIi-Netract/lib/libprtdiag_psr.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/sbin \
-    target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/sbin \
-    target=../sun4u/sbin
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib/cfgadm \
-    target=../../sun4u/lib/cfgadm
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib/fs \
-    target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,UltraSPARC-IIi-Netract/sbin \
-    target=../sun4u/sbin
 $(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/ac.so \
     target=./ac.so.1
 $(sparc_ONLY)link path=usr/platform/sun4u/lib/cfgadm/$(ARCH64)/sbd.so \