git: c7f3674fb065 - main - boot0: Drop the BOOT_BOOT0_ORG option.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Apr 2023 18:19:24 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=c7f3674fb0651753b85f59b2afb7b9098533334d
commit c7f3674fb0651753b85f59b2afb7b9098533334d
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-04-18 18:17:13 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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.
#