aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-10-08 07:52:28 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-10-08 07:52:28 +0000
commita201162d7127a158118c6aa4eb442885c91d8218 (patch)
treed73ba3308115f3ea2ac33bb5bf5eff542b8c42ad /sys
parent943e5db958faa4c8a7237df4f7d32aaf1a21ed78 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/boot/i386/boot2/Makefile4
-rw-r--r--sys/boot/i386/gptboot/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 7f3e2f70f645a..05567c1724faf 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -24,7 +24,6 @@ BTX= ${.OBJDIR}/../btx
BTX= ${.CURDIR}/../btx
.endif
-REL1= 0x700
ORG1= 0x7c00
ORG2= 0x1000
@@ -69,8 +68,7 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c
boot2.h: boot1.out
${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
- { x = $$1 - ORG1; \
- printf("#define XREADORG %#x\n", REL1 + x) }' \
+ { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \
ORG1=`printf "%d" ${ORG1}` > boot2.h
boot2: boot2.ldr boot2.bin ${BTX}/btx/btx
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 7f3e2f70f645a..05567c1724faf 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -24,7 +24,6 @@ BTX= ${.OBJDIR}/../btx
BTX= ${.CURDIR}/../btx
.endif
-REL1= 0x700
ORG1= 0x7c00
ORG2= 0x1000
@@ -69,8 +68,7 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c
boot2.h: boot1.out
${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
- { x = $$1 - ORG1; \
- printf("#define XREADORG %#x\n", REL1 + x) }' \
+ { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \
ORG1=`printf "%d" ${ORG1}` > boot2.h
boot2: boot2.ldr boot2.bin ${BTX}/btx/btx