diff options
| author | phk <phk@FreeBSD.org> | 2002-10-08 07:52:28 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-10-08 07:52:28 +0000 |
| commit | 6f7830c86009acc1957507de58212b67b8bf49fd (patch) | |
| tree | d73ba3308115f3ea2ac33bb5bf5eff542b8c42ad /sys/boot/i386 | |
| parent | 7b7ec527aac97cafee68735e0a79d66d905c3187 (diff) | |
| download | FreeBSD-src-6f7830c86009acc1957507de58212b67b8bf49fd.zip FreeBSD-src-6f7830c86009acc1957507de58212b67b8bf49fd.tar.gz | |
Unbreak boot2 by backing out rev 1.36 to Makefile, which does not
work as advertised:
bang# pwd
/bang/src/sys/boot/i386/boot2
bang# make clean >& /dev/null
bang# cvs -q update -r 1.35 Makefile >& /dev/null
bang# make >& /dev/null
bang# cat /usr/obj/`pwd`/boot2.h
#define XREADORG 0x725
bang# cvs -q update -r 1.36 Makefile > & /dev/null
bang# make clean > & /dev/null
bang# make > & /dev/null
bang# cat /usr/obj/`pwd`/boot2.h
#define XREADORG 0x25
bang#
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 7f3e2f7..05567c1 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 7f3e2f7..05567c1 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 |
