wok-current diff linld/stuff/src/LOAD.CPP @ rev 21623
linld: more ram for zImage (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun May 26 12:07:54 2019 +0200 (2019-05-26) |
parents | 042675028c83 |
children | 0e811092e7bb |
line diff
1.1 --- a/linld/stuff/src/LOAD.CPP Sat May 25 13:23:29 2019 +0200 1.2 +++ b/linld/stuff/src/LOAD.CPP Sun May 26 12:07:54 2019 +0200 1.3 @@ -152,7 +152,7 @@ 1.4 if(* (int *) &first1k->pad10[0x3F-0x24] == 0x3AE8) { 1.5 _csip+=0xFFE00042; 1.6 } 1.7 - else 1.8 + //else 1.9 #endif 1.10 kernelparams->setup_sects=4; 1.11 } 1.12 @@ -185,7 +185,8 @@ 1.13 // Hook on int15 to work around fn 88 DOS breakage 1.14 hook_int15_88(); 1.15 } 1.16 - version_string = (char *) first1k+kernelparams->kernel_version+0x200; 1.17 + if (kernelparams->kernel_version) 1.18 + version_string = (char *) first1k+kernelparams->kernel_version+0x200; 1.19 kernelparams->type_of_loader = 0xff; // kernel do not know us (yet :-) 1.20 if(kernelparams->version >= 0x201) { 1.21 // * offset limit of the setup heap 1.22 @@ -242,7 +243,7 @@ 1.23 // Read initrd if needed 1.24 void load_initrd() { 1.25 struct image_himem *m = &initrd; 1.26 - if (!initrd_name && !m->fd) return; 1.27 + if (((int)initrd_name | m->fd) == 0) return; // !initrd_name && !m->fd 1.28 #if defined(__BORLANDC__) && defined(NO386) 1.29 #pragma option -3 1.30 asm{