From nobody Tue Apr 16 20:12:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJwDz57kTz5HT4n; Tue, 16 Apr 2024 20:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwDz3fXsz4sLR; Tue, 16 Apr 2024 20:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3GNm5S98gusLQupd/FHrgx77/BqKNLeU1mrwmvvU78=; b=W9Docvc6AeQmP0VxTtD0fNbFl7AUJE234GKVQFwFHyCceTbJJ8OS2k5hlDtszQ7ap9s2tI sN0WwKkB63rbHXNPDDpJ0McSmu4GwU2h3YPCKVzDfo0SrhhG/ZSF5dhtHnVKwLSslGHGy4 jC4h9AKiVm2gH4bXKmkf1ifBkvcZLYRjTmC0x1LyKN6bqUB33EIWzqJ8NOTGuHmxFUYs7J Ht32p8ZFVrU1otfwGbGSi3Bz7Gaz4oJSdsM/KkiDjiiWSxuRIUogx5ghi4yGlHktx5kCIx 7IBpKkSfJxc6EtO611j8/MErAC/gwlq+Bk+PBWzNzsxhPVJgapfwWoPwY3GqXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298339; a=rsa-sha256; cv=none; b=iGqjk/VOiMsIojC42PnUL7IlNUBT4BwdFkvRtYh/ICuzXw3xrNJN1iiL0I4KF8CAql7C/y xfHTSXYqi5bPXmhWxL7LN1L4DZPHb8lfeiXzKgJgL8f9kzKgWOD7QQ9KpYjVR5YYP8BHau yKWGTy8MGoPb+FzMSHIBUke15kwYrdIm6zEbkeOu8w9J9f26cf2eNCveP8DKCphk24Q4zG 9PFHNUUmZL6zUvGykVeH5sHjVpwlUyH8pnReTF5EIb/hnPaKHl7abb519btOP3p/qRs7Qo QIbfCztdSLsL4AfxPZbZ+jm60cjG5NTaPNjsnewEXw1TnmbQSPtPc8qc7w25uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3GNm5S98gusLQupd/FHrgx77/BqKNLeU1mrwmvvU78=; b=h8qivsvyg+5QnfKQPwbnRA0SuQMzfu3NSnpjJoFSzPKsngjy0ron/ulqHmwc0X5dbwy/Jr hCq1yi83IjglkJ0FqB3PrkoPyxW1fISuSnL3CmjQR7uwqZtqsyEY0zNNCJanHH26jrkDud jI2Xsm44D8cnQq1VRkkUq7TdvzhjoDz5TrnskHS4hpPJWjXxWP4vk5jf+fRGIlyHI35Vs5 K6PAZrfb5Thgq2xtTxZbFNlnuo4585WMBtubIw/nTbTy72ZV7qSmvq1Toijm821isZgu8i AnDdg3NLs6gFtDr21aGwvSEGcLB9PoWXZTvnD0OVgmndABGKTJOw798Q48HKew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJwDz3GnqzxXq; Tue, 16 Apr 2024 20:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKCJBP036643; Tue, 16 Apr 2024 20:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCJEZ036640; Tue, 16 Apr 2024 20:12:19 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:19 GMT Message-Id: <202404162012.43GKCJEZ036640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f20b349448f1 - stable/14 - kboot: Move to kboot/kboot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f20b349448f1522fffccd80a4d1f46bfd7c3f28a Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f20b349448f1522fffccd80a4d1f46bfd7c3f28a commit f20b349448f1522fffccd80a4d1f46bfd7c3f28a Author: Warner Losh AuthorDate: 2024-01-28 18:05:05 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:20 +0000 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 (cherry picked from commit 091c255b5b279fddf445a42dd7d0bad0e7c213fd) --- stand/kboot/Makefile | 68 +-------------------- stand/kboot/Makefile.inc | 1 + stand/kboot/kboot/Makefile | 69 ++++++++++++++++++++++ stand/kboot/{ => kboot}/arch/aarch64/Makefile.inc | 0 stand/kboot/{ => kboot}/arch/aarch64/exec.c | 0 stand/kboot/{ => kboot}/arch/aarch64/fdt_arch.c | 0 .../kboot/{ => kboot}/arch/aarch64/host_syscall.S | 0 .../{ => kboot}/arch/aarch64/ldscript.aarch64 | 0 stand/kboot/{ => kboot}/arch/aarch64/load_addr.c | 0 stand/kboot/{ => kboot}/arch/aarch64/start_arch.h | 0 stand/kboot/{ => kboot}/arch/aarch64/stat_arch.h | 0 stand/kboot/{ => kboot}/arch/aarch64/syscall_nr.h | 0 .../kboot/{ => kboot}/arch/aarch64/termios_arch.h | 0 stand/kboot/{ => kboot}/arch/aarch64/tramp.S | 0 stand/kboot/{ => kboot}/arch/amd64/Makefile.inc | 0 stand/kboot/{ => kboot}/arch/amd64/amd64_tramp.S | 0 stand/kboot/{ => kboot}/arch/amd64/elf64_freebsd.c | 0 stand/kboot/{ => kboot}/arch/amd64/fdt_arch.c | 0 stand/kboot/{ => kboot}/arch/amd64/host_syscall.S | 0 stand/kboot/{ => kboot}/arch/amd64/ldscript.amd64 | 0 stand/kboot/{ => kboot}/arch/amd64/load_addr.c | 0 stand/kboot/{ => kboot}/arch/amd64/multiboot2.h | 0 stand/kboot/{ => kboot}/arch/amd64/start_arch.h | 0 stand/kboot/{ => kboot}/arch/amd64/stat_arch.h | 0 stand/kboot/{ => kboot}/arch/amd64/syscall_nr.h | 0 stand/kboot/{ => kboot}/arch/amd64/termios_arch.h | 0 .../kboot/{ => kboot}/arch/powerpc64/Makefile.inc | 0 stand/kboot/{ => kboot}/arch/powerpc64/fdt_arch.c | 0 .../{ => kboot}/arch/powerpc64/host_syscall.S | 0 .../kboot/{ => kboot}/arch/powerpc64/kerneltramp.S | 0 .../{ => kboot}/arch/powerpc64/ldscript.powerpc | 0 stand/kboot/{ => kboot}/arch/powerpc64/load_addr.c | 0 .../{ => kboot}/arch/powerpc64/ppc64_elf_freebsd.c | 0 .../kboot/{ => kboot}/arch/powerpc64/start_arch.h | 0 stand/kboot/{ => kboot}/arch/powerpc64/stat_arch.h | 0 .../kboot/{ => kboot}/arch/powerpc64/syscall_nr.h | 0 .../{ => kboot}/arch/powerpc64/termios_arch.h | 0 stand/kboot/{ => kboot}/conf.c | 0 stand/kboot/{ => kboot}/crt1.c | 0 stand/kboot/{ => kboot}/host_syscall.h | 0 stand/kboot/{ => kboot}/host_syscalls.c | 0 stand/kboot/{ => kboot}/hostcons.c | 0 stand/kboot/{ => kboot}/hostdisk.c | 0 stand/kboot/{ => kboot}/hostfs.c | 0 stand/kboot/{ => kboot}/init.c | 0 stand/kboot/{ => kboot}/kboot.h | 0 stand/kboot/{ => kboot}/kbootfdt.c | 0 stand/kboot/{ => kboot}/main.c | 0 stand/kboot/{ => kboot}/seg.c | 0 stand/kboot/{ => kboot}/termios.c | 0 stand/kboot/{ => kboot}/termios.h | 0 stand/kboot/{ => kboot}/termios_gen.h | 0 stand/kboot/{ => kboot}/util.c | 0 stand/kboot/{ => kboot}/version | 0 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 -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 +.include 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 + +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 diff --git a/stand/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc similarity index 100% rename from stand/kboot/arch/aarch64/Makefile.inc rename to stand/kboot/kboot/arch/aarch64/Makefile.inc diff --git a/stand/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c similarity index 100% rename from stand/kboot/arch/aarch64/exec.c rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/fdt_arch.c rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/host_syscall.S rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/ldscript.aarch64 rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/load_addr.c rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/start_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/stat_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/syscall_nr.h rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/termios_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/aarch64/tramp.S rename to stand/kboot/kboot/arch/aarch64/tramp.S diff --git a/stand/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc similarity index 100% rename from stand/kboot/arch/amd64/Makefile.inc rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/amd64_tramp.S rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/elf64_freebsd.c rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/fdt_arch.c rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/host_syscall.S rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/ldscript.amd64 rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/load_addr.c rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/multiboot2.h rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/start_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/stat_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/syscall_nr.h rename to 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 similarity index 100% rename from stand/kboot/arch/amd64/termios_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/Makefile.inc rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/fdt_arch.c rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/host_syscall.S rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/kerneltramp.S rename to stand/kboot/kboot/arch/powerpc64/kerneltramp.S diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc similarity index 100% rename from stand/kboot/arch/powerpc64/ldscript.powerpc rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/load_addr.c rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/start_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/stat_arch.h rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/syscall_nr.h rename to 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 similarity index 100% rename from stand/kboot/arch/powerpc64/termios_arch.h rename to stand/kboot/kboot/arch/powerpc64/termios_arch.h diff --git a/stand/kboot/conf.c b/stand/kboot/kboot/conf.c similarity index 100% rename from stand/kboot/conf.c rename to stand/kboot/kboot/conf.c diff --git a/stand/kboot/crt1.c b/stand/kboot/kboot/crt1.c similarity index 100% rename from stand/kboot/crt1.c rename to stand/kboot/kboot/crt1.c diff --git a/stand/kboot/host_syscall.h b/stand/kboot/kboot/host_syscall.h similarity index 100% rename from stand/kboot/host_syscall.h rename to stand/kboot/kboot/host_syscall.h diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/kboot/host_syscalls.c similarity index 100% rename from stand/kboot/host_syscalls.c rename to stand/kboot/kboot/host_syscalls.c diff --git a/stand/kboot/hostcons.c b/stand/kboot/kboot/hostcons.c similarity index 100% rename from stand/kboot/hostcons.c rename to stand/kboot/kboot/hostcons.c diff --git a/stand/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c similarity index 100% rename from stand/kboot/hostdisk.c rename to stand/kboot/kboot/hostdisk.c diff --git a/stand/kboot/hostfs.c b/stand/kboot/kboot/hostfs.c similarity index 100% rename from stand/kboot/hostfs.c rename to stand/kboot/kboot/hostfs.c diff --git a/stand/kboot/init.c b/stand/kboot/kboot/init.c similarity index 100% rename from stand/kboot/init.c rename to stand/kboot/kboot/init.c diff --git a/stand/kboot/kboot.h b/stand/kboot/kboot/kboot.h similarity index 100% rename from stand/kboot/kboot.h rename to stand/kboot/kboot/kboot.h diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kboot/kbootfdt.c similarity index 100% rename from stand/kboot/kbootfdt.c rename to stand/kboot/kboot/kbootfdt.c diff --git a/stand/kboot/main.c b/stand/kboot/kboot/main.c similarity index 100% rename from stand/kboot/main.c rename to stand/kboot/kboot/main.c diff --git a/stand/kboot/seg.c b/stand/kboot/kboot/seg.c similarity index 100% rename from stand/kboot/seg.c rename to stand/kboot/kboot/seg.c diff --git a/stand/kboot/termios.c b/stand/kboot/kboot/termios.c similarity index 100% rename from stand/kboot/termios.c rename to stand/kboot/kboot/termios.c diff --git a/stand/kboot/termios.h b/stand/kboot/kboot/termios.h similarity index 100% rename from stand/kboot/termios.h rename to stand/kboot/kboot/termios.h diff --git a/stand/kboot/termios_gen.h b/stand/kboot/kboot/termios_gen.h similarity index 100% rename from stand/kboot/termios_gen.h rename to stand/kboot/kboot/termios_gen.h diff --git a/stand/kboot/util.c b/stand/kboot/kboot/util.c similarity index 100% rename from stand/kboot/util.c rename to stand/kboot/kboot/util.c diff --git a/stand/kboot/version b/stand/kboot/kboot/version similarity index 100% rename from stand/kboot/version rename to stand/kboot/kboot/version