From nobody Tue Apr 16 20:12:35 2024 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 4VJwFH4yfmz5HT5F; Tue, 16 Apr 2024 20:12:35 +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 4VJwFH3ZZpz4shf; Tue, 16 Apr 2024 20:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298355; 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=oLTCwXK93vGJyp2EMtbg5OddMzWctErCx+Y+XpoFmhY=; b=bYT81hGZNqMELIj6MW0E7i+msH7H4+bj/8+0pNlcfAshZWrRl4eAcNTvIGGKj0nrhiVvi4 v+c9SMzkLVWRZ2TmZmEaJS2//A1ou/tlMZKP5MtHrQ8d0lBAQx5LSdAxZPTF9ffTYa1CAT 7epvED0s+/me0iNdU0xoTm3eBe8crXexKBg23j3c2i8Saw08Y4kx+Pu8QOMrYrkyflTEnu BBZ3bGHqv+z8W278hOIMb4PlxDcUF/wvPCpJu6garRN/eI+7q2rudiPKIPSKAXDZGn/Ldz rNDnJEa4yCqF+QeVcV0PY4nqEy1nqEM1BloSbC5NNDr6uLJ0VY5SP90511DEZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298355; a=rsa-sha256; cv=none; b=oi11/OFvZt2iI5GCg+6oc4nFi+ECIgFdLqrA8Hx3ES8Nn0Y7Vzz9j03XiQTyfsc6B2IpXn 6BQqogNNpP7SRXhmm9vYH4DBI9AyDlicDgsT8RpZDJ/DemzPCcFkpFMEaO71I1Wk5YayIw xUoYdmidykj4dTeXLERpm10aUvV9FLTYt1qjKdi7A95giY2hzY9Bp9MMDMddVW3EZyM6dm kmsvo3o3oIrSSi9T7hfW4Ti6shZjNjReeJq6wDmkeI7icvJ8HT408b3z8+RzyC7Zc0Pr1O sk7///cQgTQngQlPZQNx+Uj/8w1nRj4cRCqJImhnxaVXr/MdZhgLCJqJWteO6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298355; 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=oLTCwXK93vGJyp2EMtbg5OddMzWctErCx+Y+XpoFmhY=; b=klQo1JzES/1e3a7LS4lbZj/KdXW0vpyUhfF3pGU7iNZJp1VX4obL1pppJUhz7CCPSQPwBM d4EivepJUwETvH2X0blQLsI/+wUvqKt/sRwJS8E2bzB6IWaDNdwIE0n91fvJC/NkO/wMZy 7+uFQXYBPetrWMJHBP++efCuc0Ybk4baORhRYQfDYiWeyOO/+x61SkRRa0iaLM51VNKW7T RcqhR1VxLGn3BsmkC7itOLen0ShXx8UeOw0/toEMIY6YRyygECE2t57vtWX//onnbuRoXb rS0RskJ9YwcjxQ+x96swM2SLEkHRegRMRc0uuM3YpXS3bRfPNmD+KTvoSt1idA== 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 4VJwFH3Bw9zxXx; Tue, 16 Apr 2024 20:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKCZ32037344; Tue, 16 Apr 2024 20:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCZp0037341; Tue, 16 Apr 2024 20:12:35 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:35 GMT Message-Id: <202404162012.43GKCZp0037341@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: 03de11635be1 - stable/14 - loader: Font module is EFI dependent 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 03de11635be102d0ccfe7e81b550873d319e5a87 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=03de11635be102d0ccfe7e81b550873d319e5a87 commit 03de11635be102d0ccfe7e81b550873d319e5a87 Author: Warner Losh AuthorDate: 2024-02-02 01:37:12 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:22 +0000 loader: Font module is EFI dependent The font module is part of the gfx_fb support. Since we share this file between EFI and kboot, we only want to pass the font data to the kernel when we're booting from EFI, not kboot. Sponsored by: Netflix (cherry picked from commit 784f925e507f441206279a1e8776629fa7cdd14c) --- stand/efi/loader/bootinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index f47d81e23591..13b6df9c5b06 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -386,10 +386,12 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) /* Pad to a page boundary. */ addr = roundup(addr, PAGE_SIZE); +#ifdef EFI addr = build_font_module(addr); /* Pad to a page boundary. */ addr = roundup(addr, PAGE_SIZE); +#endif /* Copy our environment. */ envp = addr;