From nobody Tue Jan 24 22:10:11 2023 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 4P1h3l5qhqz3bdY5; Tue, 24 Jan 2023 22:10:11 +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 4P1h3l50gqz4JPS; Tue, 24 Jan 2023 22:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598211; 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=PX2HaRG5m3J8BZp+QCqpN2nh/mbCBYa0m8JTaUz/iRU=; b=Tf8yZIzZuSaC/Iko84WWWXx/SFBSnfPW1JXVZRgkj78E8Ba0LibBxsr8hAg0OYPKGA9Wp+ nAp+lVN8RyJSZV35n/Spd9ddZV8tQmKbqPgdLmxb3ARUQ8L2O2qdTIK0losFqew7djQUdE /pUAEvTu+MjSfSMEo6kEXEDJ2WCAkak2NLf+WKUfcVN6rjFlikic3vKYGVExJpUMCQpj6N 7BwW/cTDw6eJPqua5eEKsUlRlhQVd5H7kt8iM6NOY2umbLOq7/Cs+h8rKpS1/7iKfuTtPj 2Gn2JhyVYbgdHmMWzCzhLKGj9pGQ1sBu4XKaPw2ew5wwlBN2tt0nQLjB0uDqBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598211; 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=PX2HaRG5m3J8BZp+QCqpN2nh/mbCBYa0m8JTaUz/iRU=; b=NPl84paHMmoYXm72aLfKT5YaeDGTSlulhNwiVYPMN+hLELmbo/WzXFOLHwkF+Q+BQToJVO bz53UzNR3OZHyUBC1Shxyi5eSvHDgnUmL7TMLAY1eS7bcK5OD2kltRodaK4ljfe7CYgHmN Rl9yS+q5mDolXnNw/MVuGfs7b01TwziAuzSfJIwQBawjll8edeF9AKHSBwWm8OvQYtrWHp b6hz/dnQdu3PfAuQgx5cR8Hfy4NFfDp6oxeLiY7w+9KHOEBFyr48Da3gTd6aJ2yXXWgpjm 3SSOX8QRovZItn7X/ShA5KJ0sMaAyrS28CFKBEAqNVtIZHraBmTIObg3aw/ssg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598211; a=rsa-sha256; cv=none; b=IT9HikVRp5Zp3y7ZTAtEiwyvZZg0pehXS9wUE4EIJye0N44v0rrD4ouJZYfoom+PdBIX3x C3KUmXYV6FmJv8YUC/e8FrT+DmwvFmzmhYCbMXlMZRt7v3XjjF5DjUijTng0zQMAewMi0R i89aHl7RzmQpPNn8PIzh5pAQmW2z32UfnFQ2q6+VbTnf5wVfFu2FuDouRDLXvnrZYzjwhE KxoHry+RuZhE540oNOxHvyUxJYEbAAXQgj0f2jQDHr0Lwd9QkKZMg/beDZ2FdFy4kYGJ+r UC06vee6q/lkjajBg+iPf86XscM1LKieaBetbjsBe/1kT4R63LRvxqZ+cLZhBA== 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 4P1h3l43tNzQWZ; Tue, 24 Jan 2023 22:10:11 +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 30OMABOd076328; Tue, 24 Jan 2023 22:10:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMABWu076325; Tue, 24 Jan 2023 22:10:11 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:11 GMT Message-Id: <202301242210.30OMABWu076325@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: a8a68c0442b8 - stable/13 - kboot: Move powerpc kboot to top level 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: a8a68c0442b8acbcada716c908d801786a7de474 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8a68c0442b8acbcada716c908d801786a7de474 commit a8a68c0442b8acbcada716c908d801786a7de474 Author: Warner Losh AuthorDate: 2021-12-30 23:07:06 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:19 +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 (cherry picked from commit 436619964437356d6460896274721f9ca41eaeca) --- 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