[illumos-gate merge]

commit 22028508fd28d36ff74dc02c5774a8ba1f0db045
    14480 loader: restructure loader source tree
commit 94afd1448ba04525848cf1165d8deec88a124035
    14479 SMB testoplock broken after 13515 (fix check_rtime)
commit 4d723c3fe851d72cc2dc241f5a1777f9e3e85b87
    14479 SMB testoplock broken after 13515
commit 0a34963c38fe21eee84ebab010996317731a5171
    14475 Recursive death in libfakekernel assfail after 12396
commit 6ce41887bdf3c5c43465fd94dffe1b4acd302afe
    14499 i86xpv/unix: variable 'val' is uninitialized
commit dfc4fe31363cc213fe0423dc162bc08298c796cd
    14473 ps: only build 64-bit ps

Conflicts:
    manifest
    usr/src/boot/efi/loader/Makefile.com
    usr/src/boot/forth/Makefile
    usr/src/boot/i386/loader/Makefile

436 files changed, 303 insertions, 936 deletions

diff --git a/manifest b/manifest
index 7a3936f20d..f9d50120ab 100644
--- a/manifest
+++ b/manifest
@@ -2511,7 +2511,6 @@ f usr/bin/amd64/prctl 0555 root bin
 f usr/bin/amd64/preap 0555 root bin
 f usr/bin/amd64/prstat 0555 root bin
 f usr/bin/amd64/prun 0555 root bin
-f usr/bin/amd64/ps 0555 root bin
 f usr/bin/amd64/psecflags 0555 root bin
 f usr/bin/amd64/psig 0555 root bin
 f usr/bin/amd64/pstack 0555 root bin
@@ -2824,7 +2823,7 @@ f usr/bin/profiles 0555 root bin
 f usr/bin/projects 0555 root bin
 h usr/bin/prstat=usr/lib/isaexec
 h usr/bin/prun=usr/lib/isaexec
-h usr/bin/ps=usr/lib/isaexec
+f usr/bin/ps 0555 root bin
 h usr/bin/psecflags=usr/lib/isaexec
 h usr/bin/psig=usr/lib/isaexec
 h usr/bin/pstack=usr/lib/isaexec
@@ -21439,13 +21438,12 @@ s usr/src=share/src
 s usr/tmp=../var/tmp
 d usr/ucb 0755 root bin
 d usr/ucb/amd64 0755 root bin
-f usr/ucb/amd64/ps 0555 root bin
 f usr/ucb/df 0755 root bin
 d usr/ucb/i86 0755 root bin
 f usr/ucb/ls 0755 root bin
 s usr/ucb/more=../bin/more
 s usr/ucb/page=../bin/more
-h usr/ucb/ps=usr/lib/isaexec
+h usr/ucb/ps=usr/bin/ps
 f usr/ucb/shutdown 0755 root bin
 f usr/ucb/touch 0755 root bin
 s usr/ucb/uptime=../bin/uptime
diff --git a/usr/src/boot/Makefile b/usr/src/boot/Makefile
index 11d0eea7c2..2152c3a524 100644
--- a/usr/src/boot/Makefile
+++ b/usr/src/boot/Makefile
@@ -15,16 +15,29 @@
 
 .KEEP_STATE:
 
-include ../Makefile.master
+include $(SRC)/Makefile.master
 
-SUBDIRS = sys/boot
+INSTDIRS = i386 efi forth
+SUBDIRS = libsa libficl $(INSTDIRS)
 
 all	:=	TARGET = all
-install	:=	TARGET = install
 clean	:=	TARGET = clean
 clobber	:=	TARGET = clobber
+install	:=	TARGET = install
+
+all clean clobber: $(SUBDIRS)
+
+#
+# The directories in INSTDIRS depend implicitly on SUBDIRS being built already.
+# We use .WAIT instead of explicit dependencies because we only want to make
+# the "install" target in INSTDIRS, not in SUBDIRS.
+#
+# If adding SUBDIRS which are not dependencies of INSTDIRS, "install: all"
+# rules should be added to the Makefiles in those directories.
+#
+install: all .WAIT $(INSTDIRS)
 
-all install clean clobber: $(SUBDIRS)
+.PARALLEL: libsa libficl
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/boot/sys/boot/Makefile.inc b/usr/src/boot/Makefile.inc
index c6b5320866..495bfab86b 100644
--- a/usr/src/boot/sys/boot/Makefile.inc
+++ b/usr/src/boot/Makefile.inc
@@ -36,9 +36,8 @@ FONT_DIR=	$(SRC)/data/consfonts
 
 PNGLITE=	$(SRC)/common/pnglite
 
-BOOTSRC=	$(SRC)/boot/sys/boot
-LIBSRC=		$(SRC)/boot/lib
-SASRC=		$(LIBSRC)/libstand
+BOOTSRC=	$(SRC)/boot
+SASRC=		$(BOOTSRC)/libsa
 CRYPTOSRC=	$(SASRC)/crypto
 ZFSSRC=		$(SASRC)/zfs
 ZLIB=		$(SRC)/contrib/zlib
diff --git a/usr/src/boot/sys/boot/Makefile.lib b/usr/src/boot/Makefile.lib
index baa97a1513..baa97a1513 100644
--- a/usr/src/boot/sys/boot/Makefile.lib
+++ b/usr/src/boot/Makefile.lib
diff --git a/usr/src/boot/sys/boot/README b/usr/src/boot/README.loader
index 22faea26b8..22faea26b8 100644
--- a/usr/src/boot/sys/boot/README
+++ b/usr/src/boot/README.loader
diff --git a/usr/src/boot/Readme.txt b/usr/src/boot/Readme.txt
index 6fe0768889..8bbbb3e34a 100644
--- a/usr/src/boot/Readme.txt
+++ b/usr/src/boot/Readme.txt
@@ -10,11 +10,8 @@
 #
 
 #
-# Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2022 Toomas Soome <tsoome@me.com>
 #
-# Please update the svn revision number on source refresh.
-
-Current snapshot from freebsd revision 296191.
 
 This is source tree snapshot of loader and related parts from
 freebsd source.
@@ -26,10 +23,9 @@ containing Makefile and licence notes for build and packaging.
 
 Directories from freebsd userland (freebsd /usr/src tree):
 include
-lib
 
-Directories from freebsd kernel tree, including boot loader itself
-are located in sys subdirectory (freebsd /usr/src/sys tree):
+Directories from freebsd kernel tree are located in sys subdirectory
+(freebsd /usr/src/sys tree):
 
 platform specific include files:
 
@@ -42,10 +38,7 @@ sys/sys
 sys/ufs
 
 zfs boot module import in freebsd:
-sys/cddl 
-
-boot loader sources are in:
-sys/boot
+sys/cddl
 
 Note, some of the directories are not 1:1 mapping in this source import,
 because of differences of build systems used in illumos and freebsd.
@@ -53,4 +46,4 @@ Also some differences are due to fact, we do not need all the variants of
 stage1/stage2 boot blocks which are built in freebsd due to the historical
 or technical reasons.
 
