diff options
| author | Brian Feldman <green@FreeBSD.org> | 2002-10-08 12:09:16 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2002-10-08 12:09:16 +0000 |
| commit | 3cfeca53267653851ab9c3c6c192a81b8f542ec6 (patch) | |
| tree | e935b328a9f57d30875ea1093b4f508aebac3a9f /sys/boot | |
| parent | c121fd80b89629b9b50242cbc8fb0fc6f4c48946 (diff) | |
Notes
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 7 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 05567c1724faf..9445fbb58edd5 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -24,6 +24,7 @@ BTX= ${.OBJDIR}/../btx BTX= ${.CURDIR}/../btx .endif +REL1= 0x700 ORG1= 0x7c00 ORG2= 0x1000 @@ -68,8 +69,10 @@ 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 0x7%x\n", x) }' \ - ORG1=`printf "%d" ${ORG1}` > boot2.h + { x = $$1 - ORG1; \ + printf("#define XREADORG %#x\n", REL1 + x) }' \ + ORG1=`printf "%d" ${ORG1}` \ + REL1=`printf "%d" ${REL1}` > boot2.h boot2: boot2.ldr boot2.bin ${BTX}/btx/btx btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \ diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 05567c1724faf..9445fbb58edd5 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -24,6 +24,7 @@ BTX= ${.OBJDIR}/../btx BTX= ${.CURDIR}/../btx .endif +REL1= 0x700 ORG1= 0x7c00 ORG2= 0x1000 @@ -68,8 +69,10 @@ 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 0x7%x\n", x) }' \ - ORG1=`printf "%d" ${ORG1}` > boot2.h + { x = $$1 - ORG1; \ + printf("#define XREADORG %#x\n", REL1 + x) }' \ + ORG1=`printf "%d" ${ORG1}` \ + REL1=`printf "%d" ${REL1}` > boot2.h boot2: boot2.ldr boot2.bin ${BTX}/btx/btx btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \ |