From nobody Tue Apr 18 18:19:24 2023 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 4Q1Byp1bBhz45T5d; Tue, 18 Apr 2023 18:19:30 +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 4Q1Byl706qz3PR3; Tue, 18 Apr 2023 18:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681841968; 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=2S+exAiy48Nr3Z2xzMdj3n+Pw6ny7yHPiks16B6f3C0=; b=jSCyxJK4z+ZQdFs//oUEUWrYRhRJyXpM7E7M3wmVr0wac5hK39X0OMkYfXVQFjN22cL+4p Futy3I2gjM8jZAeC/SFkcYLOH+MOa69IK5iFVjBm33WUzweH7OqaVgjJBiDtooS1zWYdyl CAq2qecbu2EBGAKROMdDlJs2y1OL655RrXGACLQM8hBbYK6/jsD2JINza0C9YIa3w6geiR 19ELzXsZdteVdxG2uIzrTtt6qoVebrOD9rzUZHYx5t6l9UuqO1Eu+ayWsb9LUvi1CoyNwV Po9bSJgKwwDoHepLhZTb6RorCWdUTRdBP8AzOXpSX+V9dsIGXOm3gvjl3zbzRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681841968; 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=2S+exAiy48Nr3Z2xzMdj3n+Pw6ny7yHPiks16B6f3C0=; b=w0Jg8i30IBgqqXFNE5kviXC/T+vdd7bAICkV+wyLBHCuM5Nmb9ZdAyPou8Hx7kEeMJmwk0 CNBw9Uu8ssxue5ra3G0CqWIXSZQAWaTTIQ9jkfRHr9ecSbKVb+Ij1Ox+SkRENTKc+PBI7n 6yuo5JH6iV/zbjKeS4bxM5JpDpxiD/FuSvS35Lqktql/ibse/0Sa/+KDyZl8Whs+f2BtLj yy5DMG0Pt9qJb8decDAtWv3Ti/w8PgozwUC3nP3TBc9EVObz44yekVX0vyk2Px9gkTNeJI ZKosQuu6CaC7ce5WwaTwJV2L6QrVnkFVCGOGXScaEoLo0S5OEt68hZcVT89kZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681841968; a=rsa-sha256; cv=none; b=UHKc1MQYqxdq9Ief17Pq2QDeOcrVA2lSk91bO8uOMjsrM1PZz4pYp3NAn2J8o36i1w60/I RwxnUPY4rwJ+gPx2t1kScJJDHXyXrptwqK08hjEaIyNODcCuaP/lQzsWoZBFjolZ9X37V1 92O8ifIHXNmKhHNh0we3wc1CRZ9hA4LoeTJm2ipc3srpwHYIxXYeLLpVZF02lnG2bISwns WaT23obEwIEuFKnjILJlwh/ktjssdzEm+4rsKZkQlKnTD36i46b62BCVoi4pvQBZicjoS/ qxhahNktsizBHyZCmZgB2XMCiNfsaiGNDZLa2kdOpYply+F0vv3QIELB+P9hmA== 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 4Q1Byh5XHjzMn1; Tue, 18 Apr 2023 18:19:24 +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 33IIJOfT097635; Tue, 18 Apr 2023 18:19:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IIJOYQ097634; Tue, 18 Apr 2023 18:19:24 GMT (envelope-from git) Date: Tue, 18 Apr 2023 18:19:24 GMT Message-Id: <202304181819.33IIJOYQ097634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c7f3674fb065 - main - boot0: Drop the BOOT_BOOT0_ORG option. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7f3674fb0651753b85f59b2afb7b9098533334d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f3674fb0651753b85f59b2afb7b9098533334d commit c7f3674fb0651753b85f59b2afb7b9098533334d Author: John Baldwin AuthorDate: 2023-04-18 18:17:13 +0000 Commit: John Baldwin CommitDate: 2023-04-18 18:19:12 +0000 boot0: Drop the BOOT_BOOT0_ORG option. This shouldn't be an option (and I added it in the first place back in 4ae4202e705cf6a12aa3cbb49efb153879a6bc2f and 83f4b92050cbf8913d5c0aac16726c783d8b2d9c). However, unlike the other knobs I added back then, this really shouldn't be a knob since it is hardcoded in the source. --- stand/i386/boot0/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stand/i386/boot0/Makefile b/stand/i386/boot0/Makefile index cd645011b8e7..5e82d7b6ae67 100644 --- a/stand/i386/boot0/Makefile +++ b/stand/i386/boot0/Makefile @@ -39,10 +39,8 @@ BOOT_BOOT0_TICKS?= 0xb6 # The BIOS loads boot0 to the hardcoded address 0x7c00. boot0 copies # itself to this alternate base address before continuing execution so # that next level boot blocks can be loaded at the 0x7c00 address they -# expect. Don't change this unless you are glutton for punishment -# (and fix ORIGIN in the source to match). -BOOT_BOOT0_ORG?= 0x600 -ORG=${BOOT_BOOT0_ORG} +# expect. +ORG= 0x600 # Comm settings for boot0sio. #