-Mar, 2016
+Feb, 2022
diff --git a/usr/src/boot/sys/boot/common/Makefile.inc b/usr/src/boot/common/Makefile.inc
index bbf81332d2..bbf81332d2 100644
--- a/usr/src/boot/sys/boot/common/Makefile.inc
+++ b/usr/src/boot/common/Makefile.inc
diff --git a/usr/src/boot/sys/boot/common/bcache.c b/usr/src/boot/common/bcache.c
index 5838f02fef..5838f02fef 100644
--- a/usr/src/boot/sys/boot/common/bcache.c
+++ b/usr/src/boot/common/bcache.c
diff --git a/usr/src/boot/sys/boot/common/boot.c b/usr/src/boot/common/boot.c
index db5aae9b92..db5aae9b92 100644
--- a/usr/src/boot/sys/boot/common/boot.c
+++ b/usr/src/boot/common/boot.c
diff --git a/usr/src/boot/sys/boot/common/bootstrap.h b/usr/src/boot/common/bootstrap.h
index 689905ae68..689905ae68 100644
--- a/usr/src/boot/sys/boot/common/bootstrap.h
+++ b/usr/src/boot/common/bootstrap.h
diff --git a/usr/src/boot/sys/boot/common/commands.c b/usr/src/boot/common/commands.c
index 04a2bf591f..04a2bf591f 100644
--- a/usr/src/boot/sys/boot/common/commands.c
+++ b/usr/src/boot/common/commands.c
diff --git a/usr/src/boot/sys/boot/common/console.c b/usr/src/boot/common/console.c
index a847e19fb9..a847e19fb9 100644
--- a/usr/src/boot/sys/boot/common/console.c
+++ b/usr/src/boot/common/console.c
diff --git a/usr/src/boot/sys/boot/common/dev_net.c b/usr/src/boot/common/dev_net.c
index a71127c641..a71127c641 100644
--- a/usr/src/boot/sys/boot/common/dev_net.c
+++ b/usr/src/boot/common/dev_net.c
diff --git a/usr/src/boot/sys/boot/common/dev_net.h b/usr/src/boot/common/dev_net.h
index 995b67241d..995b67241d 100644
--- a/usr/src/boot/sys/boot/common/dev_net.h
+++ b/usr/src/boot/common/dev_net.h
diff --git a/usr/src/boot/sys/boot/common/devopen.c b/usr/src/boot/common/devopen.c
index c4aa21c5c6..c4aa21c5c6 100644
--- a/usr/src/boot/sys/boot/common/devopen.c
+++ b/usr/src/boot/common/devopen.c
diff --git a/usr/src/boot/sys/boot/common/disk.c b/usr/src/boot/common/disk.c
index 08912cc4e1..08912cc4e1 100644
--- a/usr/src/boot/sys/boot/common/disk.c
+++ b/usr/src/boot/common/disk.c
diff --git a/usr/src/boot/sys/boot/common/disk.h b/usr/src/boot/common/disk.h
index 81d002314f..81d002314f 100644
--- a/usr/src/boot/sys/boot/common/disk.h
+++ b/usr/src/boot/common/disk.h
diff --git a/usr/src/boot/sys/boot/common/gfx_fb.c b/usr/src/boot/common/gfx_fb.c
index 73dc1579d7..6cb328acbb 100644
--- a/usr/src/boot/sys/boot/common/gfx_fb.c
+++ b/usr/src/boot/common/gfx_fb.c
@@ -141,13 +141,7 @@ static bool insert_font(char *, FONT_FLAGS);
 static uint8_t *
 gfx_get_fb_address(void)
 {
-#if defined(EFI)
-	return ((uint8_t *)(uintptr_t)
-	    gfx_fb.framebuffer_common.framebuffer_addr);
-#else
-	return ((uint8_t *)PTOV((uint32_t)
-	    gfx_fb.framebuffer_common.framebuffer_addr & 0xffffffff));
-#endif
+	return ((uint8_t *)ptov(gfx_fb.framebuffer_common.framebuffer_addr));
 }
 
 /*
diff --git a/usr/src/boot/sys/boot/common/gfx_fb.h b/usr/src/boot/common/gfx_fb.h
index 8d20dcf162..8d20dcf162 100644
--- a/usr/src/boot/sys/boot/common/gfx_fb.h
+++ b/usr/src/boot/common/gfx_fb.h
diff --git a/usr/src/boot/sys/boot/common/gpt.c b/usr/src/boot/common/gpt.c
index e63a5419f1..e63a5419f1 100644
--- a/usr/src/boot/sys/boot/common/gpt.c
+++ b/usr/src/boot/common/gpt.c
diff --git a/usr/src/boot/sys/boot/common/gpt.h b/usr/src/boot/common/gpt.h
index afbc3a7abc..afbc3a7abc 100644
--- a/usr/src/boot/sys/boot/common/gpt.h
+++ b/usr/src/boot/common/gpt.h
diff --git a/usr/src/boot/sys/boot/common/help.common b/usr/src/boot/common/help.common
index dca3b09ab9..dca3b09ab9 100644
--- a/usr/src/boot/sys/boot/common/help.common
+++ b/usr/src/boot/common/help.common
diff --git a/usr/src/boot/sys/boot/common/install.c b/usr/src/boot/common/install.c
index 36e7c6484d..36e7c6484d 100644
--- a/usr/src/boot/sys/boot/common/install.c
+++ b/usr/src/boot/common/install.c
diff --git a/usr/src/boot/sys/boot/common/interp.c b/usr/src/boot/common/interp.c
index f69d0460e5..f69d0460e5 100644
--- a/usr/src/boot/sys/boot/common/interp.c
+++ b/usr/src/boot/common/interp.c
diff --git a/usr/src/boot/sys/boot/common/interp_backslash.c b/usr/src/boot/common/interp_backslash.c
index c8d59fa070..c8d59fa070 100644
--- a/usr/src/boot/sys/boot/common/interp_backslash.c
+++ b/usr/src/boot/common/interp_backslash.c
diff --git a/usr/src/boot/sys/boot/common/interp_forth.c b/usr/src/boot/common/interp_forth.c
index 1f3a92bcb4..1f3a92bcb4 100644
--- a/usr/src/boot/sys/boot/common/interp_forth.c
+++ b/usr/src/boot/common/interp_forth.c
diff --git a/usr/src/boot/sys/boot/common/interp_parse.c b/usr/src/boot/common/interp_parse.c
index 11cf11c057..11cf11c057 100644
--- a/usr/src/boot/sys/boot/common/interp_parse.c
+++ b/usr/src/boot/common/interp_parse.c
diff --git a/usr/src/boot/sys/boot/common/isapnp.c b/usr/src/boot/common/isapnp.c
index 438687bc45..438687bc45 100644
--- a/usr/src/boot/sys/boot/common/isapnp.c
+++ b/usr/src/boot/common/isapnp.c
diff --git a/usr/src/boot/sys/boot/common/isapnp.h b/usr/src/boot/common/isapnp.h
index 595cbf0fee..595cbf0fee 100644
--- a/usr/src/boot/sys/boot/common/isapnp.h
+++ b/usr/src/boot/common/isapnp.h
diff --git a/usr/src/boot/sys/boot/common/linenoise/LICENSE b/usr/src/boot/common/linenoise/LICENSE
index 18e814865a..18e814865a 100755
--- a/usr/src/boot/sys/boot/common/linenoise/LICENSE
+++ b/usr/src/boot/common/linenoise/LICENSE
diff --git a/usr/src/boot/sys/boot/common/linenoise/LICENSE.descrip b/usr/src/boot/common/linenoise/LICENSE.descrip
index 2191e517d7..2191e517d7 100644
--- a/usr/src/boot/sys/boot/common/linenoise/LICENSE.descrip
+++ b/usr/src/boot/common/linenoise/LICENSE.descrip
diff --git a/usr/src/boot/sys/boot/common/linenoise/Makefile b/usr/src/boot/common/linenoise/Makefile
index a285410678..a285410678 100755
--- a/usr/src/boot/sys/boot/common/linenoise/Makefile
+++ b/usr/src/boot/common/linenoise/Makefile
diff --git a/usr/src/boot/sys/boot/common/linenoise/README.markdown b/usr/src/boot/common/linenoise/README.markdown
index c845673cd4..c845673cd4 100755
--- a/usr/src/boot/sys/boot/common/linenoise/README.markdown
+++ b/usr/src/boot/common/linenoise/README.markdown
diff --git a/usr/src/boot/sys/boot/common/linenoise/example.c b/usr/src/boot/common/linenoise/example.c
index a2f0936ede..a2f0936ede 100755
--- a/usr/src/boot/sys/boot/common/linenoise/example.c
+++ b/usr/src/boot/common/linenoise/example.c
diff --git a/usr/src/boot/sys/boot/common/linenoise/linenoise.c b/usr/src/boot/common/linenoise/linenoise.c
index e3a72151a4..e3a72151a4 100755
--- a/usr/src/boot/sys/boot/common/linenoise/linenoise.c
+++ b/usr/src/boot/common/linenoise/linenoise.c
diff --git a/usr/src/boot/sys/boot/common/linenoise/linenoise.h b/usr/src/boot/common/linenoise/linenoise.h
index fbb01cfaad..fbb01cfaad 100755
--- a/usr/src/boot/sys/boot/common/linenoise/linenoise.h
+++ b/usr/src/boot/common/linenoise/linenoise.h
diff --git a/usr/src/boot/sys/boot/common/load_elf.c b/usr/src/boot/common/load_elf.c
index b7fc4bea09..b7fc4bea09 100644
--- a/usr/src/boot/sys/boot/common/load_elf.c
+++ b/usr/src/boot/common/load_elf.c
diff --git a/usr/src/boot/sys/boot/common/load_elf32.c b/usr/src/boot/common/load_elf32.c
index 0c9f460d48..0c9f460d48 100644
--- a/usr/src/boot/sys/boot/common/load_elf32.c
+++ b/usr/src/boot/common/load_elf32.c
diff --git a/usr/src/boot/sys/boot/common/load_elf32_obj.c b/usr/src/boot/common/load_elf32_obj.c
index 94b0896188..94b0896188 100644
--- a/usr/src/boot/sys/boot/common/load_elf32_obj.c
+++ b/usr/src/boot/common/load_elf32_obj.c
diff --git a/usr/src/boot/sys/boot/common/load_elf64.c b/usr/src/boot/common/load_elf64.c
index c29e8e3596..c29e8e3596 100644
--- a/usr/src/boot/sys/boot/common/load_elf64.c
+++ b/usr/src/boot/common/load_elf64.c
diff --git a/usr/src/boot/sys/boot/common/load_elf64_obj.c b/usr/src/boot/common/load_elf64_obj.c
index 3c9371ba01..3c9371ba01 100644
--- a/usr/src/boot/sys/boot/common/load_elf64_obj.c
+++ b/usr/src/boot/common/load_elf64_obj.c
diff --git a/usr/src/boot/sys/boot/common/load_elf_obj.c b/usr/src/boot/common/load_elf_obj.c
index f32388e170..f32388e170 100644
--- a/usr/src/boot/sys/boot/common/load_elf_obj.c
+++ b/usr/src/boot/common/load_elf_obj.c
diff --git a/usr/src/boot/sys/boot/common/ls.c b/usr/src/boot/common/ls.c
index 1ca760c7ab..1ca760c7ab 100644
--- a/usr/src/boot/sys/boot/common/ls.c
+++ b/usr/src/boot/common/ls.c
diff --git a/usr/src/boot/sys/boot/common/mb_header.S b/usr/src/boot/common/mb_header.S
index 411d126025..411d126025 100644
--- a/usr/src/boot/sys/boot/common/mb_header.S
+++ b/usr/src/boot/common/mb_header.S
diff --git a/usr/src/boot/sys/boot/common/md.c b/usr/src/boot/common/md.c
index 175833d748..175833d748 100644
--- a/usr/src/boot/sys/boot/common/md.c
+++ b/usr/src/boot/common/md.c
diff --git a/usr/src/boot/sys/boot/common/merge_help.awk b/usr/src/boot/common/merge_help.awk
index 1070f73f1f..1070f73f1f 100644
--- a/usr/src/boot/sys/boot/common/merge_help.awk
+++ b/usr/src/boot/common/merge_help.awk
diff --git a/usr/src/boot/sys/boot/common/misc.c b/usr/src/boot/common/misc.c
index ef21ad4db2..ef21ad4db2 100644
--- a/usr/src/boot/sys/boot/common/misc.c
+++ b/usr/src/boot/common/misc.c
diff --git a/usr/src/boot/sys/boot/common/module.c b/usr/src/boot/common/module.c
index 481c07eb58..481c07eb58 100644
--- a/usr/src/boot/sys/boot/common/module.c
+++ b/usr/src/boot/common/module.c
diff --git a/usr/src/boot/sys/boot/common/multiboot2.c b/usr/src/boot/common/multiboot2.c
index 55af7d0456..55af7d0456 100644
--- a/usr/src/boot/sys/boot/common/multiboot2.c
+++ b/usr/src/boot/common/multiboot2.c
diff --git a/usr/src/boot/sys/boot/common/newvers.sh b/usr/src/boot/common/newvers.sh
index 0cb1b16b76..0cb1b16b76 100755
--- a/usr/src/boot/sys/boot/common/newvers.sh
+++ b/usr/src/boot/common/newvers.sh
diff --git a/usr/src/boot/sys/boot/common/nvstore.c b/usr/src/boot/common/nvstore.c
index b3e6cdbeaa..b3e6cdbeaa 100644
--- a/usr/src/boot/sys/boot/common/nvstore.c
+++ b/usr/src/boot/common/nvstore.c
diff --git a/usr/src/boot/sys/boot/common/part.c b/usr/src/boot/common/part.c
index 084eb38f80..084eb38f80 100644
--- a/usr/src/boot/sys/boot/common/part.c
+++ b/usr/src/boot/common/part.c
diff --git a/usr/src/boot/sys/boot/common/part.h b/usr/src/boot/common/part.h
index bdeddcbd5c..bdeddcbd5c 100644
--- a/usr/src/boot/sys/boot/common/part.h
+++ b/usr/src/boot/common/part.h
diff --git a/usr/src/boot/sys/boot/common/paths.h b/usr/src/boot/common/paths.h
index 3934ef4909..3934ef4909 100644
--- a/usr/src/boot/sys/boot/common/paths.h
+++ b/usr/src/boot/common/paths.h
diff --git a/usr/src/boot/sys/boot/common/pnp.c b/usr/src/boot/common/pnp.c
index 14b0b965f0..14b0b965f0 100644
--- a/usr/src/boot/sys/boot/common/pnp.c
+++ b/usr/src/boot/common/pnp.c
diff --git a/usr/src/boot/sys/boot/common/rbx.h b/usr/src/boot/common/rbx.h
index 5fdb9075b2..5fdb9075b2 100644
--- a/usr/src/boot/sys/boot/common/rbx.h
+++ b/usr/src/boot/common/rbx.h
diff --git a/usr/src/boot/sys/boot/common/reloc_elf.c b/usr/src/boot/common/reloc_elf.c
index 188d259069..188d259069 100644
--- a/usr/src/boot/sys/boot/common/reloc_elf.c
+++ b/usr/src/boot/common/reloc_elf.c
diff --git a/usr/src/boot/sys/boot/common/reloc_elf32.c b/usr/src/boot/common/reloc_elf32.c
index 03d9d73bab..03d9d73bab 100644
--- a/usr/src/boot/sys/boot/common/reloc_elf32.c
+++ b/usr/src/boot/common/reloc_elf32.c
diff --git a/usr/src/boot/sys/boot/common/reloc_elf64.c b/usr/src/boot/common/reloc_elf64.c
index c8dcf2a36b..c8dcf2a36b 100644
--- a/usr/src/boot/sys/boot/common/reloc_elf64.c
+++ b/usr/src/boot/common/reloc_elf64.c
diff --git a/usr/src/boot/sys/boot/common/self_reloc.c b/usr/src/boot/common/self_reloc.c
index f82006078f..f82006078f 100644
--- a/usr/src/boot/sys/boot/common/self_reloc.c
+++ b/usr/src/boot/common/self_reloc.c
diff --git a/usr/src/boot/sys/boot/common/tem.c b/usr/src/boot/common/tem.c
index 2798f2883d..2798f2883d 100644
--- a/usr/src/boot/sys/boot/common/tem.c
+++ b/usr/src/boot/common/tem.c
diff --git a/usr/src/boot/sys/boot/common/util.c b/usr/src/boot/common/util.c
index d73d992105..d73d992105 100644
--- a/usr/src/boot/sys/boot/common/util.c
+++ b/usr/src/boot/common/util.c
diff --git a/usr/src/boot/sys/boot/common/util.h b/usr/src/boot/common/util.h
index 88a99f19f0..88a99f19f0 100644
--- a/usr/src/boot/sys/boot/common/util.h
+++ b/usr/src/boot/common/util.h
diff --git a/usr/src/boot/sys/boot/common/vdisk.c b/usr/src/boot/common/vdisk.c
index bb5b2eb6d1..bb5b2eb6d1 100644
--- a/usr/src/boot/sys/boot/common/vdisk.c
+++ b/usr/src/boot/common/vdisk.c
diff --git a/usr/src/boot/sys/boot/common/zfs_cmd.c b/usr/src/boot/common/zfs_cmd.c
index fd8edd10c3..fd8edd10c3 100644
--- a/usr/src/boot/sys/boot/common/zfs_cmd.c
+++ b/usr/src/boot/common/zfs_cmd.c
diff --git a/usr/src/boot/sys/boot/efi/Makefile b/usr/src/boot/efi/Makefile
index 76032c7603..76032c7603 100644
--- a/usr/src/boot/sys/boot/efi/Makefile
+++ b/usr/src/boot/efi/Makefile
diff --git a/usr/src/boot/sys/boot/efi/Makefile.inc b/usr/src/boot/efi/Makefile.inc
index ad29e53249..ad29e53249 100644
--- a/usr/src/boot/sys/boot/efi/Makefile.inc
+++ b/usr/src/boot/efi/Makefile.inc
diff --git a/usr/src/boot/sys/boot/efi/include/Guid/MemoryTypeInformation.h b/usr/src/boot/efi/include/Guid/MemoryTypeInformation.h
index be9c4b5177..be9c4b5177 100644
--- a/usr/src/boot/sys/boot/efi/include/Guid/MemoryTypeInformation.h
+++ b/usr/src/boot/efi/include/Guid/MemoryTypeInformation.h
diff --git a/usr/src/boot/sys/boot/efi/include/Guid/MtcVendor.h b/usr/src/boot/efi/include/Guid/MtcVendor.h
index 3aa774f554..3aa774f554 100644
--- a/usr/src/boot/sys/boot/efi/include/Guid/MtcVendor.h
+++ b/usr/src/boot/efi/include/Guid/MtcVendor.h
diff --git a/usr/src/boot/sys/boot/efi/include/Guid/ZeroGuid.h b/usr/src/boot/efi/include/Guid/ZeroGuid.h
index 6de8c3821f..6de8c3821f 100644
--- a/usr/src/boot/sys/boot/efi/include/Guid/ZeroGuid.h
+++ b/usr/src/boot/efi/include/Guid/ZeroGuid.h
diff --git a/usr/src/boot/sys/boot/efi/include/Protocol/EdidActive.h b/usr/src/boot/efi/include/Protocol/EdidActive.h
index 1f6ff052a9..1f6ff052a9 100644
--- a/usr/src/boot/sys/boot/efi/include/Protocol/EdidActive.h
+++ b/usr/src/boot/efi/include/Protocol/EdidActive.h
diff --git a/usr/src/boot/sys/boot/efi/include/Protocol/EdidDiscovered.h b/usr/src/boot/efi/include/Protocol/EdidDiscovered.h
index c10b6ee89a..c10b6ee89a 100644
--- a/usr/src/boot/sys/boot/efi/include/Protocol/EdidDiscovered.h
+++ b/usr/src/boot/efi/include/Protocol/EdidDiscovered.h
diff --git a/usr/src/boot/sys/boot/efi/include/Protocol/EdidOverride.h b/usr/src/boot/efi/include/Protocol/EdidOverride.h
index 450c95641f..450c95641f 100644
--- a/usr/src/boot/sys/boot/efi/include/Protocol/EdidOverride.h
+++ b/usr/src/boot/efi/include/Protocol/EdidOverride.h
diff --git a/usr/src/boot/sys/boot/efi/include/README b/usr/src/boot/efi/include/README
index bf821fae7e..bf821fae7e 100644
--- a/usr/src/boot/sys/boot/efi/include/README
+++ b/usr/src/boot/efi/include/README
diff --git a/usr/src/boot/sys/boot/efi/include/amd64/efibind.h b/usr/src/boot/efi/include/amd64/efibind.h
index 4cd25ed54b..4cd25ed54b 100644
--- a/usr/src/boot/sys/boot/efi/include/amd64/efibind.h
+++ b/usr/src/boot/efi/include/amd64/efibind.h
diff --git a/usr/src/boot/sys/boot/efi/include/amd64/pe.h b/usr/src/boot/efi/include/amd64/pe.h
index f8033c55ac..f8033c55ac 100644
--- a/usr/src/boot/sys/boot/efi/include/amd64/pe.h
+++ b/usr/src/boot/efi/include/amd64/pe.h
diff --git a/usr/src/boot/sys/boot/efi/include/arm/efibind.h b/usr/src/boot/efi/include/arm/efibind.h
index 177032adc0..177032adc0 100644
--- a/usr/src/boot/sys/boot/efi/include/arm/efibind.h
+++ b/usr/src/boot/efi/include/arm/efibind.h
diff --git a/usr/src/boot/sys/boot/efi/include/arm64/efibind.h b/usr/src/boot/efi/include/arm64/efibind.h
index 8581643b98..8581643b98 100644
--- a/usr/src/boot/sys/boot/efi/include/arm64/efibind.h
+++ b/usr/src/boot/efi/include/arm64/efibind.h
diff --git a/usr/src/boot/sys/boot/efi/include/efi.h b/usr/src/boot/efi/include/efi.h
index ea4041047b..ea4041047b 100644
--- a/usr/src/boot/sys/boot/efi/include/efi.h
+++ b/usr/src/boot/efi/include/efi.h
diff --git a/usr/src/boot/sys/boot/efi/include/efi_driver_utils.h b/usr/src/boot/efi/include/efi_driver_utils.h
index f030d4e61f..f030d4e61f 100644
--- a/usr/src/boot/sys/boot/efi/include/efi_driver_utils.h
+++ b/usr/src/boot/efi/include/efi_driver_utils.h
diff --git a/usr/src/boot/sys/boot/efi/include/efi_drivers.h b/usr/src/boot/efi/include/efi_drivers.h
index 1a96d669dc..1a96d669dc 100644
--- a/usr/src/boot/sys/boot/efi/include/efi_drivers.h
+++ b/usr/src/boot/efi/include/efi_drivers.h
diff --git a/usr/src/boot/sys/boot/efi/include/efi_nii.h b/usr/src/boot/efi/include/efi_nii.h
index 561cbd46a3..561cbd46a3 100644
--- a/usr/src/boot/sys/boot/efi/include/efi_nii.h
+++ b/usr/src/boot/efi/include/efi_nii.h
diff --git a/usr/src/boot/sys/boot/efi/include/efiapi.h b/usr/src/boot/efi/include/efiapi.h
index 15c3187f5e..15c3187f5e 100644
--- a/usr/src/boot/sys/boot/efi/include/efiapi.h
+++ b/usr/src/boot/efi/include/efiapi.h
diff --git a/usr/src/boot/sys/boot/efi/include/efichar.h b/usr/src/boot/efi/include/efichar.h
index 97ca28bf4f..97ca28bf4f 100644
--- a/usr/src/boot/sys/boot/efi/include/efichar.h
+++ b/usr/src/boot/efi/include/efichar.h
diff --git a/usr/src/boot/sys/boot/efi/include/eficon.h b/usr/src/boot/efi/include/eficon.h
index b5a387cb08..b5a387cb08 100644
--- a/usr/src/boot/sys/boot/efi/include/eficon.h
+++ b/usr/src/boot/efi/include/eficon.h
diff --git a/usr/src/boot/sys/boot/efi/include/eficonsctl.h b/usr/src/boot/efi/include/eficonsctl.h
index 68be3d69f4..68be3d69f4 100644
--- a/usr/src/boot/sys/boot/efi/include/eficonsctl.h
+++ b/usr/src/boot/efi/include/eficonsctl.h
diff --git a/usr/src/boot/sys/boot/efi/include/efidebug.h b/usr/src/boot/efi/include/efidebug.h
index 5576d5f4e4..5576d5f4e4 100644
--- a/usr/src/boot/sys/boot/efi/include/efidebug.h
+++ b/usr/src/boot/efi/include/efidebug.h
diff --git a/usr/src/boot/sys/boot/efi/include/efidef.h b/usr/src/boot/efi/include/efidef.h
index 4c075b0e2e..4c075b0e2e 100644
--- a/usr/src/boot/sys/boot/efi/include/efidef.h
+++ b/usr/src/boot/efi/include/efidef.h
diff --git a/usr/src/boot/sys/boot/efi/include/efidevp.h b/usr/src/boot/efi/include/efidevp.h
index bd8f304922..bd8f304922 100644
--- a/usr/src/boot/sys/boot/efi/include/efidevp.h
+++ b/usr/src/boot/efi/include/efidevp.h
diff --git a/usr/src/boot/sys/boot/efi/include/efierr.h b/usr/src/boot/efi/include/efierr.h
index a8b6557185..a8b6557185 100644
--- a/usr/src/boot/sys/boot/efi/include/efierr.h
+++ b/usr/src/boot/efi/include/efierr.h
diff --git a/usr/src/boot/sys/boot/efi/include/efifpswa.h b/usr/src/boot/efi/include/efifpswa.h
index 21823c5ff6..21823c5ff6 100644
--- a/usr/src/boot/sys/boot/efi/include/efifpswa.h
+++ b/usr/src/boot/efi/include/efifpswa.h
diff --git a/usr/src/boot/sys/boot/efi/include/efifs.h b/usr/src/boot/efi/include/efifs.h
index 58febb66eb..58febb66eb 100644
--- a/usr/src/boot/sys/boot/efi/include/efifs.h
+++ b/usr/src/boot/efi/include/efifs.h
diff --git a/usr/src/boot/sys/boot/efi/include/efigop.h b/usr/src/boot/efi/include/efigop.h
index 104fa6e44b..104fa6e44b 100644
--- a/usr/src/boot/sys/boot/efi/include/efigop.h
+++ b/usr/src/boot/efi/include/efigop.h
diff --git a/usr/src/boot/sys/boot/efi/include/efigpt.h b/usr/src/boot/efi/include/efigpt.h
index ac90a304f7..ac90a304f7 100644
--- a/usr/src/boot/sys/boot/efi/include/efigpt.h
+++ b/usr/src/boot/efi/include/efigpt.h
diff --git a/usr/src/boot/sys/boot/efi/include/efiip.h b/usr/src/boot/efi/include/efiip.h
index 839507964f..839507964f 100644
--- a/usr/src/boot/sys/boot/efi/include/efiip.h
+++ b/usr/src/boot/efi/include/efiip.h
diff --git a/usr/src/boot/sys/boot/efi/include/efilib.h b/usr/src/boot/efi/include/efilib.h
index d1cced2e4d..d1cced2e4d 100644
--- a/usr/src/boot/sys/boot/efi/include/efilib.h
+++ b/usr/src/boot/efi/include/efilib.h
diff --git a/usr/src/boot/sys/boot/efi/include/efinet.h b/usr/src/boot/efi/include/efinet.h
index 3ac58b2431..3ac58b2431 100644
--- a/usr/src/boot/sys/boot/efi/include/efinet.h
+++ b/usr/src/boot/efi/include/efinet.h
diff --git a/usr/src/boot/sys/boot/efi/include/efipart.h b/usr/src/boot/efi/include/efipart.h
index ef1a8709d9..ef1a8709d9 100644
--- a/usr/src/boot/sys/boot/efi/include/efipart.h
+++ b/usr/src/boot/efi/include/efipart.h
diff --git a/usr/src/boot/sys/boot/efi/include/efipciio.h b/usr/src/boot/efi/include/efipciio.h
index b42fa59395..b42fa59395 100644
--- a/usr/src/boot/sys/boot/efi/include/efipciio.h
+++ b/usr/src/boot/efi/include/efipciio.h
diff --git a/usr/src/boot/sys/boot/efi/include/efipoint.h b/usr/src/boot/efi/include/efipoint.h
index 46e92ffd3b..46e92ffd3b 100644
--- a/usr/src/boot/sys/boot/efi/include/efipoint.h
+++ b/usr/src/boot/efi/include/efipoint.h
diff --git a/usr/src/boot/sys/boot/efi/include/efiprot.h b/usr/src/boot/efi/include/efiprot.h
index bd051a0ee1..bd051a0ee1 100644
--- a/usr/src/boot/sys/boot/efi/include/efiprot.h
+++ b/usr/src/boot/efi/include/efiprot.h
diff --git a/usr/src/boot/sys/boot/efi/include/efipxebc.h b/usr/src/boot/efi/include/efipxebc.h
index ba0b2e9b6c..ba0b2e9b6c 100644
--- a/usr/src/boot/sys/boot/efi/include/efipxebc.h
+++ b/usr/src/boot/efi/include/efipxebc.h
diff --git a/usr/src/boot/sys/boot/efi/include/efiser.h b/usr/src/boot/efi/include/efiser.h
index e3d66e203a..e3d66e203a 100644
--- a/usr/src/boot/sys/boot/efi/include/efiser.h
+++ b/usr/src/boot/efi/include/efiser.h
diff --git a/usr/src/boot/sys/boot/efi/include/efistdarg.h b/usr/src/boot/efi/include/efistdarg.h
index 25f5569841..25f5569841 100644
--- a/usr/src/boot/sys/boot/efi/include/efistdarg.h
+++ b/usr/src/boot/efi/include/efistdarg.h
diff --git a/usr/src/boot/sys/boot/efi/include/efitcp.h b/usr/src/boot/efi/include/efitcp.h
index 6c5df7fd94..6c5df7fd94 100644
--- a/usr/src/boot/sys/boot/efi/include/efitcp.h
+++ b/usr/src/boot/efi/include/efitcp.h
diff --git a/usr/src/boot/sys/boot/efi/include/efiudp.h b/usr/src/boot/efi/include/efiudp.h
index 7c8b467eb9..7c8b467eb9 100644
--- a/usr/src/boot/sys/boot/efi/include/efiudp.h
+++ b/usr/src/boot/efi/include/efiudp.h
diff --git a/usr/src/boot/sys/boot/efi/include/efiuga.h b/usr/src/boot/efi/include/efiuga.h
index dce4e044c1..dce4e044c1 100644
--- a/usr/src/boot/sys/boot/efi/include/efiuga.h
+++ b/usr/src/boot/efi/include/efiuga.h
diff --git a/usr/src/boot/sys/boot/efi/include/efizfs.h b/usr/src/boot/efi/include/efizfs.h
index 4fc0ff551f..4fc0ff551f 100644
--- a/usr/src/boot/sys/boot/efi/include/efizfs.h
+++ b/usr/src/boot/efi/include/efizfs.h
diff --git a/usr/src/boot/sys/boot/efi/include/i386/efibind.h b/usr/src/boot/efi/include/i386/efibind.h
index 3bbed66176..3bbed66176 100644
--- a/usr/src/boot/sys/boot/efi/include/i386/efibind.h
+++ b/usr/src/boot/efi/include/i386/efibind.h
diff --git a/usr/src/boot/sys/boot/efi/include/i386/pe.h b/usr/src/boot/efi/include/i386/pe.h
index e2ae25c3dd..e2ae25c3dd 100644
--- a/usr/src/boot/sys/boot/efi/include/i386/pe.h
+++ b/usr/src/boot/efi/include/i386/pe.h
diff --git a/usr/src/boot/sys/boot/efi/libefi/Makefile b/usr/src/boot/efi/libefi/Makefile
index 6ba07bc880..6ba07bc880 100644
--- a/usr/src/boot/sys/boot/efi/libefi/Makefile
+++ b/usr/src/boot/efi/libefi/Makefile
diff --git a/usr/src/boot/sys/boot/efi/libefi/Makefile.com b/usr/src/boot/efi/libefi/Makefile.com
index 5d3285db2c..ae9c3da748 100644
--- a/usr/src/boot/sys/boot/efi/libefi/Makefile.com
+++ b/usr/src/boot/efi/libefi/Makefile.com
@@ -14,7 +14,7 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
 install:
 
@@ -39,13 +39,13 @@ SRCS +=	delay.c \
 OBJS=	$(SRCS:%.c=%.o)
 
 CPPFLAGS += -DEFI
-CPPFLAGS += -I. -I../../../../../include -I../../../..
+CPPFLAGS += -I. -I../../../include -I../../../sys
 CPPFLAGS += -I$(SRC)/common/ficl -I../../../libficl
 CPPFLAGS += -I../../include
 CPPFLAGS += -I../../include/$(MACHINE)
-CPPFLAGS += -I../../../../../lib/libstand
+CPPFLAGS += -I../../../libsa
 CPPFLAGS += -I$(ZFSSRC)
-CPPFLAGS += -I../../../../cddl/boot/zfs
+CPPFLAGS += -I../../../sys/cddl/boot/zfs
 
 gfx_fb.o := CPPFLAGS += $(DEFAULT_CONSOLE_COLOR) -I$(LZ4)
 pnglite.o := CPPFLAGS += -I$(ZLIB)
@@ -68,11 +68,11 @@ clobber:
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../../$(MACHINE)/include machine
+	$(SYMLINK) ../../../sys/$(MACHINE)/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../../x86/include x86
+	$(SYMLINK) ../../../sys/x86/include x86
 
 %.o:	../%.c
 	$(COMPILE.c) $<
diff --git a/usr/src/boot/sys/boot/efi/libefi/amd64/Makefile b/usr/src/boot/efi/libefi/amd64/Makefile
index 6d247f44a5..6d247f44a5 100644
--- a/usr/src/boot/sys/boot/efi/libefi/amd64/Makefile
+++ b/usr/src/boot/efi/libefi/amd64/Makefile
diff --git a/usr/src/boot/sys/boot/efi/libefi/delay.c b/usr/src/boot/efi/libefi/delay.c
index 966eec88e7..966eec88e7 100644
--- a/usr/src/boot/sys/boot/efi/libefi/delay.c
+++ b/usr/src/boot/efi/libefi/delay.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/devicename.c b/usr/src/boot/efi/libefi/devicename.c
index 34062f2f25..34062f2f25 100644
--- a/usr/src/boot/sys/boot/efi/libefi/devicename.c
+++ b/usr/src/boot/efi/libefi/devicename.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/devpath.c b/usr/src/boot/efi/libefi/devpath.c
index 257d49fdd6..257d49fdd6 100644
--- a/usr/src/boot/sys/boot/efi/libefi/devpath.c
+++ b/usr/src/boot/efi/libefi/devpath.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efi_console.c b/usr/src/boot/efi/libefi/efi_console.c
index cdcc9ee297..cdcc9ee297 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efi_console.c
+++ b/usr/src/boot/efi/libefi/efi_console.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efi_driver_utils.c b/usr/src/boot/efi/libefi/efi_driver_utils.c
index eeb8930fe3..eeb8930fe3 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efi_driver_utils.c
+++ b/usr/src/boot/efi/libefi/efi_driver_utils.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efichar.c b/usr/src/boot/efi/libefi/efichar.c
index 3a2a773b81..3a2a773b81 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efichar.c
+++ b/usr/src/boot/efi/libefi/efichar.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efienv.c b/usr/src/boot/efi/libefi/efienv.c
index 253d525c1a..253d525c1a 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efienv.c
+++ b/usr/src/boot/efi/libefi/efienv.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efinet.c b/usr/src/boot/efi/libefi/efinet.c
index 2024eb343f..2024eb343f 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efinet.c
+++ b/usr/src/boot/efi/libefi/efinet.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efipart.c b/usr/src/boot/efi/libefi/efipart.c
index 694dd1d28e..694dd1d28e 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efipart.c
+++ b/usr/src/boot/efi/libefi/efipart.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/efizfs.c b/usr/src/boot/efi/libefi/efizfs.c
index 570a97ecfa..570a97ecfa 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efizfs.c
+++ b/usr/src/boot/efi/libefi/efizfs.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/env.c b/usr/src/boot/efi/libefi/env.c
index eabee1dd07..eabee1dd07 100644
--- a/usr/src/boot/sys/boot/efi/libefi/env.c
+++ b/usr/src/boot/efi/libefi/env.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/errno.c b/usr/src/boot/efi/libefi/errno.c
index c558bc608b..c558bc608b 100644
--- a/usr/src/boot/sys/boot/efi/libefi/errno.c
+++ b/usr/src/boot/efi/libefi/errno.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/handles.c b/usr/src/boot/efi/libefi/handles.c
index 1e4ef6ffbd..1e4ef6ffbd 100644
--- a/usr/src/boot/sys/boot/efi/libefi/handles.c
+++ b/usr/src/boot/efi/libefi/handles.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/i386/Makefile b/usr/src/boot/efi/libefi/i386/Makefile
index 60274fab76..60274fab76 100644
--- a/usr/src/boot/sys/boot/efi/libefi/i386/Makefile
+++ b/usr/src/boot/efi/libefi/i386/Makefile
diff --git a/usr/src/boot/sys/boot/efi/libefi/libefi.c b/usr/src/boot/efi/libefi/libefi.c
index b1af9c040e..b1af9c040e 100644
--- a/usr/src/boot/sys/boot/efi/libefi/libefi.c
+++ b/usr/src/boot/efi/libefi/libefi.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/time.c b/usr/src/boot/efi/libefi/time.c
index c475ed7a41..c475ed7a41 100644
--- a/usr/src/boot/sys/boot/efi/libefi/time.c
+++ b/usr/src/boot/efi/libefi/time.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/time_event.c b/usr/src/boot/efi/libefi/time_event.c
index afb30c1d9e..afb30c1d9e 100644
--- a/usr/src/boot/sys/boot/efi/libefi/time_event.c
+++ b/usr/src/boot/efi/libefi/time_event.c
diff --git a/usr/src/boot/sys/boot/efi/libefi/wchar.c b/usr/src/boot/efi/libefi/wchar.c
index c13922aa9f..c13922aa9f 100644
--- a/usr/src/boot/sys/boot/efi/libefi/wchar.c
+++ b/usr/src/boot/efi/libefi/wchar.c
diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile b/usr/src/boot/efi/loader/Makefile
index f69f4b3c06..f69f4b3c06 100644
--- a/usr/src/boot/sys/boot/efi/loader/Makefile
+++ b/usr/src/boot/efi/loader/Makefile
diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile.com b/usr/src/boot/efi/loader/Makefile.com
index ea6303034f..51edbced1e 100644
--- a/usr/src/boot/sys/boot/efi/loader/Makefile.com
+++ b/usr/src/boot/efi/loader/Makefile.com
@@ -12,11 +12,11 @@
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
-# Copyright (c) 2019, Joyent, Inc.
+# Copyright 2022 Joyent, Inc.
 #
 
 include $(SRC)/boot/Makefile.version
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
 PROG=		loader.sym
 
@@ -37,7 +37,6 @@ SRCS=	\
 	multiboot2.c \
 	nvstore.c \
 	self_reloc.c \
-	smbios.c \
 	tem.c \
 	vers.c
 
@@ -57,7 +56,6 @@ OBJS=	\
 	multiboot2.o \
 	nvstore.o \
 	self_reloc.o \
-	smbios.o \
 	tem.o \
 	vers.o
 
@@ -65,8 +63,8 @@ module.o := CPPFLAGS += -I$(CRYPTOSRC)
 tem.o := CPPFLAGS += $(DEFAULT_CONSOLE_COLOR)
 main.o := CPPFLAGS += -I$(SRC)/uts/common/fs/zfs
 
-CPPFLAGS += -I../../../../../include -I../../..../
-CPPFLAGS += -I../../../../../lib/libstand
+CPPFLAGS += -I../../../include -I../../../sys
+CPPFLAGS += -I../../../libsa
 
 include ../../Makefile.inc
 
@@ -75,10 +73,8 @@ include ../arch/$(MACHINE)/Makefile.inc
 CPPFLAGS +=	-I. -I..
 CPPFLAGS +=	-I../../include
 CPPFLAGS +=	-I../../include/$(MACHINE)
-CPPFLAGS +=	-I../../../..
-CPPFLAGS +=	-I../../../i386/libi386
 CPPFLAGS +=	-I$(ZFSSRC)
-CPPFLAGS +=	-I../../../../cddl/boot/zfs
+CPPFLAGS +=	-I../../../sys/cddl/boot/zfs
 CPPFLAGS +=	-I$(SRC)/uts/intel/sys/acpi
 CPPFLAGS +=	-I$(PNGLITE)
 CPPFLAGS +=	-DNO_PCI -DEFI
@@ -90,15 +86,9 @@ CPPFLAGS +=	-DNO_PCI -DEFI
 #
 CPPFLAGS +=	-DLOADER_DISABLE_SNP
 
-# Export serial numbers, UUID, and asset tag from loader.
-smbios.o := CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS
-# Use little-endian UUID format as defined in SMBIOS 2.6.
-smbios.o := CPPFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID
-# Use network-endian UUID format for backward compatibility.
-#CPPFLAGS += -DSMBIOS_NETWORK_ENDIAN_UUID
 
-DPLIBSTAND=	../../../libstand/$(MACHINE)/libstand_pics.a
-LIBSTAND=	-L../../../libstand/$(MACHINE) -lstand_pics
+DPLIBSA=	../../../libsa/$(MACHINE)/libsa_pics.a
+LIBSA=	-L../../../libsa/$(MACHINE) -lsa_pics
 
 BOOT_FORTH=	yes
 CPPFLAGS +=	-DBOOT_FORTH
@@ -179,19 +169,19 @@ loader.bin: loader.sym
 DPLIBEFI=	../../libefi/$(MACHINE)/libefi.a
 LIBEFI=		-L../../libefi/$(MACHINE) -lefi
 
-DPADD=		$(DPLIBFICL) $(DPLIBEFI) $(DPLIBSTAND) $(LDSCRIPT)
-LDADD=		$(LIBFICL) $(LIBEFI) $(LIBSTAND)
+DPADD=		$(DPLIBFICL) $(DPLIBEFI) $(DPLIBSA) $(LDSCRIPT)
+LDADD=		$(LIBFICL) $(LIBEFI) $(LIBSA)
 
 loader.sym:	$(OBJS) $(DPADD)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LDADD)
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../../$(MACHINE)/include machine
+	$(SYMLINK) ../../../sys/$(MACHINE)/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../../x86/include x86
+	$(SYMLINK) ../../../sys/x86/include x86
 
 clean clobber:
 	$(RM) $(CLEANFILES) $(OBJS) machine x86
diff --git a/usr/src/boot/sys/boot/efi/loader/acpi.c b/usr/src/boot/efi/loader/acpi.c
index ae25c0c0f6..ae25c0c0f6 100644
--- a/usr/src/boot/sys/boot/efi/loader/acpi.c
+++ b/usr/src/boot/efi/loader/acpi.c
diff --git a/usr/src/boot/sys/boot/efi/loader/amd64/Makefile b/usr/src/boot/efi/loader/amd64/Makefile
index a7894b50ca..a7894b50ca 100644
--- a/usr/src/boot/sys/boot/efi/loader/amd64/Makefile
+++ b/usr/src/boot/efi/loader/amd64/Makefile
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/Makefile.inc b/usr/src/boot/efi/loader/arch/amd64/Makefile.inc
index a4cf7e162d..a4cf7e162d 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/Makefile.inc
+++ b/usr/src/boot/efi/loader/arch/amd64/Makefile.inc
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/amd64_tramp.S b/usr/src/boot/efi/loader/arch/amd64/amd64_tramp.S
index c102d92435..c102d92435 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/amd64_tramp.S
+++ b/usr/src/boot/efi/loader/arch/amd64/amd64_tramp.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c b/usr/src/boot/efi/loader/arch/amd64/elf64_freebsd.c
index 7571eb9561..7571eb9561 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
+++ b/usr/src/boot/efi/loader/arch/amd64/elf64_freebsd.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/exc.S b/usr/src/boot/efi/loader/arch/amd64/exc.S
index e52204bd96..e52204bd96 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/exc.S
+++ b/usr/src/boot/efi/loader/arch/amd64/exc.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/usr/src/boot/efi/loader/arch/amd64/ldscript.amd64
index c37f655e52..c37f655e52 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/ldscript.amd64
+++ b/usr/src/boot/efi/loader/arch/amd64/ldscript.amd64
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S b/usr/src/boot/efi/loader/arch/amd64/multiboot_tramp.S
index e8ba51324a..e8ba51324a 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/multiboot_tramp.S
+++ b/usr/src/boot/efi/loader/arch/amd64/multiboot_tramp.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/start.S b/usr/src/boot/efi/loader/arch/amd64/start.S
index 774ef4fa79..774ef4fa79 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/start.S
+++ b/usr/src/boot/efi/loader/arch/amd64/start.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/trap.c b/usr/src/boot/efi/loader/arch/amd64/trap.c
index 844d759c06..844d759c06 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/trap.c
+++ b/usr/src/boot/efi/loader/arch/amd64/trap.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm/Makefile.inc b/usr/src/boot/efi/loader/arch/arm/Makefile.inc
index b2876ca195..b2876ca195 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm/Makefile.inc
+++ b/usr/src/boot/efi/loader/arch/arm/Makefile.inc
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm/exec.c b/usr/src/boot/efi/loader/arch/arm/exec.c
index 83d3f2b114..83d3f2b114 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm/exec.c
+++ b/usr/src/boot/efi/loader/arch/arm/exec.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm/ldscript.arm b/usr/src/boot/efi/loader/arch/arm/ldscript.arm
index a52af40884..a52af40884 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm/ldscript.arm
+++ b/usr/src/boot/efi/loader/arch/arm/ldscript.arm
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm/start.S b/usr/src/boot/efi/loader/arch/arm/start.S
index 443de4af1f..443de4af1f 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm/start.S
+++ b/usr/src/boot/efi/loader/arch/arm/start.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm64/Makefile.inc b/usr/src/boot/efi/loader/arch/arm64/Makefile.inc
index d263db956a..d263db956a 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm64/Makefile.inc
+++ b/usr/src/boot/efi/loader/arch/arm64/Makefile.inc
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm64/exec.c b/usr/src/boot/efi/loader/arch/arm64/exec.c
index a8420b4b64..a8420b4b64 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm64/exec.c
+++ b/usr/src/boot/efi/loader/arch/arm64/exec.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm64/ldscript.arm64 b/usr/src/boot/efi/loader/arch/arm64/ldscript.arm64
index 96da9ba662..96da9ba662 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm64/ldscript.arm64
+++ b/usr/src/boot/efi/loader/arch/arm64/ldscript.arm64
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/arm64/start.S b/usr/src/boot/efi/loader/arch/arm64/start.S
index cd9badb05b..cd9badb05b 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/arm64/start.S
+++ b/usr/src/boot/efi/loader/arch/arm64/start.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/Makefile.inc b/usr/src/boot/efi/loader/arch/i386/Makefile.inc
index 9290ace4de..9290ace4de 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/Makefile.inc
+++ b/usr/src/boot/efi/loader/arch/i386/Makefile.inc
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/bootinfo.c b/usr/src/boot/efi/loader/arch/i386/bootinfo.c
index cbd6e4ebe9..cbd6e4ebe9 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/bootinfo.c
+++ b/usr/src/boot/efi/loader/arch/i386/bootinfo.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/efimd.c b/usr/src/boot/efi/loader/arch/i386/efimd.c
index 41615be905..41615be905 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/efimd.c
+++ b/usr/src/boot/efi/loader/arch/i386/efimd.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/elf32_freebsd.c b/usr/src/boot/efi/loader/arch/i386/elf32_freebsd.c
index b3a18d27d3..b3a18d27d3 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
+++ b/usr/src/boot/efi/loader/arch/i386/elf32_freebsd.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/exec.c b/usr/src/boot/efi/loader/arch/i386/exec.c
index 579f5593b2..579f5593b2 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/exec.c
+++ b/usr/src/boot/efi/loader/arch/i386/exec.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/i386_copy.c b/usr/src/boot/efi/loader/arch/i386/i386_copy.c
index 522913f5da..522913f5da 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/i386_copy.c
+++ b/usr/src/boot/efi/loader/arch/i386/i386_copy.c
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/ldscript.i386 b/usr/src/boot/efi/loader/arch/i386/ldscript.i386
index 735fe77158..735fe77158 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/ldscript.i386
+++ b/usr/src/boot/efi/loader/arch/i386/ldscript.i386
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/multiboot_tramp.S b/usr/src/boot/efi/loader/arch/i386/multiboot_tramp.S
index 60be6a378d..60be6a378d 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/multiboot_tramp.S
+++ b/usr/src/boot/efi/loader/arch/i386/multiboot_tramp.S
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/i386/start.S b/usr/src/boot/efi/loader/arch/i386/start.S
index b597f419d4..b597f419d4 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/i386/start.S
+++ b/usr/src/boot/efi/loader/arch/i386/start.S
diff --git a/usr/src/boot/sys/boot/efi/loader/autoload.c b/usr/src/boot/efi/loader/autoload.c
index c1eb84928e..c1eb84928e 100644
--- a/usr/src/boot/sys/boot/efi/loader/autoload.c
+++ b/usr/src/boot/efi/loader/autoload.c
diff --git a/usr/src/boot/sys/boot/efi/loader/bootinfo.c b/usr/src/boot/efi/loader/bootinfo.c
index 1ede89a303..1ede89a303 100644
--- a/usr/src/boot/sys/boot/efi/loader/bootinfo.c
+++ b/usr/src/boot/efi/loader/bootinfo.c
diff --git a/usr/src/boot/sys/boot/efi/loader/conf.c b/usr/src/boot/efi/loader/conf.c
index e493d7cb03..e493d7cb03 100644
--- a/usr/src/boot/sys/boot/efi/loader/conf.c
+++ b/usr/src/boot/efi/loader/conf.c
diff --git a/usr/src/boot/sys/boot/efi/loader/copy.c b/usr/src/boot/efi/loader/copy.c
index 491c6787c6..491c6787c6 100644
--- a/usr/src/boot/sys/boot/efi/loader/copy.c
+++ b/usr/src/boot/efi/loader/copy.c
diff --git a/usr/src/boot/sys/boot/efi/loader/efi_main.c b/usr/src/boot/efi/loader/efi_main.c
index 2da79f20b0..2da79f20b0 100644
--- a/usr/src/boot/sys/boot/efi/loader/efi_main.c
+++ b/usr/src/boot/efi/loader/efi_main.c
diff --git a/usr/src/boot/sys/boot/efi/loader/efiserialio.c b/usr/src/boot/efi/loader/efiserialio.c
index 9d22a5b319..9d22a5b319 100644
--- a/usr/src/boot/sys/boot/efi/loader/efiserialio.c
+++ b/usr/src/boot/efi/loader/efiserialio.c
diff --git a/usr/src/boot/sys/boot/efi/loader/framebuffer.c b/usr/src/boot/efi/loader/framebuffer.c
index bd86ea3e43..bd86ea3e43 100644
--- a/usr/src/boot/sys/boot/efi/loader/framebuffer.c
+++ b/usr/src/boot/efi/loader/framebuffer.c
diff --git a/usr/src/boot/sys/boot/efi/loader/framebuffer.h b/usr/src/boot/efi/loader/framebuffer.h
index 2ec9017dc3..2ec9017dc3 100644
--- a/usr/src/boot/sys/boot/efi/loader/framebuffer.h
+++ b/usr/src/boot/efi/loader/framebuffer.h
diff --git a/usr/src/boot/sys/boot/efi/loader/i386/Makefile b/usr/src/boot/efi/loader/i386/Makefile
index b2f086971a..b2f086971a 100644
--- a/usr/src/boot/sys/boot/efi/loader/i386/Makefile
+++ b/usr/src/boot/efi/loader/i386/Makefile
diff --git a/usr/src/boot/sys/boot/efi/loader/loader_efi.h b/usr/src/boot/efi/loader/loader_efi.h
index 77ef65e87a..77ef65e87a 100644
--- a/usr/src/boot/sys/boot/efi/loader/loader_efi.h
+++ b/usr/src/boot/efi/loader/loader_efi.h
diff --git a/usr/src/boot/sys/boot/efi/loader/main.c b/usr/src/boot/efi/loader/main.c
index d8daf4ce7d..82b0936cde 100644
--- a/usr/src/boot/sys/boot/efi/loader/main.c
+++ b/usr/src/boot/efi/loader/main.c
@@ -489,6 +489,12 @@ interactive_interrupt(const char *msg)
 	return (false);
 }
 
+caddr_t
+ptov(uintptr_t x)
+{
+	return ((caddr_t)x);
+}
+
 EFI_STATUS
 main(int argc, CHAR16 *argv[])
 {
diff --git a/usr/src/boot/sys/boot/efi/loader/memmap.c b/usr/src/boot/efi/loader/memmap.c
index f3545a4d64..f3545a4d64 100644
--- a/usr/src/boot/sys/boot/efi/loader/memmap.c
+++ b/usr/src/boot/efi/loader/memmap.c
diff --git a/usr/src/boot/sys/boot/efi/loader/reloc.c b/usr/src/boot/efi/loader/reloc.c
index 5d03e09dc7..5d03e09dc7 100644
--- a/usr/src/boot/sys/boot/efi/loader/reloc.c
+++ b/usr/src/boot/efi/loader/reloc.c
diff --git a/usr/src/boot/forth/Makefile b/usr/src/boot/forth/Makefile
new file mode 100644
index 0000000000..c383cae255
--- /dev/null
+++ b/usr/src/boot/forth/Makefile
@@ -0,0 +1,81 @@
+#
+# 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 2022 Toomas Soome <tsoome@me.com>
+# Copyright 2022 Joyent, Inc.
+#
+include $(SRC)/Makefile.master
+
+ROOT_BOOT=		$(ROOT)/boot
+ROOT_BOOT_DEFAULTS=	$(ROOT)/boot/defaults
+ROOT_BOOT_FORTH=	$(ROOT)/boot/forth
+ROOT_BOOT_CONF=		$(ROOT)/boot/conf.d
+ROOTBOOTFILES=$(FILES:%=$(ROOT_BOOT)/%)
+ROOTBOOTFORTH=$(FORTH:%=$(ROOT_BOOT_FORTH)/%)
+ROOTBOOTDEFAULTS=$(DEFFILES:%=$(ROOT_BOOT_DEFAULTS)/%)
+FILEMODE=0444
+
+FORTH =	beastie.4th
+FORTH +=	beadm.4th
+FORTH +=	brand.4th
+FORTH +=	brand-illumos.4th
+FORTH +=	brand-smartos.4th
+FORTH +=	check-password.4th
+FORTH +=	color.4th
+FORTH +=	delay.4th
+FORTH +=	efi.4th
+FORTH +=	frames.4th
+FORTH +=	loader.4th
+DEFFILES =	loader.conf
+FORTH +=	logo-beastie.4th
+FORTH +=	logo-beastiebw.4th
+FORTH +=	logo-fbsdbw.4th
+FORTH +=	logo-illumos.4th
+FORTH +=	logo-orb.4th
+FORTH +=	logo-orbbw.4th
+FORTH +=	logo-smartos.4th
+FORTH +=	menu.4th
+FORTH +=	menu.rc
+FORTH +=	menu-commands.4th
+FORTH +=	menusets.4th
+FORTH +=	pcibios.4th
+FORTH +=	screen.4th
+FORTH +=	shortcuts.4th
+FORTH +=	support.4th
+FORTH +=	version.4th
+FILES +=	illumos-logo.png
+FILES +=	illumos-brand.png
+FILES +=	joyent.png
+FILES +=	triton.png
+FILES +=	loader.rc
+
+all clean clobber:
+
+install: $(ROOT_BOOT_DEFAULTS) $(ROOT_BOOT_FORTH) $(ROOTBOOTFILES) \
+	$(ROOTBOOTDEFAULTS) $(ROOT_BOOT_CONF) $(ROOTBOOTFORTH)
+
+$(ROOT_BOOT)/%: % $(ROOT_BOOT)
+	$(INS.file)
+
+$(ROOT_BOOT_DEFAULTS)/%: % $(ROOT_BOOT_DEFAULTS)
+	$(INS.file)
+
+$(ROOT_BOOT_FORTH)/menu.rc: ../../forth/joyent.menu.rc $(ROOT_BOOT_FORTH)
+	$(RM) $@; \
+	$(INS) -s -m $(FILEMODE) -f $(@D) ../../forth/joyent.menu.rc; \
+	$(MV) $(@D)/joyent.menu.rc $@
+
+$(ROOT_BOOT_FORTH)/%: % $(ROOT_BOOT_FORTH)
+	$(INS.file)
+
+$(ROOT_BOOT_DEFAULTS) $(ROOT_BOOT_CONF) $(ROOT_BOOT_FORTH):
+	$(INS.dir)
diff --git a/usr/src/boot/sys/boot/forth/beadm.4th b/usr/src/boot/forth/beadm.4th
index 74e9022634..74e9022634 100644
--- a/usr/src/boot/sys/boot/forth/beadm.4th
+++ b/usr/src/boot/forth/beadm.4th
diff --git a/usr/src/boot/sys/boot/forth/beastie.4th b/usr/src/boot/forth/beastie.4th
index 874e19a9d9..874e19a9d9 100644
--- a/usr/src/boot/sys/boot/forth/beastie.4th
+++ b/usr/src/boot/forth/beastie.4th
diff --git a/usr/src/boot/sys/boot/forth/brand-fbsd.4th b/usr/src/boot/forth/brand-fbsd.4th
index 9cd017f84a..9cd017f84a 100644
--- a/usr/src/boot/sys/boot/forth/brand-fbsd.4th
+++ b/usr/src/boot/forth/brand-fbsd.4th
diff --git a/usr/src/boot/sys/boot/forth/brand-illumos.4th b/usr/src/boot/forth/brand-illumos.4th
index 3122af6ec0..3122af6ec0 100644
--- a/usr/src/boot/sys/boot/forth/brand-illumos.4th
+++ b/usr/src/boot/forth/brand-illumos.4th
diff --git a/usr/src/boot/sys/boot/forth/brand-smartos.4th b/usr/src/boot/forth/brand-smartos.4th
index be492462a0..be492462a0 100644
--- a/usr/src/boot/sys/boot/forth/brand-smartos.4th
+++ b/usr/src/boot/forth/brand-smartos.4th
diff --git a/usr/src/boot/sys/boot/forth/brand.4th b/usr/src/boot/forth/brand.4th
index c86b955602..c86b955602 100644
--- a/usr/src/boot/sys/boot/forth/brand.4th
+++ b/usr/src/boot/forth/brand.4th
diff --git a/usr/src/boot/sys/boot/forth/check-password.4th b/usr/src/boot/forth/check-password.4th
index f8b7d5a135..f8b7d5a135 100644
--- a/usr/src/boot/sys/boot/forth/check-password.4th
+++ b/usr/src/boot/forth/check-password.4th
diff --git a/usr/src/boot/sys/boot/forth/color.4th b/usr/src/boot/forth/color.4th
index 09b2c39ebf..09b2c39ebf 100644
--- a/usr/src/boot/sys/boot/forth/color.4th
+++ b/usr/src/boot/forth/color.4th
diff --git a/usr/src/boot/sys/boot/forth/delay.4th b/usr/src/boot/forth/delay.4th
index 28cfa5c26e..28cfa5c26e 100644
--- a/usr/src/boot/sys/boot/forth/delay.4th
+++ b/usr/src/boot/forth/delay.4th
diff --git a/usr/src/boot/sys/boot/forth/efi.4th b/usr/src/boot/forth/efi.4th
index 422a32d295..422a32d295 100644
--- a/usr/src/boot/sys/boot/forth/efi.4th
+++ b/usr/src/boot/forth/efi.4th
diff --git a/usr/src/boot/sys/boot/forth/frames.4th b/usr/src/boot/forth/frames.4th
index 4976e4e8e3..4976e4e8e3 100644
--- a/usr/src/boot/sys/boot/forth/frames.4th
+++ b/usr/src/boot/forth/frames.4th
diff --git a/usr/src/boot/sys/boot/forth/illumos-brand.png b/usr/src/boot/forth/illumos-brand.png
index 0679f0d050..0679f0d050 100644
--- a/usr/src/boot/sys/boot/forth/illumos-brand.png
+++ b/usr/src/boot/forth/illumos-brand.png
diff --git a/usr/src/boot/sys/boot/forth/illumos-logo.png b/usr/src/boot/forth/illumos-logo.png
index 3af7a2f360..3af7a2f360 100644
--- a/usr/src/boot/sys/boot/forth/illumos-logo.png
+++ b/usr/src/boot/forth/illumos-logo.png
diff --git a/usr/src/boot/sys/boot/forth/joyent.menu.rc b/usr/src/boot/forth/joyent.menu.rc
index 3dddb7ffe7..3dddb7ffe7 100644
--- a/usr/src/boot/sys/boot/forth/joyent.menu.rc
+++ b/usr/src/boot/forth/joyent.menu.rc
diff --git a/usr/src/boot/sys/boot/forth/joyent.png b/usr/src/boot/forth/joyent.png
index b375a88192..b375a88192 100644
--- a/usr/src/boot/sys/boot/forth/joyent.png
+++ b/usr/src/boot/forth/joyent.png
diff --git a/usr/src/boot/sys/boot/forth/loader.4th b/usr/src/boot/forth/loader.4th
index b3aec0f88d..b3aec0f88d 100644
--- a/usr/src/boot/sys/boot/forth/loader.4th
+++ b/usr/src/boot/forth/loader.4th
diff --git a/usr/src/boot/sys/boot/forth/loader.conf b/usr/src/boot/forth/loader.conf
index 78028c88fe..78028c88fe 100644
--- a/usr/src/boot/sys/boot/forth/loader.conf
+++ b/usr/src/boot/forth/loader.conf
diff --git a/usr/src/boot/sys/boot/i386/loader/loader.rc b/usr/src/boot/forth/loader.rc
index 989a014da4..989a014da4 100644
--- a/usr/src/boot/sys/boot/i386/loader/loader.rc
+++ b/usr/src/boot/forth/loader.rc
diff --git a/usr/src/boot/sys/boot/forth/logo-beastie.4th b/usr/src/boot/forth/logo-beastie.4th
index 671eb5e496..671eb5e496 100644
--- a/usr/src/boot/sys/boot/forth/logo-beastie.4th
+++ b/usr/src/boot/forth/logo-beastie.4th
diff --git a/usr/src/boot/sys/boot/forth/logo-beastiebw.4th b/usr/src/boot/forth/logo-beastiebw.4th
index 197099cda0..197099cda0 100644
--- a/usr/src/boot/sys/boot/forth/logo-beastiebw.4th
+++ b/usr/src/boot/forth/logo-beastiebw.4th
diff --git a/usr/src/boot/sys/boot/forth/logo-fbsdbw.4th b/usr/src/boot/forth/logo-fbsdbw.4th
index d4a532b78f..d4a532b78f 100644
--- a/usr/src/boot/sys/boot/forth/logo-fbsdbw.4th
+++ b/usr/src/boot/forth/logo-fbsdbw.4th
diff --git a/usr/src/boot/sys/boot/forth/logo-illumos.4th b/usr/src/boot/forth/logo-illumos.4th
index e64895db08..e64895db08 100644
--- a/usr/src/boot/sys/boot/forth/logo-illumos.4th
+++ b/usr/src/boot/forth/logo-illumos.4th
diff --git a/usr/src/boot/sys/boot/forth/logo-orb.4th b/usr/src/boot/forth/logo-orb.4th
index c2a504d1dd..c2a504d1dd 100644
--- a/usr/src/boot/sys/boot/forth/logo-orb.4th
+++ b/usr/src/boot/forth/logo-orb.4th
diff --git a/usr/src/boot/sys/boot/forth/logo-orbbw.4th b/usr/src/boot/forth/logo-orbbw.4th
index 11dc11cabb..11dc11cabb 100644
--- a/usr/src/boot/sys/boot/forth/logo-orbbw.4th
+++ b/usr/src/boot/forth/logo-orbbw.4th
diff --git a/usr/src/boot/sys/boot/forth/logo-smartos.4th b/usr/src/boot/forth/logo-smartos.4th
index f897c45165..f897c45165 100644
--- a/usr/src/boot/sys/boot/forth/logo-smartos.4th
+++ b/usr/src/boot/forth/logo-smartos.4th
diff --git a/usr/src/boot/sys/boot/forth/menu-commands.4th b/usr/src/boot/forth/menu-commands.4th
index 5434535fe0..5434535fe0 100644
--- a/usr/src/boot/sys/boot/forth/menu-commands.4th
+++ b/usr/src/boot/forth/menu-commands.4th
diff --git a/usr/src/boot/sys/boot/forth/menu.4th b/usr/src/boot/forth/menu.4th
index 39f03e9cd3..39f03e9cd3 100644
--- a/usr/src/boot/sys/boot/forth/menu.4th
+++ b/usr/src/boot/forth/menu.4th
diff --git a/usr/src/boot/sys/boot/forth/menu.rc b/usr/src/boot/forth/menu.rc
index 00ab7445c3..00ab7445c3 100644
--- a/usr/src/boot/sys/boot/forth/menu.rc
+++ b/usr/src/boot/forth/menu.rc
diff --git a/usr/src/boot/sys/boot/forth/menusets.4th b/usr/src/boot/forth/menusets.4th
index 3f05f38844..3f05f38844 100644
--- a/usr/src/boot/sys/boot/forth/menusets.4th
+++ b/usr/src/boot/forth/menusets.4th
diff --git a/usr/src/boot/sys/boot/forth/pcibios.4th b/usr/src/boot/forth/pcibios.4th
index 71702dad8a..71702dad8a 100644
--- a/usr/src/boot/sys/boot/forth/pcibios.4th
+++ b/usr/src/boot/forth/pcibios.4th
diff --git a/usr/src/boot/sys/boot/forth/pnp.4th b/usr/src/boot/forth/pnp.4th
index 8be89d8277..8be89d8277 100644
--- a/usr/src/boot/sys/boot/forth/pnp.4th
+++ b/usr/src/boot/forth/pnp.4th
diff --git a/usr/src/boot/sys/boot/forth/screen.4th b/usr/src/boot/forth/screen.4th
index fe5a684002..fe5a684002 100644
--- a/usr/src/boot/sys/boot/forth/screen.4th
+++ b/usr/src/boot/forth/screen.4th
diff --git a/usr/src/boot/sys/boot/forth/shortcuts.4th b/usr/src/boot/forth/shortcuts.4th
index 33a1cf6789..33a1cf6789 100644
--- a/usr/src/boot/sys/boot/forth/shortcuts.4th
+++ b/usr/src/boot/forth/shortcuts.4th
diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/forth/support.4th
index 961d3b528a..961d3b528a 100644
--- a/usr/src/boot/sys/boot/forth/support.4th
+++ b/usr/src/boot/forth/support.4th
diff --git a/usr/src/boot/sys/boot/forth/triton.png b/usr/src/boot/forth/triton.png
index 9b7e9a94b6..9b7e9a94b6 100644
--- a/usr/src/boot/sys/boot/forth/triton.png
+++ b/usr/src/boot/forth/triton.png
diff --git a/usr/src/boot/sys/boot/forth/version.4th b/usr/src/boot/forth/version.4th
index ee1b178c1b..ee1b178c1b 100644
--- a/usr/src/boot/sys/boot/forth/version.4th
+++ b/usr/src/boot/forth/version.4th
diff --git a/usr/src/boot/sys/boot/i386/Makefile b/usr/src/boot/i386/Makefile
index bfcf99270b..bfcf99270b 100644
--- a/usr/src/boot/sys/boot/i386/Makefile
+++ b/usr/src/boot/i386/Makefile
diff --git a/usr/src/boot/sys/boot/i386/Makefile.inc b/usr/src/boot/i386/Makefile.inc
index 028eca2b1c..6deaf96b27 100644
--- a/usr/src/boot/sys/boot/i386/Makefile.inc
+++ b/usr/src/boot/i386/Makefile.inc
@@ -13,7 +13,7 @@
 # Copyright 2015 Toomas Soome <tsoome@me.com>
 #
 
-# Common defines for all of /sys/boot/i386/
+# Common defines for all of /i386/
 
 LOADER_ADDRESS=0x200000
 CFLAGS +=	-m32
@@ -21,7 +21,7 @@ CCASFLAGS +=	-m32
 ASFLAGS +=	--32
 
 # BTX components
-BTXDIR=		$(SRC)/boot/sys/boot/i386/btx
+BTXDIR=		$(SRC)/boot/i386/btx
 BTXLDR=		${BTXDIR}/btxldr/btxldr
 BTXKERN=	${BTXDIR}/btx/btx
 BTXCRT=		${BTXDIR}/lib/crt0.o
diff --git a/usr/src/boot/sys/boot/i386/boot.ldscript b/usr/src/boot/i386/boot.ldscript
index 5e6b97b197..5e6b97b197 100644
--- a/usr/src/boot/sys/boot/i386/boot.ldscript
+++ b/usr/src/boot/i386/boot.ldscript
diff --git a/usr/src/boot/sys/boot/i386/btx/Makefile b/usr/src/boot/i386/btx/Makefile
index 7ba55cc583..7ba55cc583 100644
--- a/usr/src/boot/sys/boot/i386/btx/Makefile
+++ b/usr/src/boot/i386/btx/Makefile
diff --git a/usr/src/boot/sys/boot/i386/btx/btx/Makefile b/usr/src/boot/i386/btx/btx/Makefile
index da8b3e7d4f..2157bf721e 100644
--- a/usr/src/boot/sys/boot/i386/btx/btx/Makefile
+++ b/usr/src/boot/i386/btx/btx/Makefile
@@ -15,7 +15,7 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 include ../../Makefile.inc
 
 PROG=	btx
diff --git a/usr/src/boot/sys/boot/i386/btx/btx/btx.S b/usr/src/boot/i386/btx/btx/btx.S
index 87d09a5a1e..87d09a5a1e 100644
--- a/usr/src/boot/sys/boot/i386/btx/btx/btx.S
+++ b/usr/src/boot/i386/btx/btx/btx.S
diff --git a/usr/src/boot/sys/boot/i386/btx/btxldr/Makefile b/usr/src/boot/i386/btx/btxldr/Makefile
index c209ba4ab4..408db52b66 100644
--- a/usr/src/boot/sys/boot/i386/btx/btxldr/Makefile
+++ b/usr/src/boot/i386/btx/btxldr/Makefile
@@ -15,7 +15,7 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 include ../../Makefile.inc
 
 PROG=	btxldr
diff --git a/usr/src/boot/sys/boot/i386/btx/btxldr/btxldr.S b/usr/src/boot/i386/btx/btxldr/btxldr.S
index 1a0f5f40ff..1a0f5f40ff 100644
--- a/usr/src/boot/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/usr/src/boot/i386/btx/btxldr/btxldr.S
diff --git a/usr/src/boot/sys/boot/i386/btx/lib/Makefile b/usr/src/boot/i386/btx/lib/Makefile
index 864a519441..5986c0d63f 100644
--- a/usr/src/boot/sys/boot/i386/btx/lib/Makefile
+++ b/usr/src/boot/i386/btx/lib/Makefile
@@ -15,7 +15,7 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 include ../../Makefile.inc
 
 CPPFLAGS += -I./../../common
diff --git a/usr/src/boot/sys/boot/i386/btx/lib/btxcsu.S b/usr/src/boot/i386/btx/lib/btxcsu.S
index c46f8097db..c46f8097db 100644
--- a/usr/src/boot/sys/boot/i386/btx/lib/btxcsu.S
+++ b/usr/src/boot/i386/btx/lib/btxcsu.S
diff --git a/usr/src/boot/sys/boot/i386/btx/lib/btxsys.s b/usr/src/boot/i386/btx/lib/btxsys.s
index 9c77b4295e..9c77b4295e 100644
--- a/usr/src/boot/sys/boot/i386/btx/lib/btxsys.s
+++ b/usr/src/boot/i386/btx/lib/btxsys.s
diff --git a/usr/src/boot/sys/boot/i386/btx/lib/btxv86.h b/usr/src/boot/i386/btx/lib/btxv86.h
index a3583a04c1..a3583a04c1 100644
--- a/usr/src/boot/sys/boot/i386/btx/lib/btxv86.h
+++ b/usr/src/boot/i386/btx/lib/btxv86.h
diff --git a/usr/src/boot/sys/boot/i386/btx/lib/btxv86.s b/usr/src/boot/i386/btx/lib/btxv86.s
index 0d7d111632..0d7d111632 100644
--- a/usr/src/boot/sys/boot/i386/btx/lib/btxv86.s
+++ b/usr/src/boot/i386/btx/lib/btxv86.s
diff --git a/usr/src/boot/sys/boot/i386/cdboot/Makefile b/usr/src/boot/i386/cdboot/Makefile
index 31e684c922..ac6beb0e41 100644
--- a/usr/src/boot/sys/boot/i386/cdboot/Makefile
+++ b/usr/src/boot/i386/cdboot/Makefile
@@ -15,7 +15,7 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 include ../Makefile.inc
 
 CPPFLAGS +=	-I../common
diff --git a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S b/usr/src/boot/i386/cdboot/cdboot.S
index 3ab75c1fb2..3ab75c1fb2 100644
--- a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S
+++ b/usr/src/boot/i386/cdboot/cdboot.S
diff --git a/usr/src/boot/sys/boot/i386/common/bootargs.h b/usr/src/boot/i386/common/bootargs.h
index 0bd446e18e..0bd446e18e 100644
--- a/usr/src/boot/sys/boot/i386/common/bootargs.h
+++ b/usr/src/boot/i386/common/bootargs.h
diff --git a/usr/src/boot/sys/boot/i386/common/cons.c b/usr/src/boot/i386/common/cons.c
index c6b52b032f..c6b52b032f 100644
--- a/usr/src/boot/sys/boot/i386/common/cons.c
+++ b/usr/src/boot/i386/common/cons.c
diff --git a/usr/src/boot/sys/boot/i386/common/cons.h b/usr/src/boot/i386/common/cons.h
index 8add66fa3f..8add66fa3f 100644
--- a/usr/src/boot/sys/boot/i386/common/cons.h
+++ b/usr/src/boot/i386/common/cons.h
diff --git a/usr/src/boot/sys/boot/i386/common/drv.c b/usr/src/boot/i386/common/drv.c
index d21f069dd8..d21f069dd8 100644
--- a/usr/src/boot/sys/boot/i386/common/drv.c
+++ b/usr/src/boot/i386/common/drv.c
diff --git a/usr/src/boot/sys/boot/i386/common/drv.h b/usr/src/boot/i386/common/drv.h
index 8f2f1a8136..8f2f1a8136 100644
--- a/usr/src/boot/sys/boot/i386/common/drv.h
+++ b/usr/src/boot/i386/common/drv.h
diff --git a/usr/src/boot/sys/boot/i386/common/edd.h b/usr/src/boot/i386/common/edd.h
index 0c76e3f2c8..0c76e3f2c8 100644
--- a/usr/src/boot/sys/boot/i386/common/edd.h
+++ b/usr/src/boot/i386/common/edd.h
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile b/usr/src/boot/i386/gptzfsboot/Makefile
index c826966da5..4e457fbaf8 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
+++ b/usr/src/boot/i386/gptzfsboot/Makefile
@@ -18,7 +18,7 @@
 
 include $(SRC)/Makefile.master
 include $(SRC)/boot/Makefile.version
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
 PROG=		gptzfsboot
 MAN=		gptzfsboot.8
@@ -38,22 +38,22 @@ CPPFLAGS += -DBOOTPROG=\"gptzfsboot\" \
 	-DSIOPRT=$(BOOT_COMCONSOLE_PORT) \
 	-DSIOFMT=$(B2SIOFMT) \
 	-DSIOSPD=$(BOOT_COMCONSOLE_SPEED) \
-	-I../../../../include \
-	-I../../../../lib/libstand \
+	-I../../include \
+	-I../../libsa \
 	-I../../common \
 	-I../common \
 	-I$(ZFSSRC) \
-	-I../../../cddl/boot/zfs \
+	-I../../sys/cddl/boot/zfs \
 	-I../btx/lib -I. \
-	-I../../.. \
+	-I../../sys \
 	-I../libi386
 
 LDSCRIPT=	../boot.ldscript
 LD_FLAGS=	-static -N --gc-sections
 LIBI386=	-L ../libi386 -li386
-LIBSTAND=	-L ../../libstand/$(MACH) -lstand
+LIBSTAND=	-L ../../libsa/$(MACH) -lsa
 LIBS=		$(LIBI386) $(LIBSTAND)
-DPADD=		../libi386/libi386.a ../../libstand/$(MACH)/libstand.a
+DPADD=		../libi386/libi386.a ../../libsa/$(MACH)/libsa.a
 
 include ../Makefile.inc
 
@@ -97,11 +97,11 @@ gptzfsboot.out: $(BTXCRT) $(OBJS) $(DPADD)
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../i386/include machine
+	$(SYMLINK) ../../sys/i386/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../x86/include x86
+	$(SYMLINK) ../../sys/x86/include x86
 
 $(OBJS): machine x86
 
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/gptldr.S b/usr/src/boot/i386/gptzfsboot/gptldr.S
index 1b1fd9ba9c..1b1fd9ba9c 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/gptldr.S
+++ b/usr/src/boot/i386/gptzfsboot/gptldr.S
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/lib.h b/usr/src/boot/i386/gptzfsboot/lib.h
index d8d3317e5a..d8d3317e5a 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/lib.h
+++ b/usr/src/boot/i386/gptzfsboot/lib.h
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/sio.S b/usr/src/boot/i386/gptzfsboot/sio.S
index ca9d0a2406..ca9d0a2406 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/sio.S
+++ b/usr/src/boot/i386/gptzfsboot/sio.S
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c b/usr/src/boot/i386/gptzfsboot/zfsboot.c
index 65141c52fd..37ab14ccd9 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/zfsboot.c
+++ b/usr/src/boot/i386/gptzfsboot/zfsboot.c
@@ -141,6 +141,12 @@ struct fs_ops *file_system[] = {
 	NULL
 };
 
+caddr_t
+ptov(uintptr_t x)
+{
+	return (PTOV(x));
+}
+
 int
 main(void)
 {
diff --git a/usr/src/boot/sys/boot/i386/isoboot/Makefile b/usr/src/boot/i386/isoboot/Makefile
index 2a0992e5cc..08a803f44e 100644
--- a/usr/src/boot/sys/boot/i386/isoboot/Makefile
+++ b/usr/src/boot/i386/isoboot/Makefile
@@ -15,7 +15,7 @@
 
 include $(SRC)/Makefile.master
 include $(SRC)/boot/Makefile.version
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
 PROG= isoboot
 FILEMODE=0444
@@ -33,10 +33,10 @@ CPPFLAGS += -DBOOTPROG=\"isoboot\" \
 	-DSIOPRT=$(BOOT_COMCONSOLE_PORT) \
 	-DSIOFMT=$(B2SIOFMT) \
 	-DSIOSPD=$(BOOT_COMCONSOLE_SPEED) \
-	-I../../../../include \
-	-I../../../../lib/libstand \
+	-I../../include \
+	-I../../libsa \
 	-I. \
-	-I../../.. \
+	-I../../sys \
 	-I../common \
 	-I../btx/lib \
 	-I../../common \
@@ -44,7 +44,7 @@ CPPFLAGS += -DBOOTPROG=\"isoboot\" \
 
 LDSCRIPT=	../boot.ldscript
 LD_FLAGS=	-static -N --gc-sections
-LIBSTAND=	../../libstand/$(MACH)/libstand.a
+LIBSTAND=	../../libsa/$(MACH)/libsa.a
 
 gptldr.out := LD_FLAGS += -m elf_i386_sol2
 
@@ -84,11 +84,11 @@ isoboot.out: $(BTXCRT) $(OBJS)
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../i386/include machine
+	$(SYMLINK) ../../sys/i386/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../x86/include x86
+	$(SYMLINK) ../../sys/x86/include x86
 
 $(OBJS): machine x86
 
diff --git a/usr/src/boot/sys/boot/i386/isoboot/cd9660read.c b/usr/src/boot/i386/isoboot/cd9660read.c
index 5a4113421e..5a4113421e 100644
--- a/usr/src/boot/sys/boot/i386/isoboot/cd9660read.c
+++ b/usr/src/boot/i386/isoboot/cd9660read.c
diff --git a/usr/src/boot/sys/boot/i386/isoboot/isoboot.c b/usr/src/boot/i386/isoboot/isoboot.c
index 8e25fd55de..8e25fd55de 100644
--- a/usr/src/boot/sys/boot/i386/isoboot/isoboot.c
+++ b/usr/src/boot/i386/isoboot/isoboot.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/Makefile b/usr/src/boot/i386/libi386/Makefile
index 4b6d501c95..37dbde9d0d 100644
--- a/usr/src/boot/sys/boot/i386/libi386/Makefile
+++ b/usr/src/boot/i386/libi386/Makefile
@@ -15,9 +15,9 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
-CPPFLAGS += -I../../../../include -I../../..
+CPPFLAGS += -I../../include -I../../sys
 CPPFLAGS += -I$(ZFSSRC)
 
 all install: libi386.a
@@ -52,7 +52,6 @@ SRCS=	\
 	pxe.c \
 	pxetramp.s \
 	relocater_tramp.S \
-	smbios.c \
 	spinconsole.c \
 	time.c \
 	vbe.c \
@@ -85,7 +84,6 @@ OBJS=	\
 	pxe.o \
 	pxetramp.o \
 	relocater_tramp.o \
-	smbios.o \
 	spinconsole.o \
 	time.o \
 	vbe.o \
@@ -113,13 +111,6 @@ CPPFLAGS +=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
 # Make the disk code more talkative
 # CPPFLAGS+= -DDISK_DEBUG
 
-# Export serial numbers, UUID, and asset tag from loader.
-smbios.o := CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS
-# Use little-endian UUID format as defined in SMBIOS 2.6.
-smbios.o := CPPFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID
-# Use network-endian UUID format for backward compatibility.
-#CPPFLAGS += -DSMBIOS_NETWORK_ENDIAN_UUID
-
 # XXX: make alloca() useable
 CPPFLAGS += -Dalloca=__builtin_alloca
 
@@ -127,14 +118,14 @@ CPPFLAGS +=	-I$(SRC)/common/ficl -I../../libficl \
 		-I../../common -I../common \
 		-I../btx/lib \
 		-I$(SRC)/uts/intel/sys/acpi \
-		-I../../.. -I.
+		-I.
 # the location of libstand
-CPPFLAGS +=	-I../../../../lib/libstand/
+CPPFLAGS +=	-I../../libsa
 
-multiboot.o := CPPFLAGS += -I../../../cddl/boot/zfs
-multiboot2.o := CPPFLAGS += -I../../../cddl/boot/zfs
-devicename.o := CPPFLAGS += -I../../../cddl/boot/zfs
-devicename_stubs.o := CPPFLAGS += -I../../../cddl/boot/zfs
+multiboot.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
+multiboot2.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
+devicename.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
+devicename_stubs.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
 
 CLEANFILES +=	machine x86
 
@@ -145,11 +136,11 @@ CPPFLAGS +=	-I$(SRC)/uts/common
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../i386/include machine
+	$(SYMLINK) ../../sys/i386/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../x86/include x86
+	$(SYMLINK) ../../sys/x86/include x86
 
 $(OBJS): machine x86
 
diff --git a/usr/src/boot/sys/boot/i386/libi386/amd64_tramp.S b/usr/src/boot/i386/libi386/amd64_tramp.S
index d044c05814..d044c05814 100644
--- a/usr/src/boot/sys/boot/i386/libi386/amd64_tramp.S
+++ b/usr/src/boot/i386/libi386/amd64_tramp.S
diff --git a/usr/src/boot/sys/boot/i386/libi386/bio.c b/usr/src/boot/i386/libi386/bio.c
index 07a330a06c..07a330a06c 100644
--- a/usr/src/boot/sys/boot/i386/libi386/bio.c
+++ b/usr/src/boot/i386/libi386/bio.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosacpi.c b/usr/src/boot/i386/libi386/biosacpi.c
index a82862dd3f..a82862dd3f 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosacpi.c
+++ b/usr/src/boot/i386/libi386/biosacpi.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c b/usr/src/boot/i386/libi386/biosdisk.c
index 343b8b0df9..343b8b0df9 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
+++ b/usr/src/boot/i386/libi386/biosdisk.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosmem.c b/usr/src/boot/i386/libi386/biosmem.c
index cf13e6016c..cf13e6016c 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosmem.c
+++ b/usr/src/boot/i386/libi386/biosmem.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/biospci.c b/usr/src/boot/i386/libi386/biospci.c
index 828cc87fa1..828cc87fa1 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biospci.c
+++ b/usr/src/boot/i386/libi386/biospci.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/biospnp.c b/usr/src/boot/i386/libi386/biospnp.c
index df64ba9582..df64ba9582 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biospnp.c
+++ b/usr/src/boot/i386/libi386/biospnp.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/biossmap.c b/usr/src/boot/i386/libi386/biossmap.c
index 26adef0aa8..26adef0aa8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biossmap.c
+++ b/usr/src/boot/i386/libi386/biossmap.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/bootinfo.c b/usr/src/boot/i386/libi386/bootinfo.c
index a207545258..a207545258 100644
--- a/usr/src/boot/sys/boot/i386/libi386/bootinfo.c
+++ b/usr/src/boot/i386/libi386/bootinfo.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/bootinfo32.c b/usr/src/boot/i386/libi386/bootinfo32.c
index fda7db76ad..fda7db76ad 100644
--- a/usr/src/boot/sys/boot/i386/libi386/bootinfo32.c
+++ b/usr/src/boot/i386/libi386/bootinfo32.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/bootinfo64.c b/usr/src/boot/i386/libi386/bootinfo64.c
index 762f57eb85..762f57eb85 100644
--- a/usr/src/boot/sys/boot/i386/libi386/bootinfo64.c
+++ b/usr/src/boot/i386/libi386/bootinfo64.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/comconsole.c b/usr/src/boot/i386/libi386/comconsole.c
index 4c351d16bf..4c351d16bf 100644
--- a/usr/src/boot/sys/boot/i386/libi386/comconsole.c
+++ b/usr/src/boot/i386/libi386/comconsole.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/cpuid.c b/usr/src/boot/i386/libi386/cpuid.c
index f8116b5b40..f8116b5b40 100644
--- a/usr/src/boot/sys/boot/i386/libi386/cpuid.c
+++ b/usr/src/boot/i386/libi386/cpuid.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/devicename.c b/usr/src/boot/i386/libi386/devicename.c
index e6809109db..e6809109db 100644
--- a/usr/src/boot/sys/boot/i386/libi386/devicename.c
+++ b/usr/src/boot/i386/libi386/devicename.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/elf32_freebsd.c b/usr/src/boot/i386/libi386/elf32_freebsd.c
index 47ccf6722f..47ccf6722f 100644
--- a/usr/src/boot/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/usr/src/boot/i386/libi386/elf32_freebsd.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/elf64_freebsd.c b/usr/src/boot/i386/libi386/elf64_freebsd.c
index aa2dbb2fd8..aa2dbb2fd8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/usr/src/boot/i386/libi386/elf64_freebsd.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/i386_copy.c b/usr/src/boot/i386/libi386/i386_copy.c
index e34eddd5b0..e34eddd5b0 100644
--- a/usr/src/boot/sys/boot/i386/libi386/i386_copy.c
+++ b/usr/src/boot/i386/libi386/i386_copy.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/i386_module.c b/usr/src/boot/i386/libi386/i386_module.c
index 78ab61ba9a..78ab61ba9a 100644
--- a/usr/src/boot/sys/boot/i386/libi386/i386_module.c
+++ b/usr/src/boot/i386/libi386/i386_module.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/libi386.h b/usr/src/boot/i386/libi386/libi386.h
index 3f769ee688..3f769ee688 100644
--- a/usr/src/boot/sys/boot/i386/libi386/libi386.h
+++ b/usr/src/boot/i386/libi386/libi386.h
diff --git a/usr/src/boot/sys/boot/i386/libi386/linux.c b/usr/src/boot/i386/libi386/linux.c
index 65fc3e3e98..65fc3e3e98 100644
--- a/usr/src/boot/sys/boot/i386/libi386/linux.c
+++ b/usr/src/boot/i386/libi386/linux.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/linux.h b/usr/src/boot/i386/libi386/linux.h
index 9ca7c3d0de..9ca7c3d0de 100644
--- a/usr/src/boot/sys/boot/i386/libi386/linux.h
+++ b/usr/src/boot/i386/libi386/linux.h
diff --git a/usr/src/boot/sys/boot/i386/libi386/multiboot.c b/usr/src/boot/i386/libi386/multiboot.c
index 0474b62350..0474b62350 100644
--- a/usr/src/boot/sys/boot/i386/libi386/multiboot.c
+++ b/usr/src/boot/i386/libi386/multiboot.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/multiboot_tramp.S b/usr/src/boot/i386/libi386/multiboot_tramp.S
index 452a86bbb8..452a86bbb8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/multiboot_tramp.S
+++ b/usr/src/boot/i386/libi386/multiboot_tramp.S
diff --git a/usr/src/boot/sys/boot/i386/libi386/nullconsole.c b/usr/src/boot/i386/libi386/nullconsole.c
index 55655ab61b..55655ab61b 100644
--- a/usr/src/boot/sys/boot/i386/libi386/nullconsole.c
+++ b/usr/src/boot/i386/libi386/nullconsole.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/pread.c b/usr/src/boot/i386/libi386/pread.c
index 870e254015..870e254015 100644
--- a/usr/src/boot/sys/boot/i386/libi386/pread.c
+++ b/usr/src/boot/i386/libi386/pread.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/pxe.c b/usr/src/boot/i386/libi386/pxe.c
index 49585891bd..49585891bd 100644
--- a/usr/src/boot/sys/boot/i386/libi386/pxe.c
+++ b/usr/src/boot/i386/libi386/pxe.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/pxe.h b/usr/src/boot/i386/libi386/pxe.h
index f4bf388aa8..f4bf388aa8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/pxe.h
+++ b/usr/src/boot/i386/libi386/pxe.h
diff --git a/usr/src/boot/sys/boot/i386/libi386/pxetramp.s b/usr/src/boot/i386/libi386/pxetramp.s
index dcf1441aeb..dcf1441aeb 100644
--- a/usr/src/boot/sys/boot/i386/libi386/pxetramp.s
+++ b/usr/src/boot/i386/libi386/pxetramp.s
diff --git a/usr/src/boot/sys/boot/i386/libi386/relocater_tramp.S b/usr/src/boot/i386/libi386/relocater_tramp.S
index ad36b60873..ad36b60873 100644
--- a/usr/src/boot/sys/boot/i386/libi386/relocater_tramp.S
+++ b/usr/src/boot/i386/libi386/relocater_tramp.S
diff --git a/usr/src/boot/sys/boot/i386/libi386/spinconsole.c b/usr/src/boot/i386/libi386/spinconsole.c
index 8d4be4574f..8d4be4574f 100644
--- a/usr/src/boot/sys/boot/i386/libi386/spinconsole.c
+++ b/usr/src/boot/i386/libi386/spinconsole.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/time.c b/usr/src/boot/i386/libi386/time.c
index e6188d6543..e6188d6543 100644
--- a/usr/src/boot/sys/boot/i386/libi386/time.c
+++ b/usr/src/boot/i386/libi386/time.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/vbe.c b/usr/src/boot/i386/libi386/vbe.c
index 6cf60b5c03..6cf60b5c03 100644
--- a/usr/src/boot/sys/boot/i386/libi386/vbe.c
+++ b/usr/src/boot/i386/libi386/vbe.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/vbe.h b/usr/src/boot/i386/libi386/vbe.h
index e049af1e42..e049af1e42 100644
--- a/usr/src/boot/sys/boot/i386/libi386/vbe.h
+++ b/usr/src/boot/i386/libi386/vbe.h
diff --git a/usr/src/boot/sys/boot/i386/libi386/vidconsole.c b/usr/src/boot/i386/libi386/vidconsole.c
index 490c4571a4..490c4571a4 100644
--- a/usr/src/boot/sys/boot/i386/libi386/vidconsole.c
+++ b/usr/src/boot/i386/libi386/vidconsole.c
diff --git a/usr/src/boot/sys/boot/i386/loader/Makefile b/usr/src/boot/i386/loader/Makefile
index b68af20eaf..8a124cd603 100644
--- a/usr/src/boot/sys/boot/i386/loader/Makefile
+++ b/usr/src/boot/i386/loader/Makefile
@@ -12,14 +12,13 @@
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
 # Copyright 2016 RackTop Systems.
-# Copyright 2019 Joyent, Inc.
 #
 
 include $(SRC)/Makefile.master
 include $(SRC)/boot/Makefile.version
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
-CPPFLAGS +=	-I../../../../include -I../../..
+CPPFLAGS +=	-I../../include -I../../sys
 CPPFLAGS +=	-I$(SRC)/uts/intel/sys/acpi
 CPPFLAGS +=	-I$(ZLIB)
 LOADER=		loader
@@ -32,12 +31,7 @@ DPLIBI386=	../libi386/libi386.a
 LIBI386=	-L../libi386 -li386
 
 ROOT_BOOT=	$(ROOT)/boot
-ROOT_BOOT_DEFAULTS=	$(ROOT)/boot/defaults
-ROOT_BOOT_FORTH=	$(ROOT)/boot/forth
-ROOT_BOOT_CONF=		$(ROOT)/boot/conf.d
 ROOTBOOTFILES=$(FILES:%=$(ROOT_BOOT)/%)
-ROOTBOOTFORTH=$(FORTH:%=$(ROOT_BOOT_FORTH)/%)
-ROOTBOOTDEFAULTS=$(DEFFILES:%=$(ROOT_BOOT_DEFAULTS)/%)
 FILEMODE=0444
 
 all: $(LOADER) loader.help
@@ -94,9 +88,9 @@ LDSCRIPT=	ldscript.i386
 LDFLAGS=	-static -T $(LDSCRIPT) -N --gc-sections
 
 # i386 standalone support library
-CPPFLAGS +=	-I.. -I../../../../lib/libstand
-DPLIBSTAND=	../../libstand/$(MACH)/libstand.a
-LIBSTAND=	-L../../libstand/$(MACH) -lstand
+CPPFLAGS +=	-I.. -I../../libsa
+DPLIBSA=	../../libsa/$(MACH)/libsa.a
+LIBSA=	-L../../libsa/$(MACH) -lsa
 
 # BTX components
 CPPFLAGS +=	-I../btx/lib
@@ -107,10 +101,10 @@ CPPFLAGS +=	-I../btx/lib
 
 include ../Makefile.inc
 
-conf.o := CPPFLAGS += -I../../../cddl/boot/zfs
-multiboot2.o := CPPFLAGS += -I../../../cddl/boot/zfs
-main.o := CPPFLAGS += -I../../../cddl/boot/zfs -I$(SRC)/uts/common/fs/zfs
-zfs_cmd.o := CPPFLAGS += -I../../../cddl/boot/zfs
+conf.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
+multiboot2.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
+main.o := CPPFLAGS += -I../../sys/cddl/boot/zfs -I$(SRC)/uts/common/fs/zfs
+zfs_cmd.o := CPPFLAGS += -I../../sys/cddl/boot/zfs
 
 # For multiboot2.h, must be last, to avoid conflicts
 CPPFLAGS +=	-I$(SRC)/uts/common
@@ -131,26 +125,20 @@ loader.help: ../../common/help.common help.i386
 
 FILES=	$(LOADER) loader.help
 
-include	../../forth/Makefile.inc
-FORTH +=	pcibios.4th
-
-FILES +=	loader.rc
-FORTH +=	menu.rc
-
 # XXX crt0.o needs to be first for pxeboot(8) to work
 
-DPADD=	$(DPLIBFICL) $(DPLIBI386) $(DPLIBSTAND)
-LDADD=	$(LIBFICL) $(LIBI386) $(LIBSTAND)
+DPADD=	$(DPLIBFICL) $(DPLIBI386) $(DPLIBSA)
+LDADD=	$(LIBFICL) $(LIBI386) $(LIBSA)
 
 CLEANFILES +=	machine x86
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../i386/include machine
+	$(SYMLINK) ../../sys/i386/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../x86/include x86
+	$(SYMLINK) ../../sys/x86/include x86
 
 OBJS=		$(SRCS:%.c=%.o)
 
@@ -163,8 +151,7 @@ clean: clobber
 clobber:
 	$(RM) $(CLEANFILES) $(OBJS)
 
-install: all $(ROOT_BOOT_DEFAULTS) $(ROOT_BOOT_FORTH) \
-	$(ROOTBOOTFILES) $(ROOTBOOTDEFAULTS) $(ROOT_BOOT_CONF) $(ROOTBOOTFORTH)
+install: all $(ROOTBOOTFILES)
 
 %.o:	../../common/%.c
 	$(COMPILE.c) -o $@ $<
@@ -180,17 +167,3 @@ $(FONT).c: $(FONT_DIR)/$(FONT_SRC)
 
 $(ROOT_BOOT)/%: ../../forth/% $(ROOT_BOOT)
 	$(INS.file)
-
-$(ROOT_BOOT_DEFAULTS)/%: ../../forth/% $(ROOT_BOOT_DEFAULTS)
-	$(INS.file)
-
-$(ROOT_BOOT_FORTH)/menu.rc: ../../forth/joyent.menu.rc $(ROOT_BOOT_FORTH)
-	$(RM) $@; \
-	$(INS) -s -m $(FILEMODE) -f $(@D) ../../forth/joyent.menu.rc; \
-	$(MV) $(@D)/joyent.menu.rc $@
-
-$(ROOT_BOOT_FORTH)/%: ../../forth/% $(ROOT_BOOT_FORTH)
-	$(INS.file)
-
-$(ROOT_BOOT_DEFAULTS) $(ROOT_BOOT_CONF) $(ROOT_BOOT_FORTH):
-	$(INS.dir)
diff --git a/usr/src/boot/sys/boot/i386/loader/chain.c b/usr/src/boot/i386/loader/chain.c
index 2f32a9adf0..2f32a9adf0 100644
--- a/usr/src/boot/sys/boot/i386/loader/chain.c
+++ b/usr/src/boot/i386/loader/chain.c
diff --git a/usr/src/boot/sys/boot/i386/loader/conf.c b/usr/src/boot/i386/loader/conf.c
index d8025b3ef8..d8025b3ef8 100644
--- a/usr/src/boot/sys/boot/i386/loader/conf.c
+++ b/usr/src/boot/i386/loader/conf.c
diff --git a/usr/src/boot/sys/boot/i386/loader/help.i386 b/usr/src/boot/i386/loader/help.i386
index dc285347c3..dc285347c3 100644
--- a/usr/src/boot/sys/boot/i386/loader/help.i386
+++ b/usr/src/boot/i386/loader/help.i386
diff --git a/usr/src/boot/sys/boot/i386/loader/ldscript.i386 b/usr/src/boot/i386/loader/ldscript.i386
index 94f4bb7b07..94f4bb7b07 100644
--- a/usr/src/boot/sys/boot/i386/loader/ldscript.i386
+++ b/usr/src/boot/i386/loader/ldscript.i386
diff --git a/usr/src/boot/sys/boot/i386/loader/main.c b/usr/src/boot/i386/loader/main.c
index 2659bf577d..dc21e0d2b3 100644
--- a/usr/src/boot/sys/boot/i386/loader/main.c
+++ b/usr/src/boot/i386/loader/main.c
@@ -46,7 +46,7 @@
 #include "bootstrap.h"
 #include "common/bootargs.h"
 #include "libi386/libi386.h"
-#include "libi386/smbios.h"
+#include "smbios.h"
 #include "btxv86.h"
 #include "libzfs.h"
 
@@ -76,6 +76,12 @@ extern char _end[];
 static void *heap_top;
 static void *heap_bottom;
 
+caddr_t
+ptov(uintptr_t x)
+{
+	return (PTOV(x));
+}
+
 int
 main(void)
 {
diff --git a/usr/src/boot/sys/boot/i386/pmbr/Makefile b/usr/src/boot/i386/pmbr/Makefile
index b7905c92f2..dccd6d09f1 100644
--- a/usr/src/boot/sys/boot/i386/pmbr/Makefile
+++ b/usr/src/boot/i386/pmbr/Makefile
@@ -18,7 +18,7 @@
 # x86 EFI pmbr build rules
 #
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 include ../Makefile.inc
 
 PROG=	pmbr
diff --git a/usr/src/boot/sys/boot/i386/pmbr/pmbr.s b/usr/src/boot/i386/pmbr/pmbr.s
index e5f059e88b..e5f059e88b 100644
--- a/usr/src/boot/sys/boot/i386/pmbr/pmbr.s
+++ b/usr/src/boot/i386/pmbr/pmbr.s
diff --git a/usr/src/boot/sys/boot/i386/pxeldr/Makefile b/usr/src/boot/i386/pxeldr/Makefile
index 15661bdf23..32b6ee2f0c 100644
--- a/usr/src/boot/sys/boot/i386/pxeldr/Makefile
+++ b/usr/src/boot/i386/pxeldr/Makefile
@@ -14,13 +14,13 @@
 #
 
 include $(SRC)/Makefile.master
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
 ROOT_BOOT = $(ROOT)/boot
 
 DD=		/usr/bin/dd
 
-CPPFLAGS += -I../../..
+CPPFLAGS += -I../../sys
 CPPFLAGS += -I../common
 
 CCASFLAGS= -Wa,--divide
diff --git a/usr/src/boot/sys/boot/i386/pxeldr/pxeldr.S b/usr/src/boot/i386/pxeldr/pxeldr.S
index ee1e18a1f3..ee1e18a1f3 100644
--- a/usr/src/boot/sys/boot/i386/pxeldr/pxeldr.S
+++ b/usr/src/boot/i386/pxeldr/pxeldr.S
diff --git a/usr/src/boot/lib/libstand/mips/_setjmp.S b/usr/src/boot/lib/libstand/mips/_setjmp.S
deleted file mode 100644
index 0289b0ec92..0000000000
--- a/usr/src/boot/lib/libstand/mips/_setjmp.S
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <machine/regnum.h>
-#include <machine/asm.h>
-
-#if 0
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: _setjmp.S,v 1.6 1996/09/23 21:27:53 imp Exp $"
-#endif /* LIBC_SCCS */
-#endif
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	_setjmp(a)
- * by restoring registers from the stack,
- * The previous signal state is NOT restored.
- */
-
-LEAF(_setjmp)
-	.set	noreorder
-	REG_LI	v0, 0xACEDBADE			# sigcontext magic number
-	REG_S	ra, (2 * SZREG)(a0)		# sc_pc = return address
-	REG_S	v0, (3 * SZREG)(a0)		#   saved in sc_regs[0]
-	REG_S	s0, ((S0 + 3) * SZREG)(a0)
-	REG_S	s1, ((S1 + 3) * SZREG)(a0)
-	REG_S	s2, ((S2 + 3) * SZREG)(a0)
-	REG_S	s3, ((S3 + 3) * SZREG)(a0)
-	REG_S	s4, ((S4 + 3) * SZREG)(a0)
-	REG_S	s5, ((S5 + 3) * SZREG)(a0)
-	REG_S	s6, ((S6 + 3) * SZREG)(a0)
-	REG_S	s7, ((S7 + 3) * SZREG)(a0)
-	REG_S	sp, ((SP + 3) * SZREG)(a0)
-	REG_S	s8, ((S8 + 3) * SZREG)(a0)
-	j	ra
-	move	v0, zero
-END(_setjmp)
-
-LEAF(_longjmp)
-#ifdef ABICALLS 
-	subu	sp, sp, 32
-	.cprestore 16
-#endif  
-	.set    noreorder
-	REG_L	v0, (3 * SZREG)(a0)		# get magic number
-	REG_L	ra, (2 * SZREG)(a0)
-	bne	v0, 0xACEDBADE, botch		# jump if error
-
-	addu	sp, sp, 32			# does not matter, sanity
-	REG_L	s0, ((S0 + 3) * SZREG)(a0)
-	REG_L	s1, ((S1 + 3) * SZREG)(a0)
-	REG_L	s2, ((S2 + 3) * SZREG)(a0)
-	REG_L	s3, ((S3 + 3) * SZREG)(a0)
-	REG_L	s4, ((S4 + 3) * SZREG)(a0)
-	REG_L	s5, ((S5 + 3) * SZREG)(a0)
-	REG_L	s6, ((S6 + 3) * SZREG)(a0)
-	REG_L	s7, ((S7 + 3) * SZREG)(a0)
-	REG_L	sp, ((SP + 3) * SZREG)(a0)
-	REG_L	s8, ((S8 + 3) * SZREG)(a0)
-
-	j	ra
-	move	v0, a1
-botch:
-	jal	_C_LABEL(longjmperror)
-	nop
-	jal	_C_LABEL(abort)
-	nop
-END(_longjmp)
diff --git a/usr/src/boot/lib/libstand/powerpc/_setjmp.S b/usr/src/boot/lib/libstand/powerpc/_setjmp.S
deleted file mode 100644
index 7c7c24b123..0000000000
--- a/usr/src/boot/lib/libstand/powerpc/_setjmp.S
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$FreeBSD$  */
-/*	from:	NetBSD: setjmp.S,v 1.1 1998/01/27 15:13:12 sakamoto Exp $  */
-/*	from:	OpenBSD: setjmp.S,v 1.2 1996/12/28 06:22:18 rahnds Exp 	*/
-/* kernel version of this file, does not have signal goop */
-/* int setjmp(jmp_buf env) */
-
-#include <machine/asm.h>
-
-#ifdef __powerpc64__
-#define LD_REG	ld
-#define	ST_REG	std
-#define	REGWIDTH 8
-#else
-#define	LD_REG	lwz
-#define	ST_REG	stw
-#define	REGWIDTH 4
-#endif
-
-#define JMP_r1	1*REGWIDTH
-#define JMP_r2	2*REGWIDTH
-#define JMP_r14	3*REGWIDTH
-#define JMP_r15 4*REGWIDTH
-#define JMP_r16 5*REGWIDTH
-#define JMP_r17 6*REGWIDTH
-#define JMP_r18 7*REGWIDTH
-#define JMP_r19 8*REGWIDTH
-#define JMP_r20 9*REGWIDTH
-#define JMP_r21 10*REGWIDTH
-#define JMP_r22 11*REGWIDTH
-#define JMP_r23 12*REGWIDTH
-#define JMP_r24 13*REGWIDTH
-#define JMP_r25 14*REGWIDTH
-#define JMP_r26 15*REGWIDTH
-#define JMP_r27 16*REGWIDTH
-#define JMP_r28 17*REGWIDTH
-#define JMP_r29 18*REGWIDTH
-#define JMP_r30 19*REGWIDTH
-#define JMP_r31 20*REGWIDTH
-#define JMP_lr 	21*REGWIDTH
-#define JMP_cr	22*REGWIDTH
-#define JMP_ctr	23*REGWIDTH
-#define JMP_xer	24*REGWIDTH
-#define JMP_sig	25*REGWIDTH
-
-ASENTRY_NOPROF(_setjmp)
-	ST_REG 31, JMP_r31(3)
-	/* r1, r2, r14-r30 */
-	ST_REG 1,  JMP_r1 (3)
-	ST_REG 2,  JMP_r2 (3)
-	ST_REG 14, JMP_r14(3)
-	ST_REG 15, JMP_r15(3)
-	ST_REG 16, JMP_r16(3)
-	ST_REG 17, JMP_r17(3)
-	ST_REG 18, JMP_r18(3)
-	ST_REG 19, JMP_r19(3)
-	ST_REG 20, JMP_r20(3)
-	ST_REG 21, JMP_r21(3)
-	ST_REG 22, JMP_r22(3)
-	ST_REG 23, JMP_r23(3)
-	ST_REG 24, JMP_r24(3)
-	ST_REG 25, JMP_r25(3)
-	ST_REG 26, JMP_r26(3)
-	ST_REG 27, JMP_r27(3)
-	ST_REG 28, JMP_r28(3)
-	ST_REG 29, JMP_r29(3)
-	ST_REG 30, JMP_r30(3)
-	/* cr, lr, ctr, xer */
-	mfcr 0
-	ST_REG 0, JMP_cr(3)
-	mflr 0
-	ST_REG 0, JMP_lr(3)
-	mfctr 0
-	ST_REG 0, JMP_ctr(3)
-	mfxer 0
-	ST_REG 0, JMP_xer(3)
-	/* f14-f31, fpscr */
-	li 3, 0
-	blr
-
-
-.extern sigsetmask
-ASENTRY_NOPROF(_longjmp)
-	LD_REG 31, JMP_r31(3)
-	/* r1, r2, r14-r30 */
-	LD_REG 1,  JMP_r1 (3)
-	LD_REG 2,  JMP_r2 (3)
-	LD_REG 14, JMP_r14(3)
-	LD_REG 15, JMP_r15(3)
-	LD_REG 16, JMP_r16(3)
-	LD_REG 17, JMP_r17(3)
-	LD_REG 18, JMP_r18(3)
-	LD_REG 19, JMP_r19(3)
-	LD_REG 20, JMP_r20(3)
-	LD_REG 21, JMP_r21(3)
-	LD_REG 22, JMP_r22(3)
-	LD_REG 23, JMP_r23(3)
-	LD_REG 24, JMP_r24(3)
-	LD_REG 25, JMP_r25(3)
-	LD_REG 26, JMP_r26(3)
-	LD_REG 27, JMP_r27(3)
-	LD_REG 28, JMP_r28(3)
-	LD_REG 29, JMP_r29(3)
-	LD_REG 30, JMP_r30(3)
-	/* cr, lr, ctr, xer */
-	LD_REG 0, JMP_cr(3)
-	mtcr 0
-	LD_REG 0, JMP_lr(3)
-	mtlr 0
-	LD_REG 0, JMP_ctr(3)
-	mtctr 0
-	LD_REG 0, JMP_xer(3)
-	mtxer 0
-	/* f14-f31, fpscr */
-	mr 3, 4
-	blr
diff --git a/usr/src/boot/lib/libstand/powerpc/syncicache.c b/usr/src/boot/lib/libstand/powerpc/syncicache.c
deleted file mode 100644
index 434dcec634..0000000000
--- a/usr/src/boot/lib/libstand/powerpc/syncicache.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
- * Copyright (C) 1995-1997, 1999 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $
- */
-
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include <sys/param.h>
-#if	defined(_KERNEL) || defined(_STANDALONE)
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <vm/vm.h>
-#endif
-#include <sys/sysctl.h>
-
-#include <machine/cpu.h>
-#include <machine/md_var.h>
-
-#ifdef _STANDALONE
-int cacheline_size = 32;
-#endif
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-#include <stdlib.h>
-
-int cacheline_size = 0;
-
-static void getcachelinesize(void);
-
-static void
-getcachelinesize()
-{
-	static int	cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-	int		clen;
-
-	clen = sizeof(cacheline_size);
-
-	if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
-	    &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) {
-		abort();
-	}
-}
-#endif
-
-void
-__syncicache(void *from, int len)
-{
-	int	l, off;
-	char	*p;
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-	if (!cacheline_size)
-		getcachelinesize();
-#endif	
-
-	off = (u_int)from & (cacheline_size - 1);
-	l = len += off;
-	p = (char *)from - off;
-
-	do {
-		__asm __volatile ("dcbst 0,%0" :: "r"(p));
-		p += cacheline_size;
-	} while ((l -= cacheline_size) > 0);
-	__asm __volatile ("sync");
-	p = (char *)from - off;
-	do {
-		__asm __volatile ("icbi 0,%0" :: "r"(p));
-		p += cacheline_size;
-	} while ((len -= cacheline_size) > 0);
-	__asm __volatile ("sync; isync");
-}
-
diff --git a/usr/src/boot/lib/libstand/sparc64/_setjmp.S b/usr/src/boot/lib/libstand/sparc64/_setjmp.S
deleted file mode 100644
index 8df29e6ba7..0000000000
--- a/usr/src/boot/lib/libstand/sparc64/_setjmp.S
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Header: _setjmp.s,v 1.1 91/07/06 16:45:53 torek Exp
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	.asciz "@(#)_setjmp.s	8.1 (Berkeley) 6/4/93"
-#else
-	RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#define	_JB_FP		0x0
-#define	_JB_PC		0x8
-#define	_JB_SP		0x10
-
-	.register %g2,#ignore
-	.register %g3,#ignore
-
-/*
- * C library -- setjmp, longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from
- * the last call to
- *	setjmp(a)
- * by restoring the previous context.
- */
-
-ENTRY(_setjmp)
-	stx	%sp, [%o0 + _JB_SP]
-	stx	%o7, [%o0 + _JB_PC]
-	stx	%fp, [%o0 + _JB_FP]
-	retl
-	 clr	%o0
-END(_setjmp)
-
-ENTRY(_longjmp)
-	mov	1, %g1
-	movrnz	%o1, %o1, %g1
-	mov	%o0, %g2
-	ldx	[%g2 + _JB_FP], %g3
-1:	cmp	%fp, %g3
-	bl,a	1b
-	 restore
-	be,a	2f
-	 ldx	[%g2 + _JB_SP], %o0
-
-.Lbotch:
-	illtrap
-
-2:	cmp	%o0, %sp
-	bge,a	3f
-	 mov	%o0, %sp
-	b,a	.Lbotch
-	 nop
-3:	ldx	[%g2 + _JB_PC], %o7
-	retl
-	 mov	%g1, %o0
-END(_longjmp)
diff --git a/usr/src/boot/sys/boot/libficl/Makefile b/usr/src/boot/libficl/Makefile
index 97b7bb80f0..97b7bb80f0 100644
--- a/usr/src/boot/sys/boot/libficl/Makefile
+++ b/usr/src/boot/libficl/Makefile
diff --git a/usr/src/boot/sys/boot/libficl/Makefile.com b/usr/src/boot/libficl/Makefile.com
index 564403516d..822e5d79fe 100644
--- a/usr/src/boot/sys/boot/libficl/Makefile.com
+++ b/usr/src/boot/libficl/Makefile.com
@@ -13,15 +13,15 @@
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
 
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
 FICLDIR=	$(SRC)/common/ficl
 PNGLITE=	$(SRC)/common/pnglite
 
 CPPFLAGS += -I. -I..
