diff options
author | Doug Ambrisko <ambrisko@FreeBSD.org> | 2004-07-02 20:32:34 +0000 |
---|---|---|
committer | Doug Ambrisko <ambrisko@FreeBSD.org> | 2004-07-02 20:32:34 +0000 |
commit | ad6df43c99183cfee9ac5ddb02923a65a81b339e (patch) | |
tree | b764fd7de73a5a70cdd08ac98c8512e28b509d00 /net/etherboot | |
parent | 8ac7b02bfa9db8c50159d454d5a8339d39017661 (diff) |
Revert the 5.2.4 version of boot1a.s to that of the former 5.0.8.
This should make things work like before. Update the desc. for
compressed images lzrom -> zrom.
Notes
Notes:
svn path=/head/; revision=112800
Diffstat (limited to 'net/etherboot')
-rw-r--r-- | net/etherboot/files/patch-ad | 32 | ||||
-rw-r--r-- | net/etherboot/pkg-descr | 2 |
2 files changed, 33 insertions, 1 deletions
diff --git a/net/etherboot/files/patch-ad b/net/etherboot/files/patch-ad new file mode 100644 index 000000000000..47bf32e03aba --- /dev/null +++ b/net/etherboot/files/patch-ad @@ -0,0 +1,32 @@ +--- arch/i386/prefix/boot1a.s Wed Jun 30 14:16:27 2004 ++++ /usr/home/ambrisko/boot1a.s Thu Jul 1 10:18:17 2004 +@@ -1,7 +1,3 @@ +-# This code is no longer used in Etherboot. It is not maintained and +-# may not work. +- +- + # + # Copyright (c) 1998 Robert Nordier + # All rights reserved. +@@ -183,7 +179,10 @@ main.5: mov %dx,MEM_ARG # Save args + movb $0x2,%dh # Sector count + mov $0x7e00, %bx + callw nreadbx # Read disk +- movb $0x40,%dh # Sector count ++ cmpw $0xaa55, 0x7e00+0x200 # rom signature ? ++ jnz booterror ++ movb 0x7e00+0x202,%dh # Sector count ++ incb %dh + movb %dh, %al + callw puthex + mov $0x7e00, %bx +@@ -192,8 +191,7 @@ main.5: mov %dx,MEM_ARG # Save args + mov $msg_r1,%si + callw putstr + pop %si +- lcall $0x800,$0 # enter the rom code +- int $0x19 ++ ljmp $0x800,$6 # enter the rom code + + msg_r1: .asciz " done\r\n" + diff --git a/net/etherboot/pkg-descr b/net/etherboot/pkg-descr index ab2178b52d8b..23f4d81591ec 100644 --- a/net/etherboot/pkg-descr +++ b/net/etherboot/pkg-descr @@ -8,7 +8,7 @@ The defaults used here are suited to boot FreeBSD ELF kernels over NFS. To produce an etherboot floppy (or HD partition) do cd work/etherboot/src - cat bin/boot1a.bin bin/<device>.lzrom > /dev/fd0 + cat bin/boot1a.bin bin/<device>.zrom > /dev/fd0 Replace <device> with the specific code for your card, and /dev/fd0 with your hard disk partition. |