wok rev 21623

linld: more ram for zImage (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 26 12:07:54 2019 +0200 (12 months ago)
parents a1ba148cfa9a
children f63646e9af45
files linld/receipt linld/stuff/src/LOAD.CPP
line diff
     1.1 --- a/linld/receipt	Sun May 26 10:44:33 2019 +0100
     1.2 +++ b/linld/receipt	Sun May 26 12:07:54 2019 +0200
     1.3 @@ -39,6 +39,8 @@
     1.4  EOT
     1.5  	SDL_VIDEODRIVER=dummy dosbox MAKE.BAT -exit -c "mount D $src" \
     1.6  		2>&1 | grep -v 'ALSA lib'
     1.7 +	grep '^Fatal[ :]' */LNK.LOG */CPP.LOG && return 1
     1.8 +	grep '*Fatal*' */*.LST && return 1
     1.9  	grep '^Error[ :]' */LNK.LOG */CPP.LOG && return 1
    1.10  	grep '*Error*' */*.LST && return 1
    1.11  	grep '^Warning[ :]' */LNK.LOG */CPP.LOG
    1.12 @@ -47,7 +49,8 @@
    1.13  	cp TAZBOOT/TAZBOOT.COM tazboot.com
    1.14  	objdump -D -b binary -mi386 -Maddr16,data16 --adjust-vma=0x100 \
    1.15  		linld.com > linld.lst
    1.16 -	[ $(stat -c %s linld.com) -gt 4096 ] && linld=linld.com || linld=
    1.17 +	linld=linld.com
    1.18 +	[ $(stat -c %s $linld) -le 4096 ] && ls -l $linld && linld=
    1.19  	for f in $linld tazboot.com ; do
    1.20  		cp $f tmp.com
    1.21  		for i in $(seq 1 9); do
     2.1 --- a/linld/stuff/src/LOAD.CPP	Sun May 26 10:44:33 2019 +0100
     2.2 +++ b/linld/stuff/src/LOAD.CPP	Sun May 26 12:07:54 2019 +0200
     2.3 @@ -152,7 +152,7 @@
     2.4          if(* (int *) &first1k->pad10[0x3F-0x24] == 0x3AE8) {
     2.5              _csip+=0xFFE00042;
     2.6          }
     2.7 -        else
     2.8 +        //else
     2.9  #endif
    2.10          kernelparams->setup_sects=4;
    2.11      }
    2.12 @@ -185,7 +185,8 @@
    2.13              // Hook on int15 to work around fn 88 DOS breakage
    2.14              hook_int15_88();
    2.15          }
    2.16 -        version_string = (char *) first1k+kernelparams->kernel_version+0x200;
    2.17 +        if (kernelparams->kernel_version)
    2.18 +            version_string = (char *) first1k+kernelparams->kernel_version+0x200;
    2.19          kernelparams->type_of_loader = 0xff; // kernel do not know us (yet :-)
    2.20          if(kernelparams->version >= 0x201) {
    2.21              // * offset limit of the setup heap
    2.22 @@ -242,7 +243,7 @@
    2.23  // Read initrd if needed
    2.24  void load_initrd() {
    2.25      struct image_himem *m = &initrd;
    2.26 -    if (!initrd_name && !m->fd) return;
    2.27 +    if (((int)initrd_name | m->fd) == 0) return; // !initrd_name && !m->fd
    2.28  #if defined(__BORLANDC__) && defined(NO386)
    2.29  #pragma option -3
    2.30      asm{