-CPPFLAGS += -I../../..
-CPPFLAGS += -I../../../../include
-CPPFLAGS += -I../../../../lib/libstand
+CPPFLAGS += -I../../sys
+CPPFLAGS += -I../../include
+CPPFLAGS += -I../../libsa
 CPPFLAGS += -I$(FICLDIR) -I../../common -I$(PNGLITE)
 
 # For multiboot2.h, must be last, to avoid conflicts
@@ -45,11 +45,11 @@ pics/vm.o := CFLAGS += -_gcc=-Wno-clobbered
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../$(MACHINE)/include machine
+	$(SYMLINK) ../../sys/$(MACHINE)/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../x86/include x86
+	$(SYMLINK) ../../sys/x86/include x86
 
 objs/%.o pics/%.o:	../softcore/%.c $(HEADERS)
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/boot/sys/boot/libficl/amd64/Makefile b/usr/src/boot/libficl/amd64/Makefile
index 2f006575f7..028e60868e 100644
--- a/usr/src/boot/sys/boot/libficl/amd64/Makefile
+++ b/usr/src/boot/libficl/amd64/Makefile
@@ -25,6 +25,6 @@ include ../Makefile.com
 
 CFLAGS += -m64 $(CFLAGS64)
 
-include $(SRC)/boot/sys/boot/Makefile.lib
+include $(BOOTSRC)/Makefile.lib
 
 FRC:
