wok-6.x rev 1010

gpxe: fix lkrnprefix for good !
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jul 07 17:19:30 2008 +0000 (2008-07-07)
parents 5d603254a233
children 564e60fb4085
files gpxe/stuff/default_boot.u
line diff
     1.1 --- a/gpxe/stuff/default_boot.u	Mon Jul 07 18:27:20 2008 +0200
     1.2 +++ b/gpxe/stuff/default_boot.u	Mon Jul 07 17:19:30 2008 +0000
     1.3 @@ -27,7 +27,16 @@
     1.4  
     1.5  --- gpxe-0.9.3/src/arch/i386/prefix/lkrnprefix.S
     1.6  +++ gpxe-0.9.3/src/arch/i386/prefix/lkrnprefix.S
     1.7 -@@ -441,6 +441,8 @@ 
     1.8 +@@ -197,7 +197,7 @@
     1.9 + 	 */
    1.10 + 
    1.11 + 	/* Jump to loaded copy */
    1.12 +-	ljmp	$SYSSEG, $run_etherboot
    1.13 ++	ljmp	$SYSSEG, $run_etherboot2
    1.14 + 
    1.15 + endseg:	.word SYSSEG + _load_size_pgh
    1.16 + 	.section ".zinfo.fixup", "a"	/* Compressor fixup information */
    1.17 +@@ -441,11 +441,16 @@
    1.18   	/* Calculated lcall to _start with %cs:0000 = image start */
    1.19   	lret
    1.20   
    1.21 @@ -36,13 +45,19 @@
    1.22   
    1.23   	.org	PREFIXSIZE
    1.24   /*
    1.25 -@@ -453,6 +455,15 @@
    1.26 + 	We're now at the beginning of the kernel proper.
    1.27 +  */
    1.28 ++run_etherboot2:
    1.29 ++	push	%cs
    1.30 ++	pop	%ds
    1.31 + run_etherboot:
    1.32 + 	call	install
    1.33 + 
    1.34 +@@ -453,6 +458,13 @@
    1.35   	movw	%bx, %ss
    1.36   	movw	$_estack16, %sp
    1.37   
    1.38  +	/* Copy our boot_url structure to the forced_url variable */
    1.39 -+	push	%cs
    1.40 -+	pop	%ds
    1.41  +	movw	%bx, %es
    1.42  +	movw	$forced_url, %di
    1.43  +	movw	$boot_url, %si
    1.44 @@ -52,7 +67,6 @@
    1.45   	/* Jump to .text16 segment */
    1.46   	pushw	%ax
    1.47   	pushw	$1f
    1.48 -
    1.49  --- gpxe-0.9.3/src/arch/i386/prefix/pxeprefix.S
    1.50  +++ gpxe-0.9.3/src/arch/i386/prefix/pxeprefix.S
    1.51  @@ -19,6 +19,9 @@