kboot: Move powerpc kboot to top level

As the first step at making this more generic, move kboot to top level. Sponsored by: Netflix Reviewed by: luporl, tsoome Differential Revision: https://reviews.freebsd.org/D33513
2024-07-22 18:56:38 +00:00 · 2021-12-30 16:07:06 -07:00 · 2021-12-30 16:07:06 -07:00 · 4366199644
parent 20a0965182
commit 4366199644
14 changed files with 3 additions and 4 deletions
--- a/stand/Makefile
+++ b/stand/Makefile
@ -39,6 +39,9 @@ INTERP_DEPENDS+=	lua
 .include <bsd.arch.inc.mk>

 S.${MK_EFI}+=		efi
+.if ${MK_FDT} != "no"
+S.${MK_LOADER_KBOOT}+=	kboot
+.endif
 S.${MK_LOADER_UBOOT}+=	uboot

 .if defined(LIB32LIST)
--- a/stand/powerpc/kboot/Makefile
+++ b/stand/powerpc/kboot/Makefile
--- a/stand/powerpc/kboot/conf.c
+++ b/stand/powerpc/kboot/conf.c
--- a/stand/powerpc/kboot/host_syscall.S
+++ b/stand/powerpc/kboot/host_syscall.S
--- a/stand/powerpc/kboot/host_syscall.h
+++ b/stand/powerpc/kboot/host_syscall.h
--- a/stand/powerpc/kboot/hostcons.c
+++ b/stand/powerpc/kboot/hostcons.c
--- a/stand/powerpc/kboot/hostdisk.c
+++ b/stand/powerpc/kboot/hostdisk.c
--- a/stand/powerpc/kboot/kbootfdt.c
+++ b/stand/powerpc/kboot/kbootfdt.c
--- a/stand/powerpc/kboot/kerneltramp.S
+++ b/stand/powerpc/kboot/kerneltramp.S
--- a/stand/powerpc/kboot/ldscript.powerpc
+++ b/stand/powerpc/kboot/ldscript.powerpc
--- a/stand/powerpc/kboot/main.c
+++ b/stand/powerpc/kboot/main.c
--- a/stand/powerpc/kboot/ppc64_elf_freebsd.c
+++ b/stand/powerpc/kboot/ppc64_elf_freebsd.c
--- a/stand/powerpc/kboot/version
+++ b/stand/powerpc/kboot/version
--- a/stand/powerpc/Makefile
+++ b/stand/powerpc/Makefile
@ -6,8 +6,4 @@ NO_OBJ=t

 SUBDIR.yes=		boot1.chrp ofw

-.if "${MACHINE_ARCH}" == "powerpc64"
-SUBDIR.${MK_FDT}+=	kboot
-.endif
-
 .include <bsd.subdir.mk>