diff --git a/usr/src/boot/sys/boot/libficl/ficllocal.h b/usr/src/boot/libficl/ficllocal.h
index 964cd79780..964cd79780 100644
--- a/usr/src/boot/sys/boot/libficl/ficllocal.h
+++ b/usr/src/boot/libficl/ficllocal.h
diff --git a/usr/src/boot/sys/boot/libficl/i386/Makefile b/usr/src/boot/libficl/i386/Makefile
index 6ad5f9467d..73d2c963f0 100644
--- a/usr/src/boot/sys/boot/libficl/i386/Makefile
+++ b/usr/src/boot/libficl/i386/Makefile
@@ -26,6 +26,6 @@ include ../Makefile.com
 
 CFLAGS += -m32
 
-include $(SRC)/boot/sys/boot/Makefile.lib
+include $(BOOTSRC)/Makefile.lib
 
 FRC:
diff --git a/usr/src/boot/sys/boot/libficl/softcore/Makefile b/usr/src/boot/libficl/softcore/Makefile
index 7b42031180..7b42031180 100644
--- a/usr/src/boot/sys/boot/libficl/softcore/Makefile
+++ b/usr/src/boot/libficl/softcore/Makefile
diff --git a/usr/src/boot/sys/boot/libstand/Makefile b/usr/src/boot/libsa/Makefile
index 01b0b02cab..01b0b02cab 100644
--- a/usr/src/boot/sys/boot/libstand/Makefile
+++ b/usr/src/boot/libsa/Makefile
diff --git a/usr/src/boot/sys/boot/libstand/Makefile.com b/usr/src/boot/libsa/Makefile.com
index d282deedaa..3d5291e961 100644
--- a/usr/src/boot/sys/boot/libstand/Makefile.com
+++ b/usr/src/boot/libsa/Makefile.com
@@ -14,10 +14,10 @@
 # Copyright 2019 Joyent, Inc.
 #
 
