From 436619964437356d6460896274721f9ca41eaeca Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 30 Dec 2021 16:07:06 -0700
Subject: [PATCH] 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
---
 stand/Makefile                                | 3 +++
 stand/{powerpc => }/kboot/Makefile            | 0
 stand/{powerpc => }/kboot/conf.c              | 0
 stand/{powerpc => }/kboot/host_syscall.S      | 0
 stand/{powerpc => }/kboot/host_syscall.h      | 0
 stand/{powerpc => }/kboot/hostcons.c          | 0
 stand/{powerpc => }/kboot/hostdisk.c          | 0
 stand/{powerpc => }/kboot/kbootfdt.c          | 0
 stand/{powerpc => }/kboot/kerneltramp.S       | 0
 stand/{powerpc => }/kboot/ldscript.powerpc    | 0
 stand/{powerpc => }/kboot/main.c              | 0
 stand/{powerpc => }/kboot/ppc64_elf_freebsd.c | 0
 stand/{powerpc => }/kboot/version             | 0
 stand/powerpc/Makefile                        | 4 ----
 14 files changed, 3 insertions(+), 4 deletions(-)
 rename stand/{powerpc => }/kboot/Makefile (100%)
 rename stand/{powerpc => }/kboot/conf.c (100%)
 rename stand/{powerpc => }/kboot/host_syscall.S (100%)
 rename stand/{powerpc => }/kboot/host_syscall.h (100%)
 rename stand/{powerpc => }/kboot/hostcons.c (100%)
 rename stand/{powerpc => }/kboot/hostdisk.c (100%)
 rename stand/{powerpc => }/kboot/kbootfdt.c (100%)
 rename stand/{powerpc => }/kboot/kerneltramp.S (100%)
 rename stand/{powerpc => }/kboot/ldscript.powerpc (100%)
 rename stand/{powerpc => }/kboot/main.c (100%)
 rename stand/{powerpc => }/kboot/ppc64_elf_freebsd.c (100%)
 rename stand/{powerpc => }/kboot/version (100%)

diff --git a/stand/Makefile b/stand/Makefile
index 7ac848f4076a..8fd981cd21f1 100644
--- 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)
diff --git a/stand/powerpc/kboot/Makefile b/stand/kboot/Makefile
similarity index 100%
rename from stand/powerpc/kboot/Makefile
rename to stand/kboot/Makefile
diff --git a/stand/powerpc/kboot/conf.c b/stand/kboot/conf.c
similarity index 100%
rename from stand/powerpc/kboot/conf.c
rename to stand/kboot/conf.c
diff --git a/stand/powerpc/kboot/host_syscall.S b/stand/kboot/host_syscall.S
similarity index 100%
rename from stand/powerpc/kboot/host_syscall.S
rename to stand/kboot/host_syscall.S
diff --git a/stand/powerpc/kboot/host_syscall.h b/stand/kboot/host_syscall.h
similarity index 100%
rename from stand/powerpc/kboot/host_syscall.h
rename to stand/kboot/host_syscall.h
diff --git a/stand/powerpc/kboot/hostcons.c b/stand/kboot/hostcons.c
similarity index 100%
rename from stand/powerpc/kboot/hostcons.c
rename to stand/kboot/hostcons.c
diff --git a/stand/powerpc/kboot/hostdisk.c b/stand/kboot/hostdisk.c
similarity index 100%
rename from stand/powerpc/kboot/hostdisk.c
rename to stand/kboot/hostdisk.c
diff --git a/stand/powerpc/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c
similarity index 100%
rename from stand/powerpc/kboot/kbootfdt.c
rename to stand/kboot/kbootfdt.c
diff --git a/stand/powerpc/kboot/kerneltramp.S b/stand/kboot/kerneltramp.S
similarity index 100%
rename from stand/powerpc/kboot/kerneltramp.S
rename to stand/kboot/kerneltramp.S
diff --git a/stand/powerpc/kboot/ldscript.powerpc b/stand/kboot/ldscript.powerpc
similarity index 100%
rename from stand/powerpc/kboot/ldscript.powerpc
rename to stand/kboot/ldscript.powerpc
diff --git a/stand/powerpc/kboot/main.c b/stand/kboot/main.c
similarity index 100%
rename from stand/powerpc/kboot/main.c
rename to stand/kboot/main.c
diff --git a/stand/powerpc/kboot/ppc64_elf_freebsd.c b/stand/kboot/ppc64_elf_freebsd.c
similarity index 100%
rename from stand/powerpc/kboot/ppc64_elf_freebsd.c
rename to stand/kboot/ppc64_elf_freebsd.c
diff --git a/stand/powerpc/kboot/version b/stand/kboot/version
similarity index 100%
rename from stand/powerpc/kboot/version
rename to stand/kboot/version
diff --git a/stand/powerpc/Makefile b/stand/powerpc/Makefile
index b5d11dd6cf57..d0c5830e4042 100644
--- 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>