From nobody Thu Sep 29 19:33:53 2022 X-Original-To: dev-commits-src-main@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 4Mdk7P5QBNz4V4Jq; Thu, 29 Sep 2022 19:33:53 +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 4Mdk7P1NBlz4P38; Thu, 29 Sep 2022 19:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664480033; 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=5qNl6HsTxPQOIGN378kkYAoTWyNKkaJuM4zjHBvxw14=; b=IvIbraPpDL5u+P/elAJFVqOvIJhLrH/qvK2/v204XDeZ3LXNzrh/GLo6YEUuv3/0rc7THX JBkOTQaR7Vd3RpPyX4AKydqpVvxUCMGYZTz/XheIgDOWcKfIp3dJoAVBfCwqaHt4pMRqEc QU6TXn5YVIIFnTsXBTTGr3Kx8FVgZSb8YdF9ttFbCEkP9SwnLN/MxLUzSZjGekqAoVbm7G hHWYWKfdItyem23Iuz2EP2q2c7yvHh0KIgdiIbVsugX1r39DyfD1pG5+3m/tsnE6Dv+pqg vi8PH5r4VvoLYbMaEuO3SMCUwwE2zMsfxiFtS6Ah24bB1fJcPSeuRIu7vgRs8g== 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 4Mdk7P0Trkzw6n; Thu, 29 Sep 2022 19:33:53 +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 28TJXrDj015124; Thu, 29 Sep 2022 19:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TJXrPj015123; Thu, 29 Sep 2022 19:33:53 GMT (envelope-from git) Date: Thu, 29 Sep 2022 19:33:53 GMT Message-Id: <202209291933.28TJXrPj015123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 78f3c734a5b7 - main - arm64: fix build without FDT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 78f3c734a5b755ceb47fea220e94755c8e82bd67 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664480033; 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=5qNl6HsTxPQOIGN378kkYAoTWyNKkaJuM4zjHBvxw14=; b=tmPK6wJGQRsif/cBZo5xc09VzfKWorfwvzwpcnJQGLN2XspKJDKAi7NfmxLMSFURolBrSq XjGWSBdGvUl/6kw5k1N492zW7cCD3PBGatcON9ZLHZcnfCAEb0b53ipOl2Dggc7cj7EXhE nAKxhlluxCjxoQYa1FBadjqrm09MomfmkTkpf7vN0u02N8kmOT/caDpNOVN4sZgDk+duYI lS7z9RMzbjf6n7kNiJxF1eQUtx4rd8Ot7OVAjB/U/GMY6Fffzmqr9dTcanvqfAslBsRnnH klUMfRR0wxp+7w1AWYX8PYE4l7iFrh6oJGM05HFHXmQS06QJ6/ezlMm19B+QJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664480033; a=rsa-sha256; cv=none; b=GDXlGaadZCo/FWP+E8hi5cKr/u9hv5cGCYh5vzSH5GiMieW0n333QXIMhylYsjzEhI8BKR Jn1eb6o8yaVI22BR1bcGiZhYjEwCurUAwBwjKTVJDO+9ltv9ZlyFl3c+6EabNO/1Zl8g4+ aoP2QARaIuVBpL2N4OaUVuVzSqjJ6P59APPfRQSMOXDAWzFqvEqnicZq0rQu0BpPJeRgIL 5qyzQAtGNP5CwlR+DKbOx/mqhgbnRL8TI1DXnRl8CayK1fQP8N6NFR/AVV5XzoBX0z/G62 PJD7WkohRhmNqUaEKEGwjTjYFfFQ1y13VQbYa8IACjj3CQ63R0HT+BwQ6WMuIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=78f3c734a5b755ceb47fea220e94755c8e82bd67 commit 78f3c734a5b755ceb47fea220e94755c8e82bd67 Author: Kyle Evans AuthorDate: 2022-09-29 19:33:33 +0000 Commit: Kyle Evans CommitDate: 2022-09-29 19:33:33 +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 Differential Revision: https://reviews.freebsd.org/D36791 --- 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 be6b289b0489..3f4ebac52cbe 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -768,7 +768,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];