-include $(SRC)/boot/sys/boot/Makefile.inc
+include $(SRC)/boot/Makefile.inc
 
-CPPFLAGS +=	-I../../../../include -I$(SASRC)
-CPPFLAGS +=	-I../../.. -I.
+CPPFLAGS +=	-I../../include -I$(SASRC)
+CPPFLAGS +=	-I../../sys -I.
 
 include $(SASRC)/Makefile.inc
 include $(CRYPTOSRC)/Makefile.inc
@@ -34,11 +34,11 @@ pics/printf.o := SMOFF += 64bit_shift
 
 machine:
 	$(RM) machine
-	$(SYMLINK) ../../../$(MACHINE)/include machine
+	$(SYMLINK) ../../sys/$(MACHINE)/include machine
 
 x86:
 	$(RM) x86
-	$(SYMLINK) ../../../x86/include x86
+	$(SYMLINK) ../../sys/x86/include x86
 
 pics/%.o objs/%.o:	%.c
 	$(COMPILE.c) -o $@ $<
@@ -46,13 +46,10 @@ pics/%.o objs/%.o:	%.c
 pics/%.o objs/%.o:	$(SASRC)/%.c
 	$(COMPILE.c) -o $@ $<
 
-pics/%.o objs/%.o:	$(LIBSRC)/libc/net/%.c
+pics/%.o objs/%.o:	$(SASRC)/string/%.c
 	$(COMPILE.c) -o $@ $<
 
