# HG changeset patch # User Pascal Bellard # Date 1207864502 0 # Node ID 8d43117e4680908f8c1d7a43c29ed3a32675c1c9 # Parent 38edb0e5bd67a65ac57719a5dbc3eed7282ba422 Etherboot: can boot with grub too diff -r 38edb0e5bd67 -r 8d43117e4680 etherboot/receipt --- a/etherboot/receipt Thu Apr 10 19:43:50 2008 +0000 +++ b/etherboot/receipt Thu Apr 10 21:55:02 2008 +0000 @@ -14,7 +14,8 @@ { cd $src/src patch -p2 < ../../stuff/etherboot-net.u - make bin/etherboot-net.zdsk + patch -p2 < ../../stuff/etherboot-prefix.u + make bin/etherboot-net.zlilo } @@ -22,7 +23,7 @@ genpkg_rules() { mkdir -p $fs/usr/share/boot - cp $src/src/bin/etherboot-net.zdsk $fs/usr/share/boot/etherboot + cp $src/src/bin/etherboot-net.zlilo $fs/usr/share/boot/etherboot } # Pre and post install commands for Tazpkg. diff -r 38edb0e5bd67 -r 8d43117e4680 etherboot/stuff/etherboot-prefix.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etherboot/stuff/etherboot-prefix.u Thu Apr 10 21:55:02 2008 +0000 @@ -0,0 +1,426 @@ +--- etherboot-5.4.3/src/arch/i386/prefix/liloprefix.S ++++ etherboot-5.4.3/src/arch/i386/prefix/liloprefix.S +@@ -1,92 +1,361 @@ +-/* +- Copyright (C) 2000, Entity Cyber, Inc. +- +- Authors: Gary Byers (gb@thinguin.org) +- Marty Connor (mdc@thinguin.org) +- +- This software may be used and distributed according to the terms +- of the GNU Public License (GPL), incorporated herein by reference. +- +- Description: +- +- This is just a little bit of code and data that can get prepended +- to an Etherboot ROM image in order to allow LILO to load the +- result as if it were a Linux kernel image. +- +- A real Linux kernel image consists of a one-sector boot loader +- (to load the image from a floppy disk), followed a few sectors +- of setup code, followed by the kernel code itself. There's +- a table in the first sector (starting at offset 497) that indicates +- how many sectors of setup code follow the first sector and which +- contains some other parameters that aren't interesting in this +- case. +- +- When LILO loads the sectors that comprise a kernel image, it doesn't +- execute the code in the first sector (since that code would try to +- load the image from a floppy disk.) The code in the first sector +- below doesn't expect to get executed (and prints an error message +- if it ever -is- executed.) LILO's only interested in knowing the +- number of setup sectors advertised in the table (at offset 497 in +- the first sector.) +- +- Etherboot doesn't require much in the way of setup code. +- Historically, the Linux kernel required at least 4 sectors of +- setup code. Current versions of LILO look at the byte at +- offset 497 in the first sector to indicate how many sectors +- of setup code are contained in the image. +- +-*/ ++/* NOTE: this boot sector contains instructions that need at least an 80186. ++ * Yes, as86 has a bug somewhere in the valid instruction set checks. ++ * ++ * SYS_SIZE is the number of clicks (16 bytes) to be loaded. For Etherboot ++ * purposes, we need to load everything but the boot sector itself, i.e. 32 ++ * clicks less than the size of the entire (verbatim) image. The image size ++ * is practically limited only by the available base memory size. ++ */ ++.globl SYSSIZE ++.equ SYSSIZE, _verbatim_size_pgh - 32 ++ ++/* floppyload.S Copyright (C) 1991, 1992 Linus Torvalds ++ * modified by Drew Eckhardt ++ * modified by Bruce Evans (bde) ++ * ++ * floppyprefix.S is loaded at 0x0000:0x7c00 by the bios-startup routines. ++ * ++ * It then loads the system at SYSSEG<<4, using BIOS interrupts. ++ * ++ * The loader has been made as simple as possible, and continuous read errors ++ * will result in a unbreakable loop. Reboot by hand. It loads pretty fast by ++ * getting whole tracks at a time whenever possible. ++ */ + + #define SETUPSECS 4 /* Minimal nr of setup-sectors */ + #define PREFIXSIZE ((SETUPSECS+1)*512) + #define PREFIXPGH (PREFIXSIZE / 16 ) +-#define BOOTSEG 0x07C0 /* original address of boot-sector */ + #define INITSEG 0x9000 /* we move boot here - out of the way */ + #define SETUPSEG 0x9020 /* setup starts here */ +-#define SYSSEG 0x1000 /* system loaded at 0x10000 (65536). */ + +- .text +- .code16 +- .arch i386 +- .org 0 +- .section ".prefix", "ax", @progbits + .globl _prefix + _prefix: ++.equ BOOTSEG, 0x07C0 /* original address of boot-sector */ + +-/* +- This is a minimal boot sector. If anyone tries to execute it (e.g., if +- a .lilo file is dd'ed to a floppy), print an error message. +-*/ ++.equ SYSSEG, 0x1000 /* system loaded at SYSSEG<<4 */ + +-bootsector: +- jmp $BOOTSEG, $go - _prefix /* reload cs:ip to match relocation addr */ ++ .org 0 ++ .arch i386 ++ .text ++ .section ".prefix", "ax", @progbits ++ .code16 ++ ++ jmp $BOOTSEG, $go /* reload cs:ip to match relocation addr */ + go: +- movw $0x2000, %di /* 0x2000 is arbitrary value >= length +- of bootsect + room for stack */ ++ movw $0x2000-12, %di /* 0x2000 is arbitrary value >= length */ ++ /* of bootsect + room for stack + 12 for */ ++ /* saved disk parm block */ + + movw $BOOTSEG, %ax + movw %ax,%ds + movw %ax,%es +- +- cli +- movw %ax, %ss /* put stack at BOOTSEG:0x2000. */ ++ movw %ax,%ss /* put stack at initial position */ + movw %di,%sp +- sti + +- movw $why_end-why, %cx +- movw $why - _prefix, %si ++/* Many BIOS's default disk parameter tables will not recognize multi-sector ++ * reads beyond the maximum sector number specified in the default diskette ++ * parameter tables - this may mean 7 sectors in some cases. ++ * ++ * Since single sector reads are slow and out of the question, we must take care ++ * of this by creating new parameter tables (for the first disk) in RAM. We ++ * will set the maximum sector count to 36 - the most we will encounter on an ++ * ED 2.88. High doesn't hurt. Low does. ++ * ++ * Segments are as follows: ds=es=ss=cs - BOOTSEG ++ */ ++ ++ xorw %cx,%cx ++ movw %cx,%es /* access segment 0 */ ++ movw $0x78, %bx /* 0:bx is parameter table address */ ++ pushw %ds /* save ds */ ++/* 0:bx is parameter table address */ ++ ldsw %es:(%bx),%si /* loads ds and si */ ++ ++ movw %ax,%es /* ax is BOOTSECT (loaded above) */ ++ movb $6, %cl /* copy 12 bytes */ ++ cld ++ pushw %di /* keep a copy for later */ ++ rep ++ movsw /* ds:si is source, es:di is dest */ ++ popw %di ++ ++ movb $36,%es:4(%di) ++ ++ movw %cx,%ds /* access segment 0 */ ++ xchgw %di,(%bx) ++ movw %es,%si ++ xchgw %si,2(%bx) ++ popw %ds /* restore ds */ ++ movw %di, dpoff /* save old parameters */ ++ movw %si, dpseg /* to restore just before finishing */ ++ pushw %ds ++ popw %es /* reload es */ ++ ++/* Note that es is already set up. Also cx is 0 from rep movsw above. */ ++ ++ xorb %ah,%ah /* reset FDC */ ++ xorb %dl,%dl ++ int $0x13 ++ ++/* Get disk drive parameters, specifically number of sectors/track. ++ * ++ * It seems that there is no BIOS call to get the number of sectors. Guess ++ * 36 sectors if sector 36 can be read, 18 sectors if sector 18 can be read, ++ * 15 if sector 15 can be read. Otherwise guess 9. ++ */ ++ ++ movw $disksizes, %si /* table of sizes to try */ ++ ++probe_loop: ++ lodsb ++ cbtw /* extend to word */ ++ movw %ax, sectors ++ cmpw $disksizes+4, %si ++ jae got_sectors /* if all else fails, try 9 */ ++ xchgw %cx,%ax /* cx = track and sector */ ++ xorw %dx,%dx /* drive 0, head 0 */ ++ movw $0x0200, %bx /* address after boot sector */ ++ /* (512 bytes from origin, es = cs) */ ++ movw $0x0201, %ax /* service 2, 1 sector */ ++ int $0x13 ++ jc probe_loop /* try next value */ ++ ++got_sectors: ++ movw $msg1end-msg1, %cx ++ movw $msg1, %si ++ call print_str ++ ++/* ok, we've written the Loading... message, now we want to load the system */ ++ ++ pushw %es /* = ds */ ++ movw $SYSSEG, %ax ++ movw %ax,%es /* segment of SYSSEG<<4 */ ++ pushw %es ++ call read_it ++ ++/* This turns off the floppy drive motor, so that we enter the kernel in a ++ * known state, and don't have to worry about it later. ++ */ ++ movw $0x3f2, %dx ++ xorb %al,%al ++ outb %al,%dx ++ ++ call print_nl ++ pop %es /* = SYSSEG */ ++ pop %es /* balance push/pop es */ ++sigok: ++ ++/* Restore original disk parameters */ ++ movw $0x78, %bx ++ movw dpoff, %di ++ movw dpseg, %si ++ xorw %ax,%ax ++ movw %ax,%ds ++ movw %di,(%bx) ++ movw %si,2(%bx) ++ ++/* after that (everything loaded), we call to the .ROM file loaded. */ ++ ++ pushl $0 /* No parameters to preserve for exit path */ ++ pushw $0 /* Use prefix exit path mechanism */ ++ ljmp $SYSSEG, $_start ++ ++/* This routine loads the system at address SYSSEG<<4, making sure no 64kB ++ * boundaries are crossed. We try to load it as fast as possible, loading whole ++ * tracks whenever we can. ++ * ++ * in: es - starting address segment (normally SYSSEG) ++ */ ++read_it: ++ movw $0,sread /* read whole image incl boot sector */ ++ movw %es,%ax ++ testw $0x0fff, %ax ++die: jne die /* es must be at 64kB boundary */ ++ xorw %bx,%bx /* bx is starting address within segment */ ++rp_read: ++ movw %es,%ax ++ movw %bx,%dx ++ movb $4, %cl ++ shrw %cl,%dx /* bx is always divisible by 16 */ ++ addw %dx,%ax ++ cmpw $SYSSEG+SYSSIZE, %ax /* have we loaded all yet? */ ++ jb ok1_read ++ ret ++ok1_read: ++ movw sectors, %ax ++ subw sread, %ax ++ movw %ax,%cx ++ shlw $9, %cx ++ addw %bx,%cx ++ jnc ok2_read ++ je ok2_read ++ xorw %ax,%ax ++ subw %bx,%ax ++ shrw $9, %ax ++ok2_read: ++ call read_track ++ movw %ax,%cx ++ addw sread, %ax ++ cmpw sectors, %ax ++ jne ok3_read ++ movw $1, %ax ++ subw head, %ax ++ jne ok4_read ++ incw track ++ok4_read: ++ movw %ax, head ++ xorw %ax,%ax ++ok3_read: ++ movw %ax, sread ++ shlw $9, %cx ++ addw %cx,%bx ++ jnc rp_read ++ movw %es,%ax ++ addb $0x10, %ah ++ movw %ax,%es ++ xorw %bx,%bx ++ jmp rp_read ++ ++read_track: ++ pusha ++ pushw %ax ++ pushw %bx ++ pushw %bp /* just in case the BIOS is buggy */ ++ movw $0x0e2e, %ax /* 0x2e = . */ ++ movw $0x0007, %bx ++ int $0x10 ++ popw %bp ++ popw %bx ++ popw %ax ++ ++ movw track, %dx ++ movw sread, %cx ++ incw %cx ++ movb %dl,%ch ++ movw head, %dx ++ movb %dl,%dh ++ andw $0x0100, %dx ++ movb $2, %ah ++ ++ pushw %dx /* save for error dump */ ++ pushw %cx ++ pushw %bx ++ pushw %ax ++ ++ int $0x13 ++ jc bad_rt ++ addw $8, %sp ++ popa ++ ret ++ ++bad_rt: pushw %ax /* save error code */ ++ call print_all /* ah = error, al = read */ ++ ++ xorb %ah,%ah ++ xorb %dl,%dl ++ int $0x13 ++ ++ addw $10, %sp ++ popa ++ jmp read_track ++ ++/* print_all is for debugging purposes. It will print out all of the registers. ++ * The assumption is that this is called from a routine, with a stack frame like ++ * dx ++ * cx ++ * bx ++ * ax ++ * error ++ * ret <- sp ++ */ ++ ++print_all: ++ call print_nl /* nl for readability */ ++ movw $5, %cx /* error code + 4 registers */ ++ movw %sp,%bp ++ ++print_loop: ++ pushw %cx /* save count left */ ++ ++ cmpb $5, %cl ++ jae no_reg /* see if register name is needed */ + + movw $0x0007, %bx /* page 0, attribute 7 (normal) */ ++ movw $0xe05+0x41-1, %ax ++ subb %cl,%al ++ int $0x10 ++ ++ movb $0x58, %al /* 'X' */ ++ int $0x10 ++ ++ movb $0x3A, %al /* ':' */ ++ int $0x10 ++ ++no_reg: ++ addw $2, %bp /* next register */ ++ call print_hex /* print it */ ++ movb $0x20, %al /* print a space */ ++ int $0x10 ++ popw %cx ++ loop print_loop ++ call print_nl /* nl for readability */ ++ ret ++ ++print_str: ++ movw $0x0007, %bx /* page 0, attribute 7 (normal) */ + movb $0x0e, %ah /* write char, tty mode */ + prloop: + lodsb + int $0x10 + loop prloop +-freeze: jmp freeze ++ ret ++ ++print_nl: ++ movw $0x0007, %bx /* page 0, attribute 7 (normal) */ ++ movw $0xe0d, %ax /* CR */ ++ int $0x10 ++ movb $0xa, %al /* LF */ ++ int $0x10 ++ ret ++ ++/* print_hex prints the word pointed to by ss:bp in hexadecimal. */ ++ ++print_hex: ++ movw (%bp),%dx /* load word into dx */ ++ movb $4, %cl ++ movb $0x0e, %ah /* write char, tty mode */ ++ movw $0x0007, %bx /* page 0, attribute 7 (normal) */ ++ call print_digit ++ call print_digit ++ call print_digit ++/* fall through */ ++print_digit: ++ rol %cl,%dx /* rotate so that lowest 4 bits are used */ ++ movb $0x0f, %al /* mask for nybble */ ++ andb %dl,%al ++ addb $0x90, %al /* convert al to ascii hex (four instructions) */ ++ daa ++ adcb $0x40, %al ++ daa ++ int $0x10 ++ ret ++ ++sread: .word 0 /* sectors read of current track */ ++head: .word 0 /* current head */ ++track: .word 0 /* current track */ ++ ++sectors: ++ .word 0 ++ ++dpseg: .word 0 ++dpoff: .word 0 + +-why: .ascii "This image cannot be loaded from a floppy disk.\r\n" +-why_end: ++disksizes: ++ .byte 36,18,15,9 + ++msg1: ++ .ascii "Loading ROM image" ++msg1end: + + .org 497 + setup_sects: