wok rev 20222

memtest, ipxe: update bootloader.S
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Feb 26 19:03:16 2018 +0100 (2018-02-26)
parents 1cc8dfef2917
children 0c1ad897a405
files ipxe/stuff/bootloader.S lz4/receipt memtest/stuff/bootloader.S
line diff
     1.1 --- a/ipxe/stuff/bootloader.S	Mon Feb 26 17:40:15 2018 +0100
     1.2 +++ b/ipxe/stuff/bootloader.S	Mon Feb 26 19:03:16 2018 +0100
     1.3 @@ -167,11 +167,10 @@
     1.4  	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
     1.5  	pushw	%es
     1.6  	pushw	%di
     1.7 -	pushw	%ds
     1.8  	movb	$6, %cl			# copy 12 bytes
     1.9  	rep				# don't worry about cld
    1.10  	movsw				# already done above
    1.11 -	popw	%ds
    1.12 +	movw	%cx, %ds		# %ds = 0
    1.13  #ifdef ONLY8086
    1.14  	popw	0x78(%bx)		# update parameter table address
    1.15  	popw	0x78+2(%bx)
     2.1 --- a/lz4/receipt	Mon Feb 26 17:40:15 2018 +0100
     2.2 +++ b/lz4/receipt	Mon Feb 26 19:03:16 2018 +0100
     2.3 @@ -23,8 +23,6 @@
     2.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.5  genpkg_rules()
     2.6  {
     2.7 -	mkdir -p $fs/usr/bin
     2.8 -	cp -a $install/usr/bin/lz4 $fs/usr/bin
     2.9 -	cp -a $install/usr/bin/lz4cat $fs/usr/bin
    2.10 -	cp -a $install/usr/bin/unlz4 $fs/usr/bin
    2.11 +	mkdir -p $fs/usr
    2.12 +	cp -a $install/usr/bin $fs/usr
    2.13  }
     3.1 --- a/memtest/stuff/bootloader.S	Mon Feb 26 17:40:15 2018 +0100
     3.2 +++ b/memtest/stuff/bootloader.S	Mon Feb 26 19:03:16 2018 +0100
     3.3 @@ -167,11 +167,10 @@
     3.4  	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
     3.5  	pushw	%es
     3.6  	pushw	%di
     3.7 -	pushw	%ds
     3.8  	movb	$6, %cl			# copy 12 bytes
     3.9  	rep				# don't worry about cld
    3.10  	movsw				# already done above
    3.11 -	popw	%ds
    3.12 +	movw	%cx, %ds		# %ds = 0
    3.13  #ifdef ONLY8086
    3.14  	popw	0x78(%bx)		# update parameter table address
    3.15  	popw	0x78+2(%bx)