-pics/%.o objs/%.o:	$(LIBSRC)/libc/string/%.c
-	$(COMPILE.c) -o $@ $<
-
-pics/%.o objs/%.o:	$(LIBSRC)/libc/uuid/%.c
+pics/%.o objs/%.o:	$(SASRC)/uuid/%.c
 	$(COMPILE.c) -o $@ $<
 
 pics/%.o objs/%.o:	$(ZLIB)/%.c
diff --git a/usr/src/boot/lib/libstand/Makefile.inc b/usr/src/boot/libsa/Makefile.inc
index 2acb9ef490..3ca6522785 100644
--- a/usr/src/boot/lib/libstand/Makefile.inc
+++ b/usr/src/boot/libsa/Makefile.inc
@@ -38,26 +38,26 @@ SRCS +=	$(SASRC)/strcasecmp.c
 OBJECTS += strcasecmp.o
 
 # from libc
-SRCS += $(LIBSRC)/libc/net/ntoh.c
+SRCS += $(SASRC)/ntoh.c
 OBJECTS += ntoh.o
 
 # string functions from libc
-SRCS +=	$(LIBSRC)/libc/string/bcmp.c $(LIBSRC)/libc/string/bcopy.c
-SRCS +=	$(LIBSRC)/libc/string/bzero.c $(LIBSRC)/libc/string/ffs.c
-SRCS +=	$(LIBSRC)/libc/string/fls.c $(LIBSRC)/libc/string/memccpy.c
-SRCS +=	$(LIBSRC)/libc/string/memchr.c $(LIBSRC)/libc/string/memcmp.c
-SRCS +=	$(LIBSRC)/libc/string/memcpy.c $(LIBSRC)/libc/string/memmove.c
-SRCS +=	$(LIBSRC)/libc/string/memset.c $(LIBSRC)/libc/string/strcat.c
-SRCS +=	$(LIBSRC)/libc/string/strchr.c $(LIBSRC)/libc/string/strcmp.c
-SRCS +=	$(LIBSRC)/libc/string/strcpy.c $(LIBSRC)/libc/string/stpcpy.c
-SRCS +=	$(LIBSRC)/libc/string/stpncpy.c $(LIBSRC)/libc/string/strcspn.c
-SRCS +=	$(LIBSRC)/libc/string/strlcat.c $(LIBSRC)/libc/string/strlcpy.c
-SRCS +=	$(LIBSRC)/libc/string/strlen.c $(LIBSRC)/libc/string/strncat.c
-SRCS +=	$(LIBSRC)/libc/string/strncmp.c $(LIBSRC)/libc/string/strncpy.c
-SRCS +=	$(LIBSRC)/libc/string/strpbrk.c $(LIBSRC)/libc/string/strrchr.c
-SRCS +=	$(LIBSRC)/libc/string/strsep.c $(LIBSRC)/libc/string/strspn.c
-SRCS +=	$(LIBSRC)/libc/string/strstr.c $(LIBSRC)/libc/string/strtok.c
-SRCS +=	$(LIBSRC)/libc/string/swab.c
+SRCS +=	$(SASRC)/string/bcmp.c $(SASRC)/string/bcopy.c
+SRCS +=	$(SASRC)/string/bzero.c $(SASRC)/string/ffs.c
+SRCS +=	$(SASRC)/string/fls.c $(SASRC)/string/memccpy.c
+SRCS +=	$(SASRC)/string/memchr.c $(SASRC)/string/memcmp.c
+SRCS +=	$(SASRC)/string/memcpy.c $(SASRC)/string/memmove.c
+SRCS +=	$(SASRC)/string/memset.c $(SASRC)/string/strcat.c
+SRCS +=	$(SASRC)/string/strchr.c $(SASRC)/string/strcmp.c
+SRCS +=	$(SASRC)/string/strcpy.c $(SASRC)/string/stpcpy.c
+SRCS +=	$(SASRC)/string/stpncpy.c $(SASRC)/string/strcspn.c
+SRCS +=	$(SASRC)/string/strlcat.c $(SASRC)/string/strlcpy.c
+SRCS +=	$(SASRC)/string/strlen.c $(SASRC)/string/strncat.c
+SRCS +=	$(SASRC)/string/strncmp.c $(SASRC)/string/strncpy.c
+SRCS +=	$(SASRC)/string/strpbrk.c $(SASRC)/string/strrchr.c
+SRCS +=	$(SASRC)/string/strsep.c $(SASRC)/string/strspn.c
+SRCS +=	$(SASRC)/string/strstr.c $(SASRC)/string/strtok.c
+SRCS +=	$(SASRC)/string/swab.c
 
 SRCS += $(SASRC)/qdivrem.c
 
@@ -68,9 +68,9 @@ OBJECTS += bcmp.o bcopy.o bzero.o ffs.o fls.o \
 	strpbrk.o strrchr.o strsep.o strspn.o strstr.o strtok.o swab.o
 
 # uuid functions from libc
-SRCS += $(LIBSRC)/libc/uuid/uuid_create_nil.c
-SRCS += $(LIBSRC)/libc/uuid/uuid_equal.c
-SRCS += $(LIBSRC)/libc/uuid/uuid_is_nil.c
+SRCS += $(SASRC)/uuid/uuid_create_nil.c
+SRCS += $(SASRC)/uuid/uuid_equal.c
+SRCS += $(SASRC)/uuid/uuid_is_nil.c
 
 SRCS += $(SASRC)/uuid_from_string.c
 SRCS += $(SASRC)/uuid_to_string.c
@@ -235,6 +235,14 @@ SRCS +=	$(SASRC)/closeall.c $(SASRC)/dev.c \
 OBJECTS += closeall.o dev.o ioctl.o nullfs.o stat.o fstat.o close.o lseek.o \
 	open.o read.o write.o readdir.o
 
+# SMBios routines
+SRCS += smbios.c
+OBJECTS += smbios.o
+# Export serial numbers, UUID, and asset tag from loader.
+# Use little-endian UUID format as defined in SMBIOS 2.6.
+pics/smbios.o := CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS -DSMBIOS_LITTLE_ENDIAN_UUID
+objs/smbios.o := CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS -DSMBIOS_LITTLE_ENDIAN_UUID
+
 # network routines
 SRCS +=	$(SASRC)/arp.c $(SASRC)/ether.c $(SASRC)/ip.c \
 	$(SASRC)/inet_ntoa.c $(SASRC)/in_cksum.c \
diff --git a/usr/src/boot/lib/libstand/__main.c b/usr/src/boot/libsa/__main.c
index e38f33865c..e38f33865c 100644
--- a/usr/src/boot/lib/libstand/__main.c
+++ b/usr/src/boot/libsa/__main.c
diff --git a/usr/src/boot/lib/libstand/abort.c b/usr/src/boot/libsa/abort.c
index 663555a333..663555a333 100644
--- a/usr/src/boot/lib/libstand/abort.c
+++ b/usr/src/boot/libsa/abort.c
diff --git a/usr/src/boot/sys/boot/libstand/amd64/Makefile b/usr/src/boot/libsa/amd64/Makefile
index e79d2deef5..39eaf206e7 100644
--- a/usr/src/boot/sys/boot/libstand/amd64/Makefile
+++ b/usr/src/boot/libsa/amd64/Makefile
@@ -17,7 +17,7 @@
 include $(SRC)/Makefile.master
 
 MACHINE=	$(MACH64)
-DYNLIB=		libstand_pics.a
+DYNLIB=		libsa_pics.a
 
 all install:    $(DYNLIB)
 
@@ -44,6 +44,6 @@ pics/%.o: $(SASRC)/amd64/%.S
 pics/%.o: $(SASRC)/x86/%.c
 	$(COMPILE.c) -o $@ $<
 
-include $(SRC)/boot/sys/boot/Makefile.lib
+include $(BOOTSRC)/Makefile.lib
 
 FRC:
diff --git a/usr/src/boot/lib/libstand/amd64/_setjmp.S b/usr/src/boot/libsa/amd64/_setjmp.S
index 6d9a5fa13f..6d9a5fa13f 100644
--- a/usr/src/boot/lib/libstand/amd64/_setjmp.S
+++ b/usr/src/boot/libsa/amd64/_setjmp.S
diff --git a/usr/src/boot/lib/libstand/arp.c b/usr/src/boot/libsa/arp.c
index d55595d8ff..d55595d8ff 100644
--- a/usr/src/boot/lib/libstand/arp.c
+++ b/usr/src/boot/libsa/arp.c
diff --git a/usr/src/boot/lib/libstand/assert.c b/usr/src/boot/libsa/assert.c
index 7ed70d70ee..7ed70d70ee 100644
--- a/usr/src/boot/lib/libstand/assert.c
+++ b/usr/src/boot/libsa/assert.c
diff --git a/usr/src/boot/lib/libstand/bcd.c b/usr/src/boot/libsa/bcd.c
index 7bd67c9162..7bd67c9162 100644
--- a/usr/src/boot/lib/libstand/bcd.c
+++ b/usr/src/boot/libsa/bcd.c
diff --git a/usr/src/boot/lib/libstand/bootp.c b/usr/src/boot/libsa/bootp.c
index 080e90d7a5..080e90d7a5 100644
--- a/usr/src/boot/lib/libstand/bootp.c
+++ b/usr/src/boot/libsa/bootp.c
diff --git a/usr/src/boot/lib/libstand/bootp.h b/usr/src/boot/libsa/bootp.h
index b26a5cd45c..b26a5cd45c 100644
--- a/usr/src/boot/lib/libstand/bootp.h
+++ b/usr/src/boot/libsa/bootp.h
diff --git a/usr/src/boot/lib/libstand/bootparam.c b/usr/src/boot/libsa/bootparam.c
index 2f86f52257..2f86f52257 100644
--- a/usr/src/boot/lib/libstand/bootparam.c
+++ b/usr/src/boot/libsa/bootparam.c
diff --git a/usr/src/boot/lib/libstand/bootparam.h b/usr/src/boot/libsa/bootparam.h
index 6f0c773a07..6f0c773a07 100644
--- a/usr/src/boot/lib/libstand/bootparam.h
+++ b/usr/src/boot/libsa/bootparam.h
diff --git a/usr/src/boot/lib/libstand/bzipfs.c b/usr/src/boot/libsa/bzipfs.c
index 1c2cc39904..1c2cc39904 100644
--- a/usr/src/boot/lib/libstand/bzipfs.c
+++ b/usr/src/boot/libsa/bzipfs.c
diff --git a/usr/src/boot/lib/libstand/cd9660.c b/usr/src/boot/libsa/cd9660.c
index a17146fce5..a17146fce5 100644
--- a/usr/src/boot/lib/libstand/cd9660.c
+++ b/usr/src/boot/libsa/cd9660.c
diff --git a/usr/src/boot/lib/libstand/close.c b/usr/src/boot/libsa/close.c
index 546dd98600..546dd98600 100644
--- a/usr/src/boot/lib/libstand/close.c
+++ b/usr/src/boot/libsa/close.c
diff --git a/usr/src/boot/lib/libstand/closeall.c b/usr/src/boot/libsa/closeall.c
index 425cd334b7..425cd334b7 100644
--- a/usr/src/boot/lib/libstand/closeall.c
+++ b/usr/src/boot/libsa/closeall.c
diff --git a/usr/src/boot/lib/libstand/crypto/Makefile.inc b/usr/src/boot/libsa/crypto/Makefile.inc
index 3cff3ecdb6..3cff3ecdb6 100644
--- a/usr/src/boot/lib/libstand/crypto/Makefile.inc
+++ b/usr/src/boot/libsa/crypto/Makefile.inc
diff --git a/usr/src/boot/lib/libstand/crypto/digest.c b/usr/src/boot/libsa/crypto/digest.c
index 7a1bd841b1..7a1bd841b1 100644
--- a/usr/src/boot/lib/libstand/crypto/digest.c
+++ b/usr/src/boot/libsa/crypto/digest.c
diff --git a/usr/src/boot/lib/libstand/crypto/libcrypto.h b/usr/src/boot/libsa/crypto/libcrypto.h
index b00373f6ab..b00373f6ab 100644
--- a/usr/src/boot/lib/libstand/crypto/libcrypto.h
+++ b/usr/src/boot/libsa/crypto/libcrypto.h
diff --git a/usr/src/boot/lib/libstand/dev.c b/usr/src/boot/libsa/dev.c
index 89d7867ec6..89d7867ec6 100644
--- a/usr/src/boot/lib/libstand/dev.c
+++ b/usr/src/boot/libsa/dev.c
diff --git a/usr/src/boot/lib/libstand/dosfs.c b/usr/src/boot/libsa/dosfs.c
index d4bc2c9834..d4bc2c9834 100644
--- a/usr/src/boot/lib/libstand/dosfs.c
+++ b/usr/src/boot/libsa/dosfs.c
diff --git a/usr/src/boot/lib/libstand/dosfs.h b/usr/src/boot/libsa/dosfs.h
index 0915c70930..0915c70930 100644
--- a/usr/src/boot/lib/libstand/dosfs.h
+++ b/usr/src/boot/libsa/dosfs.h
diff --git a/usr/src/boot/lib/libstand/environment.c b/usr/src/boot/libsa/environment.c
index d3130d292e..d3130d292e 100644
--- a/usr/src/boot/lib/libstand/environment.c
+++ b/usr/src/boot/libsa/environment.c
diff --git a/usr/src/boot/lib/libstand/ether.c b/usr/src/boot/libsa/ether.c
index 798886ebb4..798886ebb4 100644
--- a/usr/src/boot/lib/libstand/ether.c
+++ b/usr/src/boot/libsa/ether.c
diff --git a/usr/src/boot/lib/libstand/ext2fs.c b/usr/src/boot/libsa/ext2fs.c
index d0b91e0446..d0b91e0446 100644
--- a/usr/src/boot/lib/libstand/ext2fs.c
+++ b/usr/src/boot/libsa/ext2fs.c
diff --git a/usr/src/boot/lib/libstand/fstat.c b/usr/src/boot/libsa/fstat.c
index 44030d085e..44030d085e 100644
--- a/usr/src/boot/lib/libstand/fstat.c
+++ b/usr/src/boot/libsa/fstat.c
diff --git a/usr/src/boot/lib/libstand/getopt.c b/usr/src/boot/libsa/getopt.c
index ead2ee5626..ead2ee5626 100644
--- a/usr/src/boot/lib/libstand/getopt.c
+++ b/usr/src/boot/libsa/getopt.c
diff --git a/usr/src/boot/lib/libstand/gets.c b/usr/src/boot/libsa/gets.c
index 781e161edb..781e161edb 100644
--- a/usr/src/boot/lib/libstand/gets.c
+++ b/usr/src/boot/libsa/gets.c
diff --git a/usr/src/boot/lib/libstand/globals.c b/usr/src/boot/libsa/globals.c
index 81453c3dd0..81453c3dd0 100644
--- a/usr/src/boot/lib/libstand/globals.c
+++ b/usr/src/boot/libsa/globals.c
diff --git a/usr/src/boot/lib/libstand/gzipfs.c b/usr/src/boot/libsa/gzipfs.c
index c6c7b206e6..c6c7b206e6 100644
--- a/usr/src/boot/lib/libstand/gzipfs.c
+++ b/usr/src/boot/libsa/gzipfs.c
diff --git a/usr/src/boot/sys/boot/libstand/i386/Makefile b/usr/src/boot/libsa/i386/Makefile
index 7902d44a86..091c1ab256 100644
--- a/usr/src/boot/sys/boot/libstand/i386/Makefile
+++ b/usr/src/boot/libsa/i386/Makefile
@@ -17,8 +17,8 @@
 include $(SRC)/Makefile.master
 
 MACHINE=	$(MACH)
-LIBRARY=	libstand.a
-DYNLIB=		libstand_pics.a
+LIBRARY=	libsa.a
+DYNLIB=		libsa_pics.a
 
 all install:	$(LIBRARY) $(DYNLIB)
 
@@ -40,6 +40,6 @@ pics/%.o objs/%.o: $(SASRC)/i386/%.S
 pics/%.o objs/%.o: $(SASRC)/x86/%.c
 	$(COMPILE.c) -o $@ $<
 
-include $(SRC)/boot/sys/boot/Makefile.lib
+include $(BOOTSRC)/Makefile.lib
 
 FRC:
