kboot: Move to kboot/kboot

In anticipation of separating the library elements from the kboot
prorgam elements, move kboot down a level into a subdirectory. There
will be libkboot and include directories in subsequent commits,
mirroring other subsystems like i386 and efi.

Sponsored by:		Netflix

54 files changed, 73 insertions, 65 deletions

diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile
index b9d68cddf97d..2e0b9d7a2e09 100644
--- a/stand/kboot/Makefile
+++ b/stand/kboot/Makefile
@@ -1,69 +1,7 @@
-
-LOADER_DISK_SUPPORT?=	yes
-LOADER_CD9660_SUPPORT?=	yes
-LOADER_MSDOS_SUPPORT?=	no
-LOADER_EXT2FS_SUPPORT?=	yes
-LOADER_UFS_SUPPORT?=	yes
-LOADER_ZFS_SUPPORT?=	yes
-LOADER_NET_SUPPORT?=	no
-LOADER_NFS_SUPPORT?=	no
-LOADER_TFTP_SUPPORT?=	no
-LOADER_GZIP_SUPPORT?=	no
-LOADER_BZIP2_SUPPORT?=	no
+NO_OBJ=t
 
 .include <bsd.init.mk>
 
-PROG=		loader.kboot
-NEWVERSWHAT=	"kboot loader" ${MACHINE_ARCH}
-INSTALLFLAGS=	-b
-
-# Architecture-specific loader code
-SRCS=	\
-		bootinfo.c \
-		conf.c \
-		crt1.c \
-		gfx_fb_stub.c \
-		host_syscalls.c \
-		hostcons.c \
-		hostdisk.c \
-		hostfs.c \
-		init.c \
-		kbootfdt.c \
-		main.c \
-		seg.c \
-		termios.c \
-		util.c \
-		vers.c
-
-CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
-.if ${MK_LOADER_ZFS} != "no"
-CFLAGS+=	-I${ZFSSRC}
-CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
-CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
-HAVE_ZFS=yes
-.endif
-
-HELP_FILENAME=	loader.help.kboot
-
-.include	"${BOOTSRC}/fdt.mk"
-
-# We share bootinfo.c with efi
-.PATH:		${BOOTSRC}/efi/loader
-
-# Note: Since we're producing a userland binary, we key off of MACHINE_ARCH
-# instead of the more normal MACHINE since the changes between different flavors
-# of MACHINE_ARCH are large enough in Linux that it's easier that way.
-.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
-
-# Always add MI sources
-.include	"${BOOTSRC}/loader.mk"
-.PATH:		${SYSDIR}/libkern
-CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
-
-CFLAGS+=	-Wall
-
-DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
-LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
+SUBDIR+=	kboot
 
