From nobody Fri Nov 08 00:59:57 2024 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 4Xl0wF2gqdz5cxVW; Fri, 08 Nov 2024 00:59:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xl0wF1Fdgz4VSw; Fri, 8 Nov 2024 00:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731027597; 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=9tXoLPWAATQx79XzIFXwKMlCczf8ZaP3eudrZS8cKsM=; b=Y2Bt1VTPrZCOQyy8+v8z++HrTtWYeWx2sKHl/4ELIMSurBYKALAbpkF426m4BciJX981XI 2bTlXqtVB0JoCEtJ7rVcOJ/yhodh0/liiwTXl3bshQZpPmLmGal0M6gFrVnfMGzbIvUnqW zosl9LneCJAHEfGXqsPmpDpHtk8WKcqmAM/2YEjQvr+pnccMYVGGpqCX4IFAX4yuersUgs CvQShvIz8ZrSsGHYwUWGB7qHk9CMrKS7vQpycWyJ+SW8a5ODIwc7CSoEzv5cVwswsYYzPQ xEs91caWU5xC3x2KbHMVw83UQJy7tecj/rP6RcqagoFgKcs1CxHQCut9xplJmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731027597; 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=9tXoLPWAATQx79XzIFXwKMlCczf8ZaP3eudrZS8cKsM=; b=nD3sGEL9RqxG+ZKgJiPdybjVpTloeT13LwKfTEJzXtZ32eg6j27L30SNtGJmOlxp4kh8Ho Vjm66EAPbZND2aGIIraSeMoLRev4hKw8wEvk6ZbNbCcCeox8xbznATVzt6VrlXzzBr1aH1 VkT0M0PWetGT1BB9vFrcwLLWHeVM77teFNkRIQYNU4riVioDWxmPWwt86ol5Z9YxEy1xfs 5AsyKFsFLJYdpINmEfdoI2oMRaWprp1FzG6/JdjLc3Y5kM8YxwhrOhDXOpWtKJdlB/SV+d fn3YjgSH9TASSAJSI+Ty68Nn2vis01U/l5UI7uR/RXZaG3aQanSyJQB0u8w1wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731027597; a=rsa-sha256; cv=none; b=u/g64s2in5ZM0CUju4OiY1ZzY9NZTQdQTFlrRHUty/34KITmaUga36jb+KTwgsWwmuYYgD Nf760bT9GiOQprpYoATlUj+xG9lpmR1JwZyjt6YwjQqlwmOJAvcpa4YtIs07F4x2Rw+qu7 wn9ZMxeILm1LwneEuZnkUGiXAFZSsO8VUY8u7a7nHBvDLussd8+tYbUmyQT/C/em8Osj/B hRiKWBAQ2esMb/Xp9MGtD5JeRCIxd3mryOnZSgWtxvPC5CRg954Q982guleIbH8sg1XXW1 0Sv+N6ezap8P+gz9LsDw3aCJ1f7U0AzV1srFjdRTkWxeJvJ4NTRnqGtzfn+X7w== 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 4Xl0wF0lpRz17kn; Fri, 8 Nov 2024 00:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A80xv8g000457; Fri, 8 Nov 2024 00:59:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A80xv9q000454; Fri, 8 Nov 2024 00:59:57 GMT (envelope-from git) Date: Fri, 8 Nov 2024 00:59:57 GMT Message-Id: <202411080059.4A80xv9q000454@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: d2434697bc9c - main - loader.kboot: Build on amd64 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d2434697bc9cc2d36da0f356cc5942b33df87896 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2434697bc9cc2d36da0f356cc5942b33df87896 commit d2434697bc9cc2d36da0f356cc5942b33df87896 Author: Warner Losh AuthorDate: 2024-11-07 22:59:04 +0000 Commit: Warner Losh CommitDate: 2024-11-07 23:23:26 +0000 loader.kboot: Build on amd64 But comment out FDT stuff for amd64 built inside kboot. This also restricts a bit the powerpc platforms we build on to powerpc64. Sponsored by: Netflix --- stand/Makefile | 2 +- stand/kboot/kboot/Makefile | 5 ++++- stand/kboot/kboot/main.c | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stand/Makefile b/stand/Makefile index ce91802d4a8b..5d81e5f8a032 100644 --- a/stand/Makefile +++ b/stand/Makefile @@ -37,7 +37,7 @@ INTERP_DEPENDS+= lua .include S.${MK_EFI}+= efi -.if ${MK_FDT} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "powerpc64" S.${MK_LOADER_KBOOT}+= kboot .endif S.${MK_LOADER_UBOOT}+= uboot diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index d354e1bc7e60..064d43701ebd 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -24,12 +24,15 @@ SRCS= \ hostdisk.c \ hostfs.c \ init.c \ - kbootfdt.c \ main.c \ seg.c \ util.c \ vers.c +.if ${MK_FDT} != "no" +SRCS+= kbootfdt.c +.endif + .if ${MK_LOADER_ZFS} != "no" CFLAGS+= -I${ZFSSRC} CFLAGS+= -I${SYSDIR}/contrib/openzfs/include diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index 994df1ec9fa1..a9ea2d9354c9 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -26,7 +26,9 @@ #include #include #include +#ifdef LOADER_FDT_SUPPORT #include +#endif #include #include @@ -620,6 +622,7 @@ kboot_zfs_probe(void) #endif } +#ifdef LOADER_FDT_SUPPORT /* * Since proper fdt command handling function is defined in fdt_loader_cmd.c, * and declaring it as extern is in contradiction with COMMAND_SET() macro @@ -634,4 +637,4 @@ command_fdt(int argc, char *argv[]) } COMMAND_SET(fdt, "fdt", "flattened device tree handling", command_fdt); - +#endif