From nobody Thu Dec 30 23:31:45 2021 X-Original-To: dev-commits-src-all@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 96F451914C84; Thu, 30 Dec 2021 23:31:46 +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 4JQ4Kt0kmRz4kNy; Thu, 30 Dec 2021 23:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CC325213EB; Thu, 30 Dec 2021 23:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BUNVjFc048416; Thu, 30 Dec 2021 23:31:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUNVj3U048415; Thu, 30 Dec 2021 23:31:45 GMT (envelope-from git) Date: Thu, 30 Dec 2021 23:31:45 GMT Message-Id: <202112302331.1BUNVj3U048415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 436619964437 - main - kboot: Move powerpc kboot to top level List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 436619964437356d6460896274721f9ca41eaeca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640907106; 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=A4Jt4a965eYkrfzi66Fg9TL38+f1PG4FHqKNILOP1r8=; b=Bh2/bhWX0a9krCxeecHuygoMNKechXOd1TtVYpbluUj7FD0bVVOIac6JlmWu331lwsWxm5 8nad9uWuOgK6eFMrI7gs2HCb7frZHloDTHdcRZXpY6Auhy2tP6Y1QnEmnXMR+soJAVvr0G kHE4stJZkfWPyS/iTdc991lWVx97HA6jjGP0jR/rFi3+HsAB5sXe0QDlgMDFuf2TVAixfL bpaDDjsLW3G/pVhEvfaIvyfJKSV6epdmuqmztONv54kmSl6DwaSMMd7mjvGrnt4HfDDGYm TL3uKWkoYdTHTDAURGuj+seJDkP9FFFRAG0HxizlI311DYqBdK0lPvK0XKMBFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640907106; a=rsa-sha256; cv=none; b=hHA/uig/f7MQ8eumURA8gZs6ePAv86R48Qrh7GvvlVvYxvNzzEr4+9EdV/6YSKK65zH4su 6vs0WiWvlRsJBsVMvTBZjEVbvn4BPa1XHHVAowiDRIyM20o/Vs1y+Q1joGwETCzrwY4NTS uLuH71Y/UWdzlicGB5/qJJ2WMmh+bYhHwTbujZ1jWU17syyGzvUlWUIiuUjYtyDQSLgRxN QxQZHjlMxlrPcSFgPXppJRhRIoda/7skHt51N6k/MKu4rcruTs6VMFqrOVdih0ulDRoJVa b8zVoMKYf8JWUQMFThRC5O3+OH9evzkJrFdQ0nJ7xuq9tgpPN+8brgitChQ35Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=436619964437356d6460896274721f9ca41eaeca commit 436619964437356d6460896274721f9ca41eaeca Author: Warner Losh AuthorDate: 2021-12-30 23:07:06 +0000 Commit: Warner Losh CommitDate: 2021-12-30 23:07:06 +0000 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(-) 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 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