-.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc
new file mode 100644
index 000000000000..01b5f23410c8
--- /dev/null
+++ b/stand/kboot/Makefile.inc
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
new file mode 100644
index 000000000000..b9d68cddf97d
--- /dev/null
+++ b/stand/kboot/kboot/Makefile
@@ -0,0 +1,69 @@
+
+LOADER_DISK_SUPPORT?=	yes
+LOADER_CD9660_SUPPORT?=	yes
+LOADER_MSDOS_SUPPORT?=	no
+LOADER_EXT2FS_SUPPORT?=	yes
+LOADER_UFS_SUPPORT?=	yes
+LOADER_ZFS_SUPPORT?=	yes
+LOADER_NET_SUPPORT?=	no
+LOADER_NFS_SUPPORT?=	no
+LOADER_TFTP_SUPPORT?=	no
+LOADER_GZIP_SUPPORT?=	no
+LOADER_BZIP2_SUPPORT?=	no
+
+.include <bsd.init.mk>
+
+PROG=		loader.kboot
+NEWVERSWHAT=	"kboot loader" ${MACHINE_ARCH}
+INSTALLFLAGS=	-b
+
+# Architecture-specific loader code
+SRCS=	\
+		bootinfo.c \
+		conf.c \
+		crt1.c \
+		gfx_fb_stub.c \
+		host_syscalls.c \
+		hostcons.c \
+		hostdisk.c \
+		hostfs.c \
+		init.c \
+		kbootfdt.c \
+		main.c \
+		seg.c \
+		termios.c \
+		util.c \
+		vers.c
+
+CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
+.if ${MK_LOADER_ZFS} != "no"
+CFLAGS+=	-I${ZFSSRC}
+CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include
+CFLAGS+=        -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
+HAVE_ZFS=yes
+.endif
+
+HELP_FILENAME=	loader.help.kboot
+
+.include	"${BOOTSRC}/fdt.mk"
+
+# We share bootinfo.c with efi
+.PATH:		${BOOTSRC}/efi/loader
+
+# Note: Since we're producing a userland binary, we key off of MACHINE_ARCH
+# instead of the more normal MACHINE since the changes between different flavors
+# of MACHINE_ARCH are large enough in Linux that it's easier that way.
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
+.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+
+# Always add MI sources
+.include	"${BOOTSRC}/loader.mk"
+.PATH:		${SYSDIR}/libkern
+CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
+
+CFLAGS+=	-Wall
+
+DPADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
+LDADD=		${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
+
+.include <bsd.prog.mk>
diff --git a/stand/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc
index 50388d38dbf2..50388d38dbf2 100644
--- a/stand/kboot/arch/aarch64/Makefile.inc
+++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc
diff --git a/stand/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c
index 5ea45226bd3e..5ea45226bd3e 100644
--- a/stand/kboot/arch/aarch64/exec.c
+++ b/stand/kboot/kboot/arch/aarch64/exec.c
diff --git a/stand/kboot/arch/aarch64/fdt_arch.c b/stand/kboot/kboot/arch/aarch64/fdt_arch.c
index bc480808d14f..bc480808d14f 100644
--- a/stand/kboot/arch/aarch64/fdt_arch.c
+++ b/stand/kboot/kboot/arch/aarch64/fdt_arch.c
diff --git a/stand/kboot/arch/aarch64/host_syscall.S b/stand/kboot/kboot/arch/aarch64/host_syscall.S
index db3ecf0f885d..db3ecf0f885d 100644
--- a/stand/kboot/arch/aarch64/host_syscall.S
+++ b/stand/kboot/kboot/arch/aarch64/host_syscall.S
diff --git a/stand/kboot/arch/aarch64/ldscript.aarch64 b/stand/kboot/kboot/arch/aarch64/ldscript.aarch64
index 62b7d2b6be01..62b7d2b6be01 100644
--- a/stand/kboot/arch/aarch64/ldscript.aarch64
+++ b/stand/kboot/kboot/arch/aarch64/ldscript.aarch64
diff --git a/stand/kboot/arch/aarch64/load_addr.c b/stand/kboot/kboot/arch/aarch64/load_addr.c
index 4cbbd5192f5b..4cbbd5192f5b 100644
--- a/stand/kboot/arch/aarch64/load_addr.c
+++ b/stand/kboot/kboot/arch/aarch64/load_addr.c
diff --git a/stand/kboot/arch/aarch64/start_arch.h b/stand/kboot/kboot/arch/aarch64/start_arch.h
index 467ba054c9f0..467ba054c9f0 100644
--- a/stand/kboot/arch/aarch64/start_arch.h
+++ b/stand/kboot/kboot/arch/aarch64/start_arch.h
diff --git a/stand/kboot/arch/aarch64/stat_arch.h b/stand/kboot/kboot/arch/aarch64/stat_arch.h
index 9b52fe60c449..9b52fe60c449 100644
--- a/stand/kboot/arch/aarch64/stat_arch.h
+++ b/stand/kboot/kboot/arch/aarch64/stat_arch.h
diff --git a/stand/kboot/arch/aarch64/syscall_nr.h b/stand/kboot/kboot/arch/aarch64/syscall_nr.h
index 83069dd8dc76..83069dd8dc76 100644
--- a/stand/kboot/arch/aarch64/syscall_nr.h
+++ b/stand/kboot/kboot/arch/aarch64/syscall_nr.h
diff --git a/stand/kboot/arch/aarch64/termios_arch.h b/stand/kboot/kboot/arch/aarch64/termios_arch.h
index 5db0b9831cdb..5db0b9831cdb 100644
--- a/stand/kboot/arch/aarch64/termios_arch.h
+++ b/stand/kboot/kboot/arch/aarch64/termios_arch.h
diff --git a/stand/kboot/arch/aarch64/tramp.S b/stand/kboot/kboot/arch/aarch64/tramp.S
index 32616f239c50..32616f239c50 100644
--- a/stand/kboot/arch/aarch64/tramp.S
+++ b/stand/kboot/kboot/arch/aarch64/tramp.S
diff --git a/stand/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc
index fdd40fe9bc5a..fdd40fe9bc5a 100644
--- a/stand/kboot/arch/amd64/Makefile.inc
+++ b/stand/kboot/kboot/arch/amd64/Makefile.inc
diff --git a/stand/kboot/arch/amd64/amd64_tramp.S b/stand/kboot/kboot/arch/amd64/amd64_tramp.S
index b95e99cbaf0f..b95e99cbaf0f 100644
--- a/stand/kboot/arch/amd64/amd64_tramp.S
+++ b/stand/kboot/kboot/arch/amd64/amd64_tramp.S
diff --git a/stand/kboot/arch/amd64/elf64_freebsd.c b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c
index 4da5a7177a33..4da5a7177a33 100644
--- a/stand/kboot/arch/amd64/elf64_freebsd.c
+++ b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c
diff --git a/stand/kboot/arch/amd64/fdt_arch.c b/stand/kboot/kboot/arch/amd64/fdt_arch.c
index eefb76b1f92c..eefb76b1f92c 100644
--- a/stand/kboot/arch/amd64/fdt_arch.c
+++ b/stand/kboot/kboot/arch/amd64/fdt_arch.c
diff --git a/stand/kboot/arch/amd64/host_syscall.S b/stand/kboot/kboot/arch/amd64/host_syscall.S
index 5bf0fca0cec1..5bf0fca0cec1 100644
--- a/stand/kboot/arch/amd64/host_syscall.S
+++ b/stand/kboot/kboot/arch/amd64/host_syscall.S
diff --git a/stand/kboot/arch/amd64/ldscript.amd64 b/stand/kboot/kboot/arch/amd64/ldscript.amd64
index 4009ba5fa81c..4009ba5fa81c 100644
--- a/stand/kboot/arch/amd64/ldscript.amd64
+++ b/stand/kboot/kboot/arch/amd64/ldscript.amd64
diff --git a/stand/kboot/arch/amd64/load_addr.c b/stand/kboot/kboot/arch/amd64/load_addr.c
index 4bd2a19dab48..4bd2a19dab48 100644
--- a/stand/kboot/arch/amd64/load_addr.c
+++ b/stand/kboot/kboot/arch/amd64/load_addr.c
diff --git a/stand/kboot/arch/amd64/multiboot2.h b/stand/kboot/kboot/arch/amd64/multiboot2.h
index bf673da66c2c..bf673da66c2c 100644
--- a/stand/kboot/arch/amd64/multiboot2.h
+++ b/stand/kboot/kboot/arch/amd64/multiboot2.h
diff --git a/stand/kboot/arch/amd64/start_arch.h b/stand/kboot/kboot/arch/amd64/start_arch.h
index 818a5b277c10..818a5b277c10 100644
--- a/stand/kboot/arch/amd64/start_arch.h
+++ b/stand/kboot/kboot/arch/amd64/start_arch.h
diff --git a/stand/kboot/arch/amd64/stat_arch.h b/stand/kboot/kboot/arch/amd64/stat_arch.h
index 74946abd2cda..74946abd2cda 100644
--- a/stand/kboot/arch/amd64/stat_arch.h
+++ b/stand/kboot/kboot/arch/amd64/stat_arch.h
diff --git a/stand/kboot/arch/amd64/syscall_nr.h b/stand/kboot/kboot/arch/amd64/syscall_nr.h
index 2cf26d7ca4dc..2cf26d7ca4dc 100644
--- a/stand/kboot/arch/amd64/syscall_nr.h
+++ b/stand/kboot/kboot/arch/amd64/syscall_nr.h
diff --git a/stand/kboot/arch/amd64/termios_arch.h b/stand/kboot/kboot/arch/amd64/termios_arch.h
index 5db0b9831cdb..5db0b9831cdb 100644
--- a/stand/kboot/arch/amd64/termios_arch.h
+++ b/stand/kboot/kboot/arch/amd64/termios_arch.h
diff --git a/stand/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc
index c29e69970505..c29e69970505 100644
--- a/stand/kboot/arch/powerpc64/Makefile.inc
+++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc
diff --git a/stand/kboot/arch/powerpc64/fdt_arch.c b/stand/kboot/kboot/arch/powerpc64/fdt_arch.c
index dc5f0fbd8fb6..dc5f0fbd8fb6 100644
--- a/stand/kboot/arch/powerpc64/fdt_arch.c
+++ b/stand/kboot/kboot/arch/powerpc64/fdt_arch.c
diff --git a/stand/kboot/arch/powerpc64/host_syscall.S b/stand/kboot/kboot/arch/powerpc64/host_syscall.S
index f9108065ebfa..f9108065ebfa 100644
--- a/stand/kboot/arch/powerpc64/host_syscall.S
+++ b/stand/kboot/kboot/arch/powerpc64/host_syscall.S
diff --git a/stand/kboot/arch/powerpc64/kerneltramp.S b/stand/kboot/kboot/arch/powerpc64/kerneltramp.S
index 211a6e474d2a..211a6e474d2a 100644
--- a/stand/kboot/arch/powerpc64/kerneltramp.S
+++ b/stand/kboot/kboot/arch/powerpc64/kerneltramp.S
diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc
index f9fcc37f02d8..f9fcc37f02d8 100644
--- a/stand/kboot/arch/powerpc64/ldscript.powerpc
+++ b/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc
diff --git a/stand/kboot/arch/powerpc64/load_addr.c b/stand/kboot/kboot/arch/powerpc64/load_addr.c
index 71662796f284..71662796f284 100644
--- a/stand/kboot/arch/powerpc64/load_addr.c
+++ b/stand/kboot/kboot/arch/powerpc64/load_addr.c
diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c
index ebf35dc72ba0..ebf35dc72ba0 100644
--- a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c
+++ b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c
diff --git a/stand/kboot/arch/powerpc64/start_arch.h b/stand/kboot/kboot/arch/powerpc64/start_arch.h
index 498de29ad0fe..498de29ad0fe 100644
--- a/stand/kboot/arch/powerpc64/start_arch.h
+++ b/stand/kboot/kboot/arch/powerpc64/start_arch.h
diff --git a/stand/kboot/arch/powerpc64/stat_arch.h b/stand/kboot/kboot/arch/powerpc64/stat_arch.h
index 103849b0e82b..103849b0e82b 100644
--- a/stand/kboot/arch/powerpc64/stat_arch.h
+++ b/stand/kboot/kboot/arch/powerpc64/stat_arch.h
diff --git a/stand/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/kboot/arch/powerpc64/syscall_nr.h
index 735e79a09158..735e79a09158 100644
--- a/stand/kboot/arch/powerpc64/syscall_nr.h
+++ b/stand/kboot/kboot/arch/powerpc64/syscall_nr.h
diff --git a/stand/kboot/arch/powerpc64/termios_arch.h b/stand/kboot/kboot/arch/powerpc64/termios_arch.h
index 7b9e8f15a8ca..7b9e8f15a8ca 100644
--- a/stand/kboot/arch/powerpc64/termios_arch.h
+++ b/stand/kboot/kboot/arch/powerpc64/termios_arch.h
diff --git a/stand/kboot/conf.c b/stand/kboot/kboot/conf.c
index b24171ab6e3e..b24171ab6e3e 100644
--- a/stand/kboot/conf.c
+++ b/stand/kboot/kboot/conf.c
diff --git a/stand/kboot/crt1.c b/stand/kboot/kboot/crt1.c
index 2fbe00262da7..2fbe00262da7 100644
--- a/stand/kboot/crt1.c
+++ b/stand/kboot/kboot/crt1.c
diff --git a/stand/kboot/host_syscall.h b/stand/kboot/kboot/host_syscall.h
index fc44419201f6..fc44419201f6 100644
--- a/stand/kboot/host_syscall.h
+++ b/stand/kboot/kboot/host_syscall.h
diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/kboot/host_syscalls.c
index 092ddfd133fd..092ddfd133fd 100644
--- a/stand/kboot/host_syscalls.c
+++ b/stand/kboot/kboot/host_syscalls.c
diff --git a/stand/kboot/hostcons.c b/stand/kboot/kboot/hostcons.c
index 114188adcff2..114188adcff2 100644
--- a/stand/kboot/hostcons.c
+++ b/stand/kboot/kboot/hostcons.c
diff --git a/stand/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c
index 552ae68daced..552ae68daced 100644
--- a/stand/kboot/hostdisk.c
+++ b/stand/kboot/kboot/hostdisk.c
diff --git a/stand/kboot/hostfs.c b/stand/kboot/kboot/hostfs.c
index 02afa885d833..02afa885d833 100644
--- a/stand/kboot/hostfs.c
+++ b/stand/kboot/kboot/hostfs.c
diff --git a/stand/kboot/init.c b/stand/kboot/kboot/init.c
index e707f65096d7..e707f65096d7 100644
--- a/stand/kboot/init.c
+++ b/stand/kboot/kboot/init.c
diff --git a/stand/kboot/kboot.h b/stand/kboot/kboot/kboot.h
index 49e5dea25b12..49e5dea25b12 100644
--- a/stand/kboot/kboot.h
+++ b/stand/kboot/kboot/kboot.h
diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kboot/kbootfdt.c
index 70844820d345..70844820d345 100644
--- a/stand/kboot/kbootfdt.c
+++ b/stand/kboot/kboot/kbootfdt.c
diff --git a/stand/kboot/main.c b/stand/kboot/kboot/main.c
index 17cbfa975926..17cbfa975926 100644
--- a/stand/kboot/main.c
+++ b/stand/kboot/kboot/main.c
diff --git a/stand/kboot/seg.c b/stand/kboot/kboot/seg.c
index 558cac501224..558cac501224 100644
--- a/stand/kboot/seg.c
+++ b/stand/kboot/kboot/seg.c
diff --git a/stand/kboot/termios.c b/stand/kboot/kboot/termios.c
index ec62170a44c9..ec62170a44c9 100644
--- a/stand/kboot/termios.c
+++ b/stand/kboot/kboot/termios.c
diff --git a/stand/kboot/termios.h b/stand/kboot/kboot/termios.h
index f5763292e7d5..f5763292e7d5 100644
--- a/stand/kboot/termios.h
+++ b/stand/kboot/kboot/termios.h
diff --git a/stand/kboot/termios_gen.h b/stand/kboot/kboot/termios_gen.h
index 6e26338d4496..6e26338d4496 100644
--- a/stand/kboot/termios_gen.h
+++ b/stand/kboot/kboot/termios_gen.h
diff --git a/stand/kboot/util.c b/stand/kboot/kboot/util.c
index 7d467a29b059..7d467a29b059 100644
--- a/stand/kboot/util.c
+++ b/stand/kboot/kboot/util.c
diff --git a/stand/kboot/version b/stand/kboot/kboot/version
index b24d6ea8e47a..b24d6ea8e47a 100644
--- a/stand/kboot/version
+++ b/stand/kboot/kboot/version