diff --git a/usr/src/boot/lib/libstand/i386/_setjmp.S b/usr/src/boot/libsa/i386/_setjmp.S
index 95b0ea8037..95b0ea8037 100644
--- a/usr/src/boot/lib/libstand/i386/_setjmp.S
+++ b/usr/src/boot/libsa/i386/_setjmp.S
diff --git a/usr/src/boot/lib/libstand/in_cksum.c b/usr/src/boot/libsa/in_cksum.c
index 7551d65dbe..7551d65dbe 100644
--- a/usr/src/boot/lib/libstand/in_cksum.c
+++ b/usr/src/boot/libsa/in_cksum.c
diff --git a/usr/src/boot/lib/libstand/inet_ntoa.c b/usr/src/boot/libsa/inet_ntoa.c
index 7aa01c6124..7aa01c6124 100644
--- a/usr/src/boot/lib/libstand/inet_ntoa.c
+++ b/usr/src/boot/libsa/inet_ntoa.c
diff --git a/usr/src/boot/lib/libstand/ioctl.c b/usr/src/boot/libsa/ioctl.c
index 67c95c77d6..67c95c77d6 100644
--- a/usr/src/boot/lib/libstand/ioctl.c
+++ b/usr/src/boot/libsa/ioctl.c
diff --git a/usr/src/boot/lib/libstand/iodesc.h b/usr/src/boot/libsa/iodesc.h
index 2086c586d2..2086c586d2 100644
--- a/usr/src/boot/lib/libstand/iodesc.h
+++ b/usr/src/boot/libsa/iodesc.h
diff --git a/usr/src/boot/lib/libstand/ip.c b/usr/src/boot/libsa/ip.c
index ab3cd36591..ab3cd36591 100644
--- a/usr/src/boot/lib/libstand/ip.c
+++ b/usr/src/boot/libsa/ip.c
diff --git a/usr/src/boot/lib/libstand/lseek.c b/usr/src/boot/libsa/lseek.c
index eb063394a1..eb063394a1 100644
--- a/usr/src/boot/lib/libstand/lseek.c
+++ b/usr/src/boot/libsa/lseek.c
diff --git a/usr/src/boot/lib/libstand/net.c b/usr/src/boot/libsa/net.c
index eea4b8a9d8..eea4b8a9d8 100644
--- a/usr/src/boot/lib/libstand/net.c
+++ b/usr/src/boot/libsa/net.c
diff --git a/usr/src/boot/lib/libstand/net.h b/usr/src/boot/libsa/net.h
index 93ab8d84e7..93ab8d84e7 100644
--- a/usr/src/boot/lib/libstand/net.h
+++ b/usr/src/boot/libsa/net.h
diff --git a/usr/src/boot/lib/libstand/netif.c b/usr/src/boot/libsa/netif.c
index 74364e9098..74364e9098 100644
--- a/usr/src/boot/lib/libstand/netif.c
+++ b/usr/src/boot/libsa/netif.c
diff --git a/usr/src/boot/lib/libstand/netif.h b/usr/src/boot/libsa/netif.h
index 44165ab0d8..44165ab0d8 100644
--- a/usr/src/boot/lib/libstand/netif.h
+++ b/usr/src/boot/libsa/netif.h
diff --git a/usr/src/boot/lib/libstand/nfs.c b/usr/src/boot/libsa/nfs.c
index f10abf1e26..f10abf1e26 100644
--- a/usr/src/boot/lib/libstand/nfs.c
+++ b/usr/src/boot/libsa/nfs.c
diff --git a/usr/src/boot/lib/libstand/nfsv2.h b/usr/src/boot/libsa/nfsv2.h
index 09b2428b80..09b2428b80 100644
--- a/usr/src/boot/lib/libstand/nfsv2.h
+++ b/usr/src/boot/libsa/nfsv2.h
diff --git a/usr/src/boot/lib/libc/net/ntoh.c b/usr/src/boot/libsa/ntoh.c
index d658c90b68..d658c90b68 100644
--- a/usr/src/boot/lib/libc/net/ntoh.c
+++ b/usr/src/boot/libsa/ntoh.c
diff --git a/usr/src/boot/lib/libstand/nullfs.c b/usr/src/boot/libsa/nullfs.c
index 91fe6efb2c..91fe6efb2c 100644
--- a/usr/src/boot/lib/libstand/nullfs.c
+++ b/usr/src/boot/libsa/nullfs.c
diff --git a/usr/src/boot/lib/libstand/open.c b/usr/src/boot/libsa/open.c
index 6d026f1ca6..6d026f1ca6 100644
--- a/usr/src/boot/lib/libstand/open.c
+++ b/usr/src/boot/libsa/open.c
diff --git a/usr/src/boot/lib/libstand/pager.c b/usr/src/boot/libsa/pager.c
index bbc0c8e0b0..bbc0c8e0b0 100644
--- a/usr/src/boot/lib/libstand/pager.c
+++ b/usr/src/boot/libsa/pager.c
diff --git a/usr/src/boot/lib/libstand/panic.c b/usr/src/boot/libsa/panic.c
index 8a3730ce6b..8a3730ce6b 100644
--- a/usr/src/boot/lib/libstand/panic.c
+++ b/usr/src/boot/libsa/panic.c
diff --git a/usr/src/boot/lib/libstand/pkgfs.c b/usr/src/boot/libsa/pkgfs.c
index fda7f60708..fda7f60708 100644
--- a/usr/src/boot/lib/libstand/pkgfs.c
+++ b/usr/src/boot/libsa/pkgfs.c
diff --git a/usr/src/boot/lib/libstand/printf.c b/usr/src/boot/libsa/printf.c
index 55a1c7aad2..55a1c7aad2 100644
--- a/usr/src/boot/lib/libstand/printf.c
+++ b/usr/src/boot/libsa/printf.c
diff --git a/usr/src/boot/lib/libstand/qdivrem.c b/usr/src/boot/libsa/qdivrem.c
index 294e360488..294e360488 100644
--- a/usr/src/boot/lib/libstand/qdivrem.c
+++ b/usr/src/boot/libsa/qdivrem.c
diff --git a/usr/src/boot/lib/libstand/quad.h b/usr/src/boot/libsa/quad.h
index 26c5d8c2b7..26c5d8c2b7 100644
--- a/usr/src/boot/lib/libstand/quad.h
+++ b/usr/src/boot/libsa/quad.h
diff --git a/usr/src/boot/lib/libstand/random.c b/usr/src/boot/libsa/random.c
index 1547078b42..1547078b42 100644
--- a/usr/src/boot/lib/libstand/random.c
+++ b/usr/src/boot/libsa/random.c
diff --git a/usr/src/boot/lib/libstand/rarp.c b/usr/src/boot/libsa/rarp.c
index f7a624d08c..f7a624d08c 100644
--- a/usr/src/boot/lib/libstand/rarp.c
+++ b/usr/src/boot/libsa/rarp.c
diff --git a/usr/src/boot/lib/libstand/read.c b/usr/src/boot/libsa/read.c
index ebbc082705..ebbc082705 100644
--- a/usr/src/boot/lib/libstand/read.c
+++ b/usr/src/boot/libsa/read.c
diff --git a/usr/src/boot/lib/libstand/readdir.c b/usr/src/boot/libsa/readdir.c
index 6920f5b5fe..6920f5b5fe 100644
--- a/usr/src/boot/lib/libstand/readdir.c
+++ b/usr/src/boot/libsa/readdir.c
diff --git a/usr/src/boot/lib/libstand/rpc.c b/usr/src/boot/libsa/rpc.c
index ed5c9fc5cb..ed5c9fc5cb 100644
--- a/usr/src/boot/lib/libstand/rpc.c
+++ b/usr/src/boot/libsa/rpc.c
diff --git a/usr/src/boot/lib/libstand/rpc.h b/usr/src/boot/libsa/rpc.h
index 5efe832101..5efe832101 100644
--- a/usr/src/boot/lib/libstand/rpc.h
+++ b/usr/src/boot/libsa/rpc.h
diff --git a/usr/src/boot/lib/libstand/rpcv2.h b/usr/src/boot/libsa/rpcv2.h
index 4f1f016333..4f1f016333 100644
--- a/usr/src/boot/lib/libstand/rpcv2.h
+++ b/usr/src/boot/libsa/rpcv2.h
diff --git a/usr/src/boot/lib/libstand/saioctl.h b/usr/src/boot/libsa/saioctl.h
index 5124f86187..5124f86187 100644
--- a/usr/src/boot/lib/libstand/saioctl.h
+++ b/usr/src/boot/libsa/saioctl.h
diff --git a/usr/src/boot/lib/libstand/sbrk.c b/usr/src/boot/libsa/sbrk.c
index fb2dab1d44..fb2dab1d44 100644
--- a/usr/src/boot/lib/libstand/sbrk.c
+++ b/usr/src/boot/libsa/sbrk.c
diff --git a/usr/src/boot/sys/boot/i386/libi386/smbios.c b/usr/src/boot/libsa/smbios.c
index 148c6cf1fe..d3d6433c92 100644
--- a/usr/src/boot/sys/boot/i386/libi386/smbios.c
+++ b/usr/src/boot/libsa/smbios.c
@@ -27,15 +27,8 @@
 #include <sys/cdefs.h>
 
 #include <stand.h>
-#include <bootstrap.h>
 #include <sys/endian.h>
 
-#ifdef EFI
-/* In EFI, we don't need PTOV(). */
-#define PTOV(x)		(caddr_t)(x)
-#else
-#include "btxv86.h"
-#endif
 #include "smbios.h"
 
 /*
@@ -139,7 +132,7 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len)
 				smbios.minor = SMBIOS_GET8(cp, 0x07);
 			}
 			smbios.ver = (smbios.major << 8) | smbios.minor;
-			smbios.addr = PTOV(paddr);
+			smbios.addr = ptov(paddr);
 			return (cp);
 		}
 #ifdef _LP64
@@ -164,7 +157,7 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len)
 			smbios.length = SMBIOS_GET32(cp, 0x0c);
 			/* Structure Table Address */
 			paddr = SMBIOS_GET64(cp, 0x10);
-			smbios.addr = PTOV(paddr);
+			smbios.addr = ptov(paddr);
 			/*
 			 * Calculate upper limit for structure count,
 			 * use size of table header (4 bytes).
@@ -425,7 +418,7 @@ static void
 smbios_probe(const caddr_t addr)
 {
 	caddr_t		info;
-	const caddr_t	paddr = addr != NULL ? addr : PTOV(SMBIOS_START);
+	const caddr_t	paddr = addr != NULL ? addr : ptov(SMBIOS_START);
 
 	if (smbios.probed)
 		return;
diff --git a/usr/src/boot/sys/boot/i386/libi386/smbios.h b/usr/src/boot/libsa/smbios.h
index 03fc07e293..a39d08e98a 100644
--- a/usr/src/boot/sys/boot/i386/libi386/smbios.h
+++ b/usr/src/boot/libsa/smbios.h
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 2015 Rui Paulo <rpaulo@FreeBSD.org>
  * All rights reserved.
  *
@@ -22,8 +22,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 #ifndef _SMBIOS_H_
 #define	_SMBIOS_H_
diff --git a/usr/src/boot/lib/libstand/splitfs.c b/usr/src/boot/libsa/splitfs.c
index af28704bc4..af28704bc4 100644
--- a/usr/src/boot/lib/libstand/splitfs.c
+++ b/usr/src/boot/libsa/splitfs.c
diff --git a/usr/src/boot/lib/libstand/stand.h b/usr/src/boot/libsa/stand.h
index 14270065e9..98ff151e0a 100644
--- a/usr/src/boot/lib/libstand/stand.h
+++ b/usr/src/boot/libsa/stand.h
@@ -458,4 +458,9 @@ void Free(void *, const char *, int);
 #define	reallocf(x, y)	Reallocf(x, y, NULL, 0)
 #endif
 
+/*
+ * va <-> pa routines. MD code must supply.
+ */
+caddr_t ptov(uintptr_t);
+
 #endif	/* STAND_H */
diff --git a/usr/src/boot/lib/libstand/stat.c b/usr/src/boot/libsa/stat.c
index 249c2086a6..249c2086a6 100644
--- a/usr/src/boot/lib/libstand/stat.c
+++ b/usr/src/boot/libsa/stat.c
diff --git a/usr/src/boot/lib/libstand/strcasecmp.c b/usr/src/boot/libsa/strcasecmp.c
index 951b46fb89..951b46fb89 100644
--- a/usr/src/boot/lib/libstand/strcasecmp.c
+++ b/usr/src/boot/libsa/strcasecmp.c
diff --git a/usr/src/boot/lib/libstand/strdup.c b/usr/src/boot/libsa/strdup.c
index ecdc63a09c..ecdc63a09c 100644
--- a/usr/src/boot/lib/libstand/strdup.c
+++ b/usr/src/boot/libsa/strdup.c
diff --git a/usr/src/boot/lib/libstand/strerror.c b/usr/src/boot/libsa/strerror.c
index e08ca0a7f1..e08ca0a7f1 100644
--- a/usr/src/boot/lib/libstand/strerror.c
+++ b/usr/src/boot/libsa/strerror.c
diff --git a/usr/src/boot/lib/libc/string/bcmp.c b/usr/src/boot/libsa/string/bcmp.c
index f1178a660b..f1178a660b 100644
--- a/usr/src/boot/lib/libc/string/bcmp.c
+++ b/usr/src/boot/libsa/string/bcmp.c
diff --git a/usr/src/boot/lib/libc/string/bcopy.c b/usr/src/boot/libsa/string/bcopy.c
index c424de560f..c424de560f 100644
--- a/usr/src/boot/lib/libc/string/bcopy.c
+++ b/usr/src/boot/libsa/string/bcopy.c
diff --git a/usr/src/boot/lib/libc/string/bzero.c b/usr/src/boot/libsa/string/bzero.c
index 201bd64f80..201bd64f80 100644
--- a/usr/src/boot/lib/libc/string/bzero.c
+++ b/usr/src/boot/libsa/string/bzero.c
diff --git a/usr/src/boot/lib/libc/string/ffs.c b/usr/src/boot/libsa/string/ffs.c
index 42a94ef738..42a94ef738 100644
--- a/usr/src/boot/lib/libc/string/ffs.c
+++ b/usr/src/boot/libsa/string/ffs.c
diff --git a/usr/src/boot/lib/libc/string/fls.c b/usr/src/boot/libsa/string/fls.c
index 7145b909f0..7145b909f0 100644
--- a/usr/src/boot/lib/libc/string/fls.c
+++ b/usr/src/boot/libsa/string/fls.c
diff --git a/usr/src/boot/lib/libc/string/memccpy.c b/usr/src/boot/libsa/string/memccpy.c
index 6102a5bded..6102a5bded 100644
--- a/usr/src/boot/lib/libc/string/memccpy.c
+++ b/usr/src/boot/libsa/string/memccpy.c
diff --git a/usr/src/boot/lib/libc/string/memchr.c b/usr/src/boot/libsa/string/memchr.c
index 8020333dec..8020333dec 100644
--- a/usr/src/boot/lib/libc/string/memchr.c
+++ b/usr/src/boot/libsa/string/memchr.c
diff --git a/usr/src/boot/lib/libc/string/memcmp.c b/usr/src/boot/libsa/string/memcmp.c
index d2d0f27d35..d2d0f27d35 100644
--- a/usr/src/boot/lib/libc/string/memcmp.c
+++ b/usr/src/boot/libsa/string/memcmp.c
diff --git a/usr/src/boot/lib/libc/string/memcpy.c b/usr/src/boot/libsa/string/memcpy.c
index ed03856e54..ed03856e54 100644
--- a/usr/src/boot/lib/libc/string/memcpy.c
+++ b/usr/src/boot/libsa/string/memcpy.c
diff --git a/usr/src/boot/lib/libc/string/memmove.c b/usr/src/boot/libsa/string/memmove.c
index 05cf75a2ce..05cf75a2ce 100644
--- a/usr/src/boot/lib/libc/string/memmove.c
+++ b/usr/src/boot/libsa/string/memmove.c
diff --git a/usr/src/boot/lib/libc/string/memset.c b/usr/src/boot/libsa/string/memset.c
index ad0d513933..ad0d513933 100644
--- a/usr/src/boot/lib/libc/string/memset.c
+++ b/usr/src/boot/libsa/string/memset.c
diff --git a/usr/src/boot/lib/libc/string/stpcpy.c b/usr/src/boot/libsa/string/stpcpy.c
index 8cf24f3d8c..8cf24f3d8c 100644
--- a/usr/src/boot/lib/libc/string/stpcpy.c
+++ b/usr/src/boot/libsa/string/stpcpy.c
diff --git a/usr/src/boot/lib/libc/string/stpncpy.c b/usr/src/boot/libsa/string/stpncpy.c
index ac5ca203af..ac5ca203af 100644
--- a/usr/src/boot/lib/libc/string/stpncpy.c
+++ b/usr/src/boot/libsa/string/stpncpy.c
diff --git a/usr/src/boot/lib/libc/string/strcat.c b/usr/src/boot/libsa/string/strcat.c
index 07a3c08c1a..07a3c08c1a 100644
--- a/usr/src/boot/lib/libc/string/strcat.c
+++ b/usr/src/boot/libsa/string/strcat.c
diff --git a/usr/src/boot/lib/libc/string/strchr.c b/usr/src/boot/libsa/string/strchr.c
index ab83b3995a..ab83b3995a 100644
--- a/usr/src/boot/lib/libc/string/strchr.c
+++ b/usr/src/boot/libsa/string/strchr.c
diff --git a/usr/src/boot/lib/libc/string/strcmp.c b/usr/src/boot/libsa/string/strcmp.c
index 9daf624acc..9daf624acc 100644
--- a/usr/src/boot/lib/libc/string/strcmp.c
+++ b/usr/src/boot/libsa/string/strcmp.c
diff --git a/usr/src/boot/lib/libc/string/strcpy.c b/usr/src/boot/libsa/string/strcpy.c
index 8a48d0d0d7..8a48d0d0d7 100644
--- a/usr/src/boot/lib/libc/string/strcpy.c
+++ b/usr/src/boot/libsa/string/strcpy.c
diff --git a/usr/src/boot/lib/libc/string/strcspn.c b/usr/src/boot/libsa/string/strcspn.c
index 3879a3b085..3879a3b085 100644
--- a/usr/src/boot/lib/libc/string/strcspn.c
+++ b/usr/src/boot/libsa/string/strcspn.c
diff --git a/usr/src/boot/lib/libc/string/strlcat.c b/usr/src/boot/libsa/string/strlcat.c
index f5ed6c6cf7..f5ed6c6cf7 100644
--- a/usr/src/boot/lib/libc/string/strlcat.c
+++ b/usr/src/boot/libsa/string/strlcat.c
diff --git a/usr/src/boot/lib/libc/string/strlcpy.c b/usr/src/boot/libsa/string/strlcpy.c
index 019d2316a0..019d2316a0 100644
--- a/usr/src/boot/lib/libc/string/strlcpy.c
+++ b/usr/src/boot/libsa/string/strlcpy.c
diff --git a/usr/src/boot/lib/libc/string/strlen.c b/usr/src/boot/libsa/string/strlen.c
index 2bc1f2b1fe..2bc1f2b1fe 100644
--- a/usr/src/boot/lib/libc/string/strlen.c
+++ b/usr/src/boot/libsa/string/strlen.c
diff --git a/usr/src/boot/lib/libc/string/strncat.c b/usr/src/boot/libsa/string/strncat.c
index 6a0e553daa..6a0e553daa 100644
--- a/usr/src/boot/lib/libc/string/strncat.c
+++ b/usr/src/boot/libsa/string/strncat.c
diff --git a/usr/src/boot/lib/libc/string/strncmp.c b/usr/src/boot/libsa/string/strncmp.c
index 4967a9483e..4967a9483e 100644
--- a/usr/src/boot/lib/libc/string/strncmp.c
+++ b/usr/src/boot/libsa/string/strncmp.c
diff --git a/usr/src/boot/lib/libc/string/strncpy.c b/usr/src/boot/libsa/string/strncpy.c
index 3907403508..3907403508 100644
--- a/usr/src/boot/lib/libc/string/strncpy.c
+++ b/usr/src/boot/libsa/string/strncpy.c
diff --git a/usr/src/boot/lib/libc/string/strpbrk.c b/usr/src/boot/libsa/string/strpbrk.c
index 565ef82f11..565ef82f11 100644
--- a/usr/src/boot/lib/libc/string/strpbrk.c
+++ b/usr/src/boot/libsa/string/strpbrk.c
diff --git a/usr/src/boot/lib/libc/string/strrchr.c b/usr/src/boot/libsa/string/strrchr.c
index f84ffb78c4..f84ffb78c4 100644
--- a/usr/src/boot/lib/libc/string/strrchr.c
+++ b/usr/src/boot/libsa/string/strrchr.c
diff --git a/usr/src/boot/lib/libc/string/strsep.c b/usr/src/boot/libsa/string/strsep.c
index 73c61af811..73c61af811 100644
--- a/usr/src/boot/lib/libc/string/strsep.c
+++ b/usr/src/boot/libsa/string/strsep.c
diff --git a/usr/src/boot/lib/libc/string/strspn.c b/usr/src/boot/libsa/string/strspn.c
index 5dbac0a678..5dbac0a678 100644
--- a/usr/src/boot/lib/libc/string/strspn.c
+++ b/usr/src/boot/libsa/string/strspn.c
diff --git a/usr/src/boot/lib/libc/string/strstr.c b/usr/src/boot/libsa/string/strstr.c
index 18e60d5798..18e60d5798 100644
--- a/usr/src/boot/lib/libc/string/strstr.c
+++ b/usr/src/boot/libsa/string/strstr.c
diff --git a/usr/src/boot/lib/libc/string/strtok.c b/usr/src/boot/libsa/string/strtok.c
index 063a554339..063a554339 100644
--- a/usr/src/boot/lib/libc/string/strtok.c
+++ b/usr/src/boot/libsa/string/strtok.c
diff --git a/usr/src/boot/lib/libc/string/swab.c b/usr/src/boot/libsa/string/swab.c
index 84633094be..84633094be 100644
--- a/usr/src/boot/lib/libc/string/swab.c
+++ b/usr/src/boot/libsa/string/swab.c
diff --git a/usr/src/boot/lib/libstand/tftp.c b/usr/src/boot/libsa/tftp.c
index f324bf20e7..f324bf20e7 100644
--- a/usr/src/boot/lib/libstand/tftp.c
+++ b/usr/src/boot/libsa/tftp.c
diff --git a/usr/src/boot/lib/libstand/tftp.h b/usr/src/boot/libsa/tftp.h
index cbbbbd7821..cbbbbd7821 100644
--- a/usr/src/boot/lib/libstand/tftp.h
+++ b/usr/src/boot/libsa/tftp.h
diff --git a/usr/src/boot/lib/libstand/twiddle.c b/usr/src/boot/libsa/twiddle.c
index 31828542f7..31828542f7 100644
--- a/usr/src/boot/lib/libstand/twiddle.c
+++ b/usr/src/boot/libsa/twiddle.c
diff --git a/usr/src/boot/lib/libstand/udp.c b/usr/src/boot/libsa/udp.c
index 0e0ec5c788..0e0ec5c788 100644
--- a/usr/src/boot/lib/libstand/udp.c
+++ b/usr/src/boot/libsa/udp.c
diff --git a/usr/src/boot/lib/libstand/ufs.c b/usr/src/boot/libsa/ufs.c
index 4144c59a1e..4144c59a1e 100644
--- a/usr/src/boot/lib/libstand/ufs.c
+++ b/usr/src/boot/libsa/ufs.c
diff --git a/usr/src/boot/lib/libc/uuid/uuid_create_nil.c b/usr/src/boot/libsa/uuid/uuid_create_nil.c
index 6e85ae7fb7..6e85ae7fb7 100644
--- a/usr/src/boot/lib/libc/uuid/uuid_create_nil.c
+++ b/usr/src/boot/libsa/uuid/uuid_create_nil.c
diff --git a/usr/src/boot/lib/libc/uuid/uuid_equal.c b/usr/src/boot/libsa/uuid/uuid_equal.c
index e4c48e5253..e4c48e5253 100644
--- a/usr/src/boot/lib/libc/uuid/uuid_equal.c
+++ b/usr/src/boot/libsa/uuid/uuid_equal.c
diff --git a/usr/src/boot/lib/libc/uuid/uuid_is_nil.c b/usr/src/boot/libsa/uuid/uuid_is_nil.c
index ee1865349d..ee1865349d 100644
--- a/usr/src/boot/lib/libc/uuid/uuid_is_nil.c
+++ b/usr/src/boot/libsa/uuid/uuid_is_nil.c
diff --git a/usr/src/boot/lib/libstand/uuid_from_string.c b/usr/src/boot/libsa/uuid_from_string.c
index 7a59b4189e..7a59b4189e 100644
--- a/usr/src/boot/lib/libstand/uuid_from_string.c
+++ b/usr/src/boot/libsa/uuid_from_string.c
diff --git a/usr/src/boot/lib/libstand/uuid_to_string.c b/usr/src/boot/libsa/uuid_to_string.c
index d878af495a..d878af495a 100644
--- a/usr/src/boot/lib/libstand/uuid_to_string.c
+++ b/usr/src/boot/libsa/uuid_to_string.c
diff --git a/usr/src/boot/lib/libstand/write.c b/usr/src/boot/libsa/write.c
index 3edab25428..3edab25428 100644
--- a/usr/src/boot/lib/libstand/write.c
+++ b/usr/src/boot/libsa/write.c
diff --git a/usr/src/boot/lib/libstand/x86/hypervisor.c b/usr/src/boot/libsa/x86/hypervisor.c
index ea28863262..ea28863262 100644
--- a/usr/src/boot/lib/libstand/x86/hypervisor.c
+++ b/usr/src/boot/libsa/x86/hypervisor.c
diff --git a/usr/src/boot/lib/libstand/zalloc.c b/usr/src/boot/libsa/zalloc.c
index 8ecdc2fdf1..8ecdc2fdf1 100644
--- a/usr/src/boot/lib/libstand/zalloc.c
+++ b/usr/src/boot/libsa/zalloc.c
diff --git a/usr/src/boot/lib/libstand/zalloc_defs.h b/usr/src/boot/libsa/zalloc_defs.h
index f0de227529..f0de227529 100644
--- a/usr/src/boot/lib/libstand/zalloc_defs.h
+++ b/usr/src/boot/libsa/zalloc_defs.h
diff --git a/usr/src/boot/lib/libstand/zalloc_malloc.c b/usr/src/boot/libsa/zalloc_malloc.c
index 3105341c7b..3105341c7b 100644
--- a/usr/src/boot/lib/libstand/zalloc_malloc.c
+++ b/usr/src/boot/libsa/zalloc_malloc.c
diff --git a/usr/src/boot/lib/libstand/zalloc_mem.h b/usr/src/boot/libsa/zalloc_mem.h
index fd11f2bd9a..fd11f2bd9a 100644
--- a/usr/src/boot/lib/libstand/zalloc_mem.h
+++ b/usr/src/boot/libsa/zalloc_mem.h
diff --git a/usr/src/boot/lib/libstand/zalloc_protos.h b/usr/src/boot/libsa/zalloc_protos.h
index 71f29c5fd3..71f29c5fd3 100644
--- a/usr/src/boot/lib/libstand/zalloc_protos.h
+++ b/usr/src/boot/libsa/zalloc_protos.h
diff --git a/usr/src/boot/lib/libstand/zfs/Makefile.inc b/usr/src/boot/libsa/zfs/Makefile.inc
index a33a42d703..83d5a9e998 100644
--- a/usr/src/boot/lib/libstand/zfs/Makefile.inc
+++ b/usr/src/boot/libsa/zfs/Makefile.inc
@@ -22,11 +22,11 @@ OBJECTS +=	nvlist.o
 OBJECTS +=	list.o
 
 objs/zfs.o pics/zfs.o := CPPFLAGS +=	-I../../common
