diff options
| author | Warner Losh <imp@FreeBSD.org> | 2021-12-30 23:07:06 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-01-24 21:49:19 +0000 |
| commit | a8a68c0442b8acbcada716c908d801786a7de474 (patch) | |
| tree | ae940fe7c5c2f5aff245327d7e4811b89254bae5 | |
| parent | af09db250b09684b0e8fae09f9f702a3b5688b76 (diff) | |
| download | src-a8a68c0442b8acbcada716c908d801786a7de474.tar.gz src-a8a68c0442b8acbcada716c908d801786a7de474.zip | |
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
(cherry picked from commit 436619964437356d6460896274721f9ca41eaeca)
| -rw-r--r-- | stand/Makefile | 3 | ||||
| -rw-r--r-- | stand/kboot/Makefile (renamed from stand/powerpc/kboot/Makefile) | 0 | ||||
| -rw-r--r-- | stand/kboot/conf.c (renamed from stand/powerpc/kboot/conf.c) | 0 | ||||
| -rw-r--r-- | stand/kboot/host_syscall.S (renamed from stand/powerpc/kboot/host_syscall.S) | 0 | ||||
| -rw-r--r-- | stand/kboot/host_syscall.h (renamed from stand/powerpc/kboot/host_syscall.h) | 0 | ||||
| -rw-r--r-- | stand/kboot/hostcons.c (renamed from stand/powerpc/kboot/hostcons.c) | 0 | ||||
| -rw-r--r-- | stand/kboot/hostdisk.c (renamed from stand/powerpc/kboot/hostdisk.c) | 0 | ||||
| -rw-r--r-- | stand/kboot/kbootfdt.c (renamed from stand/powerpc/kboot/kbootfdt.c) | 0 | ||||
| -rw-r--r-- | stand/kboot/kerneltramp.S (renamed from stand/powerpc/kboot/kerneltramp.S) | 0 | ||||
| -rw-r--r-- | stand/kboot/ldscript.powerpc (renamed from stand/powerpc/kboot/ldscript.powerpc) | 0 | ||||
| -rw-r--r-- | stand/kboot/main.c (renamed from stand/powerpc/kboot/main.c) | 0 | ||||
| -rw-r--r-- | stand/kboot/ppc64_elf_freebsd.c (renamed from stand/powerpc/kboot/ppc64_elf_freebsd.c) | 0 | ||||
| -rw-r--r-- | stand/kboot/version (renamed from stand/powerpc/kboot/version) | 0 | ||||
| -rw-r--r-- | stand/powerpc/Makefile | 4 |
14 files changed, 3 insertions, 4 deletions
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 index 46bcc3d0e63a..46bcc3d0e63a 100644 --- a/stand/powerpc/kboot/Makefile +++ b/stand/kboot/Makefile diff --git a/stand/powerpc/kboot/conf.c b/stand/kboot/conf.c index 22562e898ef1..22562e898ef1 100644 --- a/stand/powerpc/kboot/conf.c +++ b/stand/kboot/conf.c diff --git a/stand/powerpc/kboot/host_syscall.S b/stand/kboot/host_syscall.S index a5556aa1b2dc..a5556aa1b2dc 100644 --- a/stand/powerpc/kboot/host_syscall.S +++ b/stand/kboot/host_syscall.S diff --git a/stand/powerpc/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 60b006e5dba4..60b006e5dba4 100644 --- a/stand/powerpc/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h diff --git a/stand/powerpc/kboot/hostcons.c b/stand/kboot/hostcons.c index 31dceb019973..31dceb019973 100644 --- a/stand/powerpc/kboot/hostcons.c +++ b/stand/kboot/hostcons.c diff --git a/stand/powerpc/kboot/hostdisk.c b/stand/kboot/hostdisk.c index 3c36f2d3bce6..3c36f2d3bce6 100644 --- a/stand/powerpc/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c diff --git a/stand/powerpc/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c index 14bc94326fe6..14bc94326fe6 100644 --- a/stand/powerpc/kboot/kbootfdt.c +++ b/stand/kboot/kbootfdt.c diff --git a/stand/powerpc/kboot/kerneltramp.S b/stand/kboot/kerneltramp.S index 15fdfc26bd90..15fdfc26bd90 100644 --- a/stand/powerpc/kboot/kerneltramp.S +++ b/stand/kboot/kerneltramp.S diff --git a/stand/powerpc/kboot/ldscript.powerpc b/stand/kboot/ldscript.powerpc index 729113695105..729113695105 100644 --- a/stand/powerpc/kboot/ldscript.powerpc +++ b/stand/kboot/ldscript.powerpc diff --git a/stand/powerpc/kboot/main.c b/stand/kboot/main.c index 9b99c859070b..9b99c859070b 100644 --- a/stand/powerpc/kboot/main.c +++ b/stand/kboot/main.c diff --git a/stand/powerpc/kboot/ppc64_elf_freebsd.c b/stand/kboot/ppc64_elf_freebsd.c index adbdc7fca915..adbdc7fca915 100644 --- a/stand/powerpc/kboot/ppc64_elf_freebsd.c +++ b/stand/kboot/ppc64_elf_freebsd.c diff --git a/stand/powerpc/kboot/version b/stand/kboot/version index b24d6ea8e47a..b24d6ea8e47a 100644 --- a/stand/powerpc/kboot/version +++ b/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> |