From nobody Thu Aug 11 16:27:52 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 4M3XKN3Twsz4Yry7; Thu, 11 Aug 2022 16:27:52 +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 4M3XKN34lrz3qwN; Thu, 11 Aug 2022 16:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235272; 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=vy6DX+Bq47Ro7snWxX1QdMY9nQC8paRB0fF8hYJPRnA=; b=eFVWqISw2oX2j/DhbMCTY05XYemOTvmVSWcCldAEoGqq8nyTRnWIQ6c1julV6l6n4wbytc qb1ZpIdJ1ima9i9Lo09aYE9K/ktdf/B5imw3AyQj0Xi1VJCmlL8s/iZgT0ml4ujN1SZ5rP peqCyQTBNYed6dW40Lrz6I2CMhu9UnmFSPAk8i/7YN2/nZtCmc6dTbvOb5AtImpDLIyGIF WD3nXG5fFmXJRXDhg+octvJSUlQFnAiQKTm3RfDyzVSpvvSeZm3sfCKf2v9PLrHlIktaFR Bqy3otD7cmWL/hwRURigIG8my7pOJu5fBcrvX6vV9MtOvTV304AXE3CNo0b5eA== 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 4M3XKN22FBzyKh; Thu, 11 Aug 2022 16:27:52 +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 27BGRqJs055606; Thu, 11 Aug 2022 16:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BGRq65055605; Thu, 11 Aug 2022 16:27:52 GMT (envelope-from git) Date: Thu, 11 Aug 2022 16:27:52 GMT Message-Id: <202208111627.27BGRq65055605@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: 7d72ff905770 - main - stand: Make BIOS loader size limits settable 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: 7d72ff905770a64a22125c890438189db71104ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235272; 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=vy6DX+Bq47Ro7snWxX1QdMY9nQC8paRB0fF8hYJPRnA=; b=KX6tSYairL0MiqUfvbzBrIeQIZ2g+mVZwbFvyh4I1l0odZKlVomlQefiWw11RSediL2MQv vkQq6Y+UYuFFDHV0biZBOaJxpsvrISje08ZuM9tByVWYoN4o9aQ0qIPa+ozhhNPE8ZpojO 6J8v94i0u3Z6vlfu2LyblcfINbmFlYz7jbhk1RtijlXN7Wz5qCFppnqDmiGOP44Z5+l1WP DiSggXB9LnkAshcnrNAKsEAUHCs8mxmlPjojTspq3pblNSMHB9+Rt5wLiR//aHRGnMR2vB EAI3ZAsEhYFACMAnzSqbQoZVzsqI8WwafjDeyvWFH5mtibcDM8TMX2ewbpD/fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660235272; a=rsa-sha256; cv=none; b=nvHqdXGNw+PBzUtkbdJW1hHEYuRNkPZFVABpic2wALlZIQkQz+iHaQyRID9FV0PHGLGZo8 B8vw4Yg/Rk4oXyDhqWnqKROh5JK7IPBExAYaezmFSBPRUNFkTJwlsxPLU2cSyt+1Ucbde8 6eBKmDNi7QC9DqA0GVX5QOTgVAComjEuNfmE6zwwhobMPvCRT0q6Enuxs9KhW0R/WxapEp fcKZvvMWQ1BpGCUjLbBpYm/iBY9oj0/BiDTb+u++96siUZWlqKrSLKzMIb347Jpxcs5B6W 9aFoEF05tzid6yWH4pjrI5B31SOW9Ddac3RjFZ3adYoUosFf0WPyJz2CKS78EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d72ff905770a64a22125c890438189db71104ae commit 7d72ff905770a64a22125c890438189db71104ae Author: Warner Losh AuthorDate: 2022-08-11 16:24:58 +0000 Commit: Warner Losh CommitDate: 2022-08-11 16:27:17 +0000 stand: Make BIOS loader size limits settable It's sometimes desirable to override the size limit: It's a soft limit and there are times we exceed the limit by just a little bit and don't want the build to fail (or we are hitting runtime failures below the 510,000 byte limit). Sponsored by: Netflix --- stand/i386/loader/Makefile | 2 +- stand/i386/pxeldr/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index cde1513aac06..8b027b2edd61 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -19,7 +19,7 @@ PROG= ${LOADER}.sym INTERNALPROG= NEWVERSWHAT?= "bootstrap loader" x86 VERSION_FILE= ${.CURDIR}/../loader/version -LOADERSIZE= 510000 # Largest known safe size +LOADERSIZE?= 510000 # Largest known safe size .PATH: ${BOOTSRC}/i386/loader diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index f8bc1eae9a31..3d27285968ce 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -13,7 +13,7 @@ BOOT= pxeboot LDR= pxeldr ORG= 0x7c00 LOADER= loader -PXELDRSIZE= 510000 # Largest known safe size +PXELDRSIZE?= 510000 # Largest known safe size .if defined(BOOT_PXELDR_PROBE_KEYBOARD) CFLAGS+=-DPROBE_KEYBOARD