From nobody Fri Feb 2 21:04:54 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 4TRSvq1T7Jz58Gkc; Fri, 2 Feb 2024 21:04:55 +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 4TRSvp5vCbz53xm; Fri, 2 Feb 2024 21:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907894; 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=KfcXwn6ATdfmeiNiX1z+nsfRYAM/Kv+CpACYAOqvZv8=; b=fCgtFU/NchXOFGXpCZ8kbqCnmX/PtYrjIkeZi9KWfypLrdClqcqQVR23Bepkq45HofXqzr xwVUbaUCr5yZfKmzDIACFZa8NjinmJ8Saa6Wzo2UM2N8i8crI2LfwdXVsCfusbVzyRVpZ5 fsMfxV2FEOzUiRQ6JmHInvRr6gFgVULeG5satQ7oKCPby/7bus9pkCdeIopeaCHTI6r1cd 0d54Pi7/GfZNnaCv6vaNN/Jkj3ry0MsPhezrhbRIl+VDRLYiqf6LRvM6zO7WFpHROtNLK7 tQW8ohSPaUzXmaN0qni0zhvfGXWrSLk5ze4BsOSaGjopDLip9Vy40FKGQTtrRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907894; 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=KfcXwn6ATdfmeiNiX1z+nsfRYAM/Kv+CpACYAOqvZv8=; b=ZuaBEKdmS3wf32JH1y6HnU3hxSCd2yWeua8VM8EN8nBzP8Ya3vsCiZXfn9OE7JjCtoura0 gAZLeBYlodnlERaMo3tKMwgRrrZt6THQHKRvI0mCAd9Ynv79voQAb6T7xjcDmOEUPWEVuC ttOEp90e4EDmJBCGzKqobVTkafiN7/vRXcGS8ppS6kEMErZQR7fbc+qnXd/j6yzgYHEcQ2 dnysY7Mp7+Qz9pii3X1fgt/m58TajhXKmA3Vvu0iIP8PfLWyfVRORbDuHL/TuMzjt/ZXuf NcYg9cMWK3xW10IqXpDbaTushuSfJM2Hr7+wBwRMxQTKCRFYZGOEgdVwHoDPqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907894; a=rsa-sha256; cv=none; b=mlhU2eZzmXb0Q+LFh92Vz6m7X5I+wp1W5PWb1+rBEfVc2jtUqheggILBnjyNNMpixEi6qz EXs7M4tAHWxsLuWf/f4WR03b7fQfj+B96JLjxfFoWzNWMiWWDqAPBngNIY09nH/mdVCqUz gMbKpd691Io94PMzzpCARTGLzEND4JP4p81rP48PNCmE+EspvYCTEW2mggKGDPtqnG4pbQ 9eY4lO6vqsvJUZ+5AaKzelzIJe8iozahmexOMvNJVTRLTBuiIZ04GSxL8U2gW07UySHEpQ iyZLmObJQ5UwAOaDPfL+jcOm5LlnoCK7oiaAHrWHX9qkgY6jdkNVOyTYRqZy7w== 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 4TRSvp4lPWzlsf; Fri, 2 Feb 2024 21:04:54 +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 412L4seS056352; Fri, 2 Feb 2024 21:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4sNu056349; Fri, 2 Feb 2024 21:04:54 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:54 GMT Message-Id: <202402022104.412L4sNu056349@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: 784f925e507f - main - loader: Font module is EFI dependent 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 784f925e507f441206279a1e8776629fa7cdd14c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=784f925e507f441206279a1e8776629fa7cdd14c commit 784f925e507f441206279a1e8776629fa7cdd14c Author: Warner Losh AuthorDate: 2024-02-02 01:37:12 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:04 +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 --- 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;