-objs/zfs.o pics/zfs.o := CPPFLAGS +=	-I../../../cddl/boot/zfs -I$(LZ4)
+objs/zfs.o pics/zfs.o := CPPFLAGS +=	-I../../sys/cddl/boot/zfs -I$(LZ4)
 objs/zfs.o pics/zfs.o := CPPFLAGS +=	-I$(SRC)/uts/common/fs/zfs
 objs/zfs.o pics/zfs.o := CPPFLAGS +=	-I$(CRYPTOSRC)
 objs/nvlist.o pics/nvlist.o := CPPFLAGS +=	-I../../common
-objs/nvlist.o pics/nvlist.o := CPPFLAGS +=	-I../../../cddl/boot/zfs
+objs/nvlist.o pics/nvlist.o := CPPFLAGS +=	-I../../sys/cddl/boot/zfs
 
 pics/%.o objs/%.o:	$(ZFSSRC)/%.c
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/boot/lib/libstand/zfs/devicename_stubs.c b/usr/src/boot/libsa/zfs/devicename_stubs.c
index dc0c0a556e..dc0c0a556e 100644
--- a/usr/src/boot/lib/libstand/zfs/devicename_stubs.c
+++ b/usr/src/boot/libsa/zfs/devicename_stubs.c
diff --git a/usr/src/boot/lib/libstand/zfs/gzip.c b/usr/src/boot/libsa/zfs/gzip.c
index 36afd981a6..36afd981a6 100644
--- a/usr/src/boot/lib/libstand/zfs/gzip.c
+++ b/usr/src/boot/libsa/zfs/gzip.c
diff --git a/usr/src/boot/lib/libstand/zfs/libzfs.h b/usr/src/boot/libsa/zfs/libzfs.h
index ddf7f91975..ddf7f91975 100644
--- a/usr/src/boot/lib/libstand/zfs/libzfs.h
+++ b/usr/src/boot/libsa/zfs/libzfs.h
diff --git a/usr/src/boot/lib/libstand/zfs/nvlist.c b/usr/src/boot/libsa/zfs/nvlist.c
index 96b0e63736..96b0e63736 100644
--- a/usr/src/boot/lib/libstand/zfs/nvlist.c
+++ b/usr/src/boot/libsa/zfs/nvlist.c
diff --git a/usr/src/boot/lib/libstand/zfs/zfs.c b/usr/src/boot/libsa/zfs/zfs.c
index 5cd79253e9..5cd79253e9 100644
--- a/usr/src/boot/lib/libstand/zfs/zfs.c
+++ b/usr/src/boot/libsa/zfs/zfs.c
diff --git a/usr/src/boot/lib/libstand/zfs/zfsimpl.c b/usr/src/boot/libsa/zfs/zfsimpl.c
index e83a8a3983..e83a8a3983 100644
--- a/usr/src/boot/lib/libstand/zfs/zfsimpl.c
+++ b/usr/src/boot/libsa/zfs/zfsimpl.c
diff --git a/usr/src/boot/sys/boot/Makefile b/usr/src/boot/sys/boot/Makefile
deleted file mode 100644
index b24280da9d..0000000000
--- a/usr/src/boot/sys/boot/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# 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 2015 Toomas Soome <tsoome@me.com>
-#
-
-.KEEP_STATE:
-
-include $(SRC)/Makefile.master
-
-INSTDIRS = i386 efi
-SUBDIRS = libstand libficl $(INSTDIRS)
-
-all	:=	TARGET = all
-clean	:=	TARGET = clean
-clobber	:=	TARGET = clobber
-install	:=	TARGET = install
-
-all clean clobber: $(SUBDIRS)
-
-#
-# The directories in INSTDIRS depend implicitly on SUBDIRS being built already.
-# We use .WAIT instead of explicit dependencies because we only want to make
-# the "install" target in INSTDIRS, not in SUBDIRS.
-#
-# If adding SUBDIRS which are not dependencies of INSTDIRS, "install: all"
-# rules should be added to the Makefiles in those directories.
-#
-install: all .WAIT $(INSTDIRS)
-
-.PARALLEL: libstand libficl
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
diff --git a/usr/src/boot/sys/boot/forth/Makefile.inc b/usr/src/boot/sys/boot/forth/Makefile.inc
deleted file mode 100644
index 4365fb4610..0000000000
--- a/usr/src/boot/sys/boot/forth/Makefile.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-FORTH =	beastie.4th
-FORTH +=	beadm.4th
-FORTH +=	brand.4th
-FORTH +=	brand-illumos.4th
-FORTH +=	brand-smartos.4th
-FORTH +=	check-password.4th
-FORTH +=	color.4th
-FORTH +=	delay.4th
-FORTH +=	efi.4th
-FORTH +=	frames.4th
-FORTH +=	loader.4th
-DEFFILES =	loader.conf
-FORTH +=	logo-beastie.4th
-FORTH +=	logo-beastiebw.4th
-FORTH +=	logo-fbsdbw.4th
-FORTH +=	logo-illumos.4th
-FORTH +=	logo-orb.4th
-FORTH +=	logo-orbbw.4th
-FORTH +=	logo-smartos.4th
-FORTH +=	menu.4th
-FORTH +=	menu-commands.4th
-FORTH +=	menusets.4th
-FORTH +=	screen.4th
-FORTH +=	shortcuts.4th
-FORTH +=	support.4th
-FORTH +=	version.4th
-FILES +=	illumos-logo.png
-FILES +=	illumos-brand.png
-FILES +=	joyent.png
-FILES +=	triton.png
diff --git a/usr/src/boot/sys/boot/forth/loader.rc b/usr/src/boot/sys/boot/forth/loader.rc
deleted file mode 100644
index 1bdc5dca30..0000000000
--- a/usr/src/boot/sys/boot/forth/loader.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-\ Loader.rc
-\ 
-\ Includes additional commands
-include /boot/forth/loader.4th
-try-include /boot/loader.rc.local
-
-\ Reads and processes loader.conf variables
-\ NOTE: Change to `initialize' if you enable the below boot menu
-\ also note that initialize will leave flag in stack from any_conf_read?
-\ start
-initialize drop
-
-\ Tests for password -- executes autoboot first if a password was defined
-check-password
-
-\ Uncomment to enable boot menu
-include /boot/forth/beastie.4th
-beastie-start
-
-\ Unless set otherwise, autoboot is automatic at this point
diff --git a/usr/src/cmd/ps/Makefile b/usr/src/cmd/ps/Makefile
index d1b61c7874..50f4f0f390 100644
--- a/usr/src/cmd/ps/Makefile
+++ b/usr/src/cmd/ps/Makefile
@@ -29,44 +29,31 @@ OBJS=ps.o ucbps.o
 SRCS=$(OBJS:%.o=%.c)
 
 include ../Makefile.cmd
+include ../Makefile.cmd.64
+include ../Makefile.ctf
+
+LDLIBS += -lproject
 
 XGETFLAGS += -a -x ps.xcl
 
 DCFILE= $(PROG).dc
 
 ROOTUCBPROG = $(ROOT)/usr/ucb/$(PROG)
-ROOTUCBPROG32 = $(ROOT)/usr/ucb/$(MACH32)/$(PROG)
-ROOTUCBPROG64 = $(ROOT)/usr/ucb/$(MACH64)/$(PROG)
-
-$(64ONLY)SUBDIRS= $(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
-
-all	:=	TARGET = all
-install	:=	TARGET = install
-clean	:=	TARGET = clean
-clobber	:=	TARGET = clobber
-lint	:=	TARGET = lint
 
 .KEEP_STATE:
 
-all:	$(SUBDIRS)
+all:	$(PROG)
 
-clean clobber lint:	$(SUBDIRS)
+$(PROG): $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
+	$(POST_PROCESS)
 
-install:	$(SUBDIRS)
-	-$(RM) $(ROOTPROG)
-	-$(LN) $(ISAEXEC) $(ROOTPROG)
+install:	$(PROG) $(ROOTPROG)
 	-$(RM) $(ROOTUCBPROG)
-	-$(LN) $(ISAEXEC) $(ROOTUCBPROG)
-	$(64ONLY)-$(RM) $(ROOTUCBPROG32)
-	$(64ONLY)-$(LN) $(ROOTPROG32) $(ROOTUCBPROG32)
-	$(BUILD64)-$(RM) $(ROOTUCBPROG64)
-	$(BUILD64)-$(LN) $(ROOTPROG64) $(ROOTUCBPROG64)
-
-$(SUBDIRS):	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
+	-$(LN) $(ROOTPROG) $(ROOTUCBPROG)
 
-FRC:
+clean:
+	$(RM) $(OBJS)
 
 $(DCFILE): $(PROG).c
 	$(RM) $(DCFILE)
diff --git a/usr/src/cmd/ps/Makefile.com b/usr/src/cmd/ps/Makefile.com
deleted file mode 100644
index d9209ba95a..0000000000
--- a/usr/src/cmd/ps/Makefile.com
+++ /dev/null
@@ -1,54 +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.
-#
-# Copyright (c) 2018, Joyent, Inc.
-
-PROG=	ps
-
-OBJS=	ps.o ucbps.o
-
-SRCS=	$(OBJS:%.o=../%.c)
-
-include ../../Makefile.cmd
-
-CFLAGS	+= $(CCVERBOSE)
-LDLIBS += -lproject
-
-# not linted
-SMATCH=off
-
-.KEEP_STATE:
-
-%.o:	../%.c
-	$(COMPILE.c) $<
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-clean:
-	$(RM) $(OBJS)
-
-lint:
-	$(LINT.c) $(SRCS) $(LDLIBS)
diff --git a/usr/src/cmd/ps/amd64/Makefile b/usr/src/cmd/ps/amd64/Makefile
deleted file mode 100644
index c33134f58c..0000000000
--- a/usr/src/cmd/ps/amd64/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-include ../../Makefile.cmd.64
-
-all: $(PROG)
-
-install: all $(ROOTPROG64)
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/ps/i386/Makefile b/usr/src/cmd/ps/i386/Makefile
deleted file mode 100644
index 3f3aa6352a..0000000000
--- a/usr/src/cmd/ps/i386/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# cmd/ps/i386/Makefile
-#
-
-include ../Makefile.com
-
-lint	:= LINTFLAGS = -x
-
-all: $(PROG)
-
-install: all $(ROOTPROG32)
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/ps/sparcv9/Makefile b/usr/src/cmd/ps/sparcv9/Makefile
deleted file mode 100644
index aaa2f3ee7a..0000000000
--- a/usr/src/cmd/ps/sparcv9/Makefile
+++ /dev/null
@@ -1,39 +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.
-#
-# cmd/ps/sparcv9/Makefile
-#
-
-include ../Makefile.com
-include ../../Makefile.cmd.64
-
-CFLAGS64	+= $(CCVERBOSE)
-
-lint	:= LINTFLAGS64 = -x -m64
-
-all: $(PROG)
-
-install: all $(ROOTPROG64)
-
-include ../../Makefile.targ
diff --git a/usr/src/cmd/ps/ucbps.c b/usr/src/cmd/ps/ucbps.c
index c368426184..05997029fd 100644
--- a/usr/src/cmd/ps/ucbps.c
+++ b/usr/src/cmd/ps/ucbps.c
@@ -175,7 +175,6 @@ ucbmain(int argc, char **argv)
 	struct dirent *dentp;
 	char	psname[100];
 	char	asname[100];
-	int	pdlen;
 	size_t  len;
 
 	(void) setlocale(LC_ALL, "");
@@ -394,21 +393,24 @@ ucbmain(int argc, char **argv)
 		exit(1);
 	}
 
-	(void) strcpy(psname, procdir);
-	pdlen = strlen(psname);
-	psname[pdlen++] = '/';
-
 	/* for each active process --- */
 	while ((dentp = readdir(dirp)) != NULL) {
 		int	psfd;	/* file descriptor for /proc/nnnnn/psinfo */
 		int	asfd;	/* file descriptor for /proc/nnnnn/as */
+		int	n;
 
 		if (dentp->d_name[0] == '.')		/* skip . and .. */
 			continue;
-		(void) strcpy(psname + pdlen, dentp->d_name);
-		(void) strcpy(asname, psname);
-		(void) strcat(psname, "/psinfo");
-		(void) strcat(asname, "/as");
+		n = snprintf(psname, sizeof (psname), "%s/%s/psinfo",
+		    procdir, dentp->d_name);
+		if (n < 0 || n >= sizeof (psname))
+			exit(1);
+
+		n = snprintf(asname, sizeof (asname), "%s/%s/as",
+		    procdir, dentp->d_name);
+		if (n < 0 || n >= sizeof (psname))
+			exit(1);
+
 retry:
 		if ((psfd = open(psname, O_RDONLY)) == -1)
 			continue;
@@ -536,7 +538,7 @@ closeit:
 }
 
 static void
-usage()		/* print usage message and quit */
+usage(void)		/* print usage message and quit */
 {
 	static char usage1[] = "ps [ -aceglnrSuUvwx ] [ -t term ] [ num ]";
 
diff --git a/usr/src/cmd/smbsrv/testoplock/tol_main.c b/usr/src/cmd/smbsrv/testoplock/tol_main.c
index 126f3a17f5..5382802b82 100644
--- a/usr/src/cmd/smbsrv/testoplock/tol_main.c
+++ b/usr/src/cmd/smbsrv/testoplock/tol_main.c
@@ -12,6 +12,7 @@
 /*
  * Copyright 2018 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2019 Joyent, Inc.
+ * Copyright 2022 RackTop Systems, Inc.
  */
 
 /*
@@ -190,10 +191,18 @@ do_close(int fid)
 		printf(" close fid %d already closed\n");
 		return;
 	}
+
+	smb_llist_enter(&node->n_ofile_list, RW_READER);
+	mutex_enter(&node->n_oplock.ol_mutex);
+
 	smb_oplock_break_CLOSE(ofile->f_node, ofile);
 
 	smb_llist_remove(&node->n_ofile_list, ofile);
 	node->n_open_count--;
+
+	mutex_exit(&node->n_oplock.ol_mutex);
+	smb_llist_exit(&node->n_ofile_list);
+
 	ofile->f_refcnt--;
 
 	bzero(ofile->TargetOplockKey, SMB_LEASE_KEY_SZ);
@@ -331,6 +340,7 @@ do_brk_setinfo(int fid, char *arg2)
 static void
 do_move(int fid, char *arg2)
 {
+	smb_node_t *node = &test_node;
 	smb_ofile_t *ofile = &ofile_array[fid];
 	smb_ofile_t *of2;
 	int fid2;
@@ -346,7 +356,12 @@ do_move(int fid, char *arg2)
 	}
 	of2 = &ofile_array[fid2];
 
+	mutex_enter(&node->n_oplock.ol_mutex);
+
 	smb_oplock_move(&test_node, ofile, of2);
+
+	mutex_exit(&node->n_oplock.ol_mutex);
+
 	printf(" move %d %d\n", fid, fid2);
 }
 
@@ -384,6 +399,8 @@ main(int argc, char *argv[])
 	if (isatty(0))
 		prompt = "> ";
 
+	mutex_init(&node->n_mutex, NULL, MUTEX_DEFAULT, NULL);
+
 	smb_llist_constructor(&node->n_ofile_list, sizeof (smb_ofile_t),
 	    offsetof(smb_ofile_t, f_node_lnd));
 
diff --git a/usr/src/lib/libfakekernel/common/printf.c b/usr/src/lib/libfakekernel/common/printf.c
index 7bee92f0ca..ad492cfe28 100644
--- a/usr/src/lib/libfakekernel/common/printf.c
+++ b/usr/src/lib/libfakekernel/common/printf.c
@@ -22,7 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2021 Tintri by DDN, Inc. All rights reserved.
- * Copyright 2017 RackTop Systems.
+ * Copyright 2022 RackTop Systems, Inc.
  * Copyright (c) 2018, Joyent, Inc.
  */
 
@@ -32,10 +32,10 @@
 #include <sys/systm.h>
 #include <sys/cmn_err.h>
 #include <sys/log.h>
+#include <upanic.h>
 
 #include <fakekernel.h>
 
-void	abort(void) __NORETURN;
 void	debug_enter(char *);
 
 char *volatile panicstr;
@@ -133,12 +133,11 @@ vpanic(const char *fmt, va_list adx)
 	va_copy(tmpargs, adx);
 	fakekernel_cprintf(fmt, tmpargs, SL_FATAL, "fatal: ", "\n");
 
-	/* Call libc`assfail() so that mdb ::status works */
 	(void) vsnprintf(panicbuf, sizeof (panicbuf), fmt, adx);
 	debug_enter(panicbuf);
-	(void) assfail(panicbuf, "(panic)", 0);
 
-	abort();	/* avoid "noreturn" warnings */
+	/* Call libc`upanic() so that mdb ::status works */
+	upanic(panicbuf, sizeof (panicbuf));
 }
 
 void
diff --git a/usr/src/pkg/manifests/SUNWcs.p5m b/usr/src/pkg/manifests/SUNWcs.p5m
index b39640301c..a7406d7761 100644
--- a/usr/src/pkg/manifests/SUNWcs.p5m
+++ b/usr/src/pkg/manifests/SUNWcs.p5m
@@ -552,7 +552,6 @@ $(i386_ONLY)file path=usr/bin/$(ARCH32)/newtask group=sys mode=4555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/nohup mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/prctl mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/prstat mode=0555
-$(i386_ONLY)file path=usr/bin/$(ARCH32)/ps mode=0555
 file path=usr/bin/$(ARCH32)/savecore mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/setuname mode=0555
 dir  path=usr/bin/$(ARCH64)
@@ -568,7 +567,6 @@ file path=usr/bin/$(ARCH64)/newtask group=sys mode=4555
 file path=usr/bin/$(ARCH64)/nohup mode=0555
 file path=usr/bin/$(ARCH64)/prctl mode=0555
 file path=usr/bin/$(ARCH64)/prstat mode=0555
-file path=usr/bin/$(ARCH64)/ps mode=0555
 file path=usr/bin/$(ARCH64)/savecore mode=0555
 file path=usr/bin/$(ARCH64)/setuname mode=0555
 $(i386_ONLY)file path=usr/bin/addbadsec mode=0555
@@ -719,7 +717,7 @@ file path=usr/bin/priocntl mode=0555
 file path=usr/bin/profiles mode=0555
 file path=usr/bin/projects mode=0555
 hardlink path=usr/bin/prstat target=../../usr/lib/isaexec
-hardlink path=usr/bin/ps target=../../usr/lib/isaexec
+file path=usr/bin/ps mode=0555
 file path=usr/bin/putdev mode=0555
 file path=usr/bin/putdgrp mode=0555
 link path=usr/bin/pwconv target=../sbin/pwconv
diff --git a/usr/src/pkg/manifests/compatibility-ucb.p5m b/usr/src/pkg/manifests/compatibility-ucb.p5m
index 154f725d2f..3b28328535 100644
--- a/usr/src/pkg/manifests/compatibility-ucb.p5m
+++ b/usr/src/pkg/manifests/compatibility-ucb.p5m
@@ -86,9 +86,7 @@ file path=usr/share/man/man1b/whereis.1b
 file path=usr/share/man/man1b/whoami.1b
 dir  path=usr/ucb
 $(i386_ONLY)dir path=usr/ucb/$(ARCH32)
-$(i386_ONLY)hardlink path=usr/ucb/$(ARCH32)/ps target=../../bin/$(ARCH32)/ps
 dir  path=usr/ucb/$(ARCH64)
-hardlink path=usr/ucb/$(ARCH64)/ps target=../../bin/$(ARCH64)/ps
 link path=usr/ucb/Mail target=../bin/mailx
 link path=usr/ucb/arch target=../bin/arch
 file path=usr/ucb/basename mode=0755
@@ -126,7 +124,7 @@ link path=usr/ucb/netstat target=../bin/netstat
 link path=usr/ucb/page target=../bin/more
 link path=usr/ucb/pagesize target=../bin/pagesize
 file path=usr/ucb/printenv mode=0755
-hardlink path=usr/ucb/ps target=../../usr/lib/isaexec
+hardlink path=usr/ucb/ps target=../bin/ps
 link path=usr/ucb/quota target=../lib/fs/ufs/quota
 link path=usr/ucb/rcp target=../bin/rcp
 link path=usr/ucb/rdate target=../bin/rdate
diff --git a/usr/src/pkg/manifests/system-boot-loader.p5m b/usr/src/pkg/manifests/system-boot-loader.p5m
index 6ecd5280a1..5f3c85b199 100644
--- a/usr/src/pkg/manifests/system-boot-loader.p5m
+++ b/usr/src/pkg/manifests/system-boot-loader.p5m
@@ -98,8 +98,8 @@ $(i386_ONLY)file path=usr/share/man/man5/pxeboot.5
 $(i386_ONLY)file path=usr/share/man/man5/version.4th.5
 license lic_CDDL license=lic_CDDL
 $(i386_ONLY)license usr/src/boot/COPYRIGHT license=usr/src/boot/COPYRIGHT
-$(i386_ONLY)license usr/src/boot/sys/boot/common/linenoise/LICENSE \
-    license=usr/src/boot/sys/boot/common/linenoise/LICENSE
+$(i386_ONLY)license usr/src/boot/common/linenoise/LICENSE \
+    license=usr/src/boot/common/linenoise/LICENSE
 $(i386_ONLY)license usr/src/common/crypto/skein/THIRDPARTYLICENSE \
     license=usr/src/common/crypto/skein/THIRDPARTYLICENSE
 $(i386_ONLY)license usr/src/common/pnglite/THIRDPARTYLICENSE \
diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c
index fb520ef47e..ece779c441 100644
--- a/usr/src/uts/i86pc/os/cpuid.c
+++ b/usr/src/uts/i86pc/os/cpuid.c
@@ -4294,9 +4294,9 @@ cpuid_pass1(cpu_t *cpu, uchar_t *featureset)
 		if (cpi->cpi_family == 0xf || cpi->cpi_family == 0x11) {
 			add_x86_feature(featureset, X86FSET_LFENCE_SER);
 		} else if (cpi->cpi_family >= 0x10) {
+#if !defined(__xpv)
 			uint64_t val;
 
-#if !defined(__xpv)
 			/*
 			 * Be careful when attempting to enable the bit, and
 			 * verify that it was actually set in case we are
@@ -4313,11 +4313,11 @@ cpuid_pass1(cpu_t *cpu, uchar_t *featureset)
 				val = 0;
 			}
 			no_trap();
-#endif
 
 			if ((val & AMD_DE_CFG_LFENCE_DISPATCH) != 0) {
 				add_x86_feature(featureset, X86FSET_LFENCE_SER);
 			}
+#endif
 		}
 	} else if (cpi->cpi_vendor == X86_VENDOR_Intel &&
 	    is_x86_feature(featureset, X86FSET_SSE2)) {