From nobody Wed Nov 2 17:03:14 2022 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 4N2Y9t5cfxz4gPB5; Wed, 2 Nov 2022 17:03:14 +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 4N2Y9t4wYvz3qTV; Wed, 2 Nov 2022 17:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408594; 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=rSKdNI/Ps4B3HprAPu64PEVZHSDWWg+ahuEjlWR/XcQ=; b=JIjhloySK3NluAMtUvX8hKZBSHtCCMSSrpr3c10y/gzP0ZacNUe/wp7rvtL5IdJASS9jhD 34SK1dPp/VA+V2h50EvGkWS2t3Sf651Ga98U2fTcmaqxWwmJN2BvWasn3Gd9Aw3XiuE5IJ b0S7JS2Py6xqZgZzVRnTd34qifmbMf6KYXjPRwaPG9WGBtYMf6TIt50A+tH3KpPIhYHf51 22kXe7E3adFO5F1ZpIVo8nWeAiyib1USDMmGqwJkV7cYeYJ9pTdThTz1iSMs4qRbEnQrHv you2xyyvEyKRXQIFztoUdTZQ7NmZpxXVuhe1jOn8JfEWvxi1OtSaSp6Pebxk3A== 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 4N2Y9t3gt2z146n; Wed, 2 Nov 2022 17:03:14 +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 2A2H3Eon065136; Wed, 2 Nov 2022 17:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2H3EoJ065135; Wed, 2 Nov 2022 17:03:14 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:03:14 GMT Message-Id: <202211021703.2A2H3EoJ065135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 0baacb12181a - stable/13 - arm64: fix build without FDT 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0baacb12181a02e49d10d208eae920b898ee74c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408594; 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=rSKdNI/Ps4B3HprAPu64PEVZHSDWWg+ahuEjlWR/XcQ=; b=gl5/KISQ/IwKOhqdCPSXeFtkcHvmptyq0yevxqMhJOu/nvmydExug8xQ80Xs+mSZWGYuVX z4UQ6mqT5NMJfS6/NRuUOO7OiWTFtYhgYdIdvV2n3wga4CNpyEEGxjaMmT+fzRmQgNLFsu nAetlheB3AbFOuNuQ1SBsyFbUD5r5PktGc2YAp/RanqlzTgm6/GF2nBn1GrrPd7qqhvluv WqKB3OegiUBFkeVp4zDtt75ozkPBRP5XvHvCr4BCUUMLbLv9B4+FK4VuC2qLZj6k1ChXNp gIDr3G2rpbVQjJIeIKa1eFlb/w754PTNQ6djzzkrRBJ63Jo4C1TpiKJJuR3kEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667408594; a=rsa-sha256; cv=none; b=YkBCMFYwiqOPUZgSi5fIfuMgrr/j6xVaA8iGgTuCPjk5ZPnBeiI+qLfHCmCyrt5XHmW5dy Ofc0gICmfLdwzE7xUuebwKGJay2LvJeM0st841x19C8tIbxtXBYnScES2iRzivVfziPs5X D+/XPVTgmd98uR0hKpnbJnvKEvZwe4gNPHafZBCw4+tl9bvepX3QW+ajcIUYQQ8kraUh93 FK6FrjBUYTp+c8cudgLtjxXNtIpQj3CASdDm/c/4g0QMmwGZgi+VO6koaA4eZP0vizxSeL 6+rpv4CDckOf/dSkJ0iv2Lkf54wvXExzhHUm/21AuepKI43fkLYVyg9F6P4LNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0baacb12181a02e49d10d208eae920b898ee74c0 commit 0baacb12181a02e49d10d208eae920b898ee74c0 Author: Kyle Evans AuthorDate: 2022-09-29 19:33:33 +0000 Commit: Kyle Evans CommitDate: 2022-11-02 17:02:25 +0000 arm64: fix build without FDT static_kenv is only used under `FDT`, and `try_load_dtb` is only defined with `FDT`. Reviewed by: andrew, imp, manu (cherry picked from commit 78f3c734a5b755ceb47fea220e94755c8e82bd67) --- sys/arm64/arm64/machdep.c | 2 ++ sys/arm64/arm64/machdep_boot.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 6e2ec7d39ed2..21c9ced1b0cc 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -773,7 +773,9 @@ initarm(struct arm64_bootparams *abp) update_special_regs(0); link_elf_ireloc(kmdp); +#ifdef FDT try_load_dtb(kmdp); +#endif efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t); diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c index 9ab4edf616e2..9b519f252369 100644 --- a/sys/arm64/arm64/machdep_boot.c +++ b/sys/arm64/arm64/machdep_boot.c @@ -53,9 +53,10 @@ __FBSDID("$FreeBSD$"); extern int *end; static char *loader_envp; -static char static_kenv[4096]; #ifdef FDT +static char static_kenv[4096]; + #define CMDLINE_GUARD "FreeBSD:" #define LBABI_MAX_COMMAND_LINE 512 static char linux_command_line[LBABI_MAX_COMMAND_LINE + 1];