From nobody Tue Apr 18 18:04:21 2023 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 4Q1BdK3YjSz45RHj; Tue, 18 Apr 2023 18:04:21 +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 4Q1BdK35vtz45wN; Tue, 18 Apr 2023 18:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681841061; 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=WKxwbSjAOrESi2gqaw890ZifdO5Ek//9u0LS8QjDT8Y=; b=K45e3Bd/Mf1hS1sjf0MYuEWO1phv9T3EQUrZbEpmMeu+6aYhC/fp47oVf9c7Tlp7yqLd50 ggNYiY/C9OI0/clCGs5WN52jHW1twqEwIleV6c93LJX0ec3pcgF0AZmXfOPBNS9vC5AI6R siESS5qA509CJaMaBdzNl/qEehTcvM2R1LyYO3cRPLRkR46eP+L/v8+baEuJSs8I33n/ZY vi34BQKKy1UVTucdDot8ZqeFFj4gVGHSDP+6KOIPCooEDK6mupEpUAaSASXyNIFGKm8KZo 2aw/gsvyBxh+xPKOWiFeJPxgiW+G64+5b84MZQEoyLjYrvWXn4A92U5qHE4osA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681841061; 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=WKxwbSjAOrESi2gqaw890ZifdO5Ek//9u0LS8QjDT8Y=; b=d/DcjLdHrMIPlML0c6sYZQhKd7yhti54tCnVF0VeC4clhBHzHsUuu+tpkI5mYV3nA+Im0V U3oQVtgUunprypGvymPByXGVw3iO1UIvv4PU0bs9vtDAWusPSJpezLdIpVz/3nSd44uygL QZzH5P4XRa7tR2AF91SM0X1QGPB7YKhVy4PSDBzriCkkcOA7XOy5qQv5nsrrxDLTnn+JZ1 JvUg4mrs1KcIyNmiTitlK28MnctqA/gj86kn817nYghRQwj+21Sjoi5zXAghY5gGaHH0TH 4H6IQg3YekKSCz9YQy0fPYoO/WTDepiO0vwIKXOfiQoTtL0Z9bsMYSm/2bkzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681841061; a=rsa-sha256; cv=none; b=X1iRK0GVmy1M94dNO15jGkoqn8HHoVNvTRgIMzuz6Xzr/MNu+43/wqPOiBHiNwJTV2Ge7P 1mX/TXmFFK0c98TqL6ZS+knDqb5QF8sC1v88l/QE703J+zccN/NLbBfq3vhL2L3Xlk+7Al b4nLt9OPYUdrboHefRoCRbu3+LZIQhQIFP6V2zJqgJFpk/CwWoWiLXDDVUO3ct0aDjO3ae b0I01vM8XG4BLH6fAm9Z0O8JLH/elk7nlrwF4bu2kM9EqhGQqNYl9r/cMJ4dck3va3EpM0 ym2kMyH2z0Xly5weezZQZ3pWu5VS7joa8TyvQHuElaWEFl0xOLaBMBmIXTrj3Q== 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 4Q1BdK297kzMm0; Tue, 18 Apr 2023 18:04:21 +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 33II4L7V076569; Tue, 18 Apr 2023 18:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33II4Lfn076568; Tue, 18 Apr 2023 18:04:21 GMT (envelope-from git) Date: Tue, 18 Apr 2023 18:04:21 GMT Message-Id: <202304181804.33II4Lfn076568@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: bd5dc94b998f - main - boot0: Expand the description of BOOT_BOOT0_ORG. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd5dc94b998fe9ea0cd2ce9fcaf8481465b95b27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bd5dc94b998fe9ea0cd2ce9fcaf8481465b95b27 commit bd5dc94b998fe9ea0cd2ce9fcaf8481465b95b27 Author: John Baldwin AuthorDate: 2023-04-18 18:02:50 +0000 Commit: John Baldwin CommitDate: 2023-04-18 18:02:50 +0000 boot0: Expand the description of BOOT_BOOT0_ORG. This really shouldn't even be an option given it is hardcoded as a constant named ORIGIN in the assembly. mbr.S also uses 0x600 and hardcodes it in both the assembly and the Makefile. --- stand/i386/boot0/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stand/i386/boot0/Makefile b/stand/i386/boot0/Makefile index 1453f17751b9..cd645011b8e7 100644 --- a/stand/i386/boot0/Makefile +++ b/stand/i386/boot0/Makefile @@ -36,8 +36,11 @@ BOOT_BOOT0_FLAGS?= 0x8f # 0xb6 (182d) corresponds to 10 seconds. BOOT_BOOT0_TICKS?= 0xb6 -# The base address that we the boot0 code to to run it. Don't change this -# unless you are glutton for punishment. +# 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}