SliTaz Repositories

     1.1 --- a/linld/stuff/src/COMMON.H	Mon Jul 05 18:07:57 2021 +0000
     1.2 +++ b/linld/stuff/src/COMMON.H	Fri Feb 25 18:06:36 2022 +0000
     1.3 @@ -17,6 +17,7 @@
     1.4  #define ELKS		elks support
     1.5  #define IPXE		ipxe support
     1.6  #define CPUTYPE		detect cpu family and model
     1.7 +#define MINRAM		detect RAM size
     1.8  /* End of the optional features */
     1.9  
    1.10  #ifdef ISOHOOK
    1.11 @@ -99,6 +100,11 @@
    1.12  extern u8 buf4k[4096];
    1.13  
    1.14  extern u32 far *initrd_desc;
    1.15 +#ifdef ISO9660
    1.16 +#define CMDSTR_EXTRA	"|iso"
    1.17 +#else
    1.18 +#define CMDSTR_EXTRA	""
    1.19 +#endif
    1.20  #define cmdline		(cmdstr[0])
    1.21  #define kernel_name	(cmdstr[1])
    1.22  #define initrd_name	(cmdstr[2])
    1.23 @@ -109,21 +115,57 @@
    1.24  #define vid_mode	(cmdnum[1])	// -3 = ask, -2 = Extended VGA, -1 = Normal VGA,  n = as "n" was pressed
    1.25  #define topmem		(cmdnum[2])
    1.26  #define base_himem	(cmdnum[3])
    1.27 +#define CMDNUM	4
    1.28 +#define CMDNUM_EXTRA	""
    1.29 +extern u32 cmdnum[CMDNUM
    1.30 +#ifdef MINRAM
    1.31 +#define minram		(cmdnum[CMDNUM])
    1.32 +#undef CMDNUM_EXTRA
    1.33 +#define CMDNUM_EXTRA	"-r|"
    1.34 +#undef CMDNUM
    1.35 +#define CMDNUM		5
    1.36 +	+1
    1.37 +#endif
    1.38  #ifdef CPUTYPE
    1.39 -#define mincpu		(* (short *) &cmdnum[4])
    1.40 -#define	skip_alloc	(* (char *) &cmdnum[5])
    1.41 -extern unsigned cputype;
    1.42 -#else
    1.43 -#define	skip_alloc	(* (char *) &cmdnum[4])
    1.44 -#endif
    1.45 -extern u32 cmdnum[5
    1.46 -#ifdef CPUTYPE
    1.47 +#define mincpu		(* (short *) &cmdnum[CMDNUM])
    1.48 +#undef CMDNUM
    1.49 +#undef CMDNUM_EXTRA
    1.50 +# ifdef MINRAM
    1.51 +#define CMDNUM_EXTRA	"-r|-m|"
    1.52 +#define CMDNUM		6
    1.53 +# else
    1.54 +#define CMDNUM_EXTRA	"-m|"
    1.55 +#define CMDNUM		5
    1.56 +# endif
    1.57  	+1
    1.58  #endif
    1.59  #ifdef QUICK_BOOT
    1.60 +#undef CMDNUM
    1.61 +#undef CMDNUM_EXTRA
    1.62 +# ifdef MINRAM
    1.63 +#  ifdef CPUTYPE
    1.64 +#define CMDNUM_EXTRA	"-r|-m|-q~-v~"
    1.65 +#define CMDNUM		8
    1.66 +#  else
    1.67 +#define CMDNUM_EXTRA	"-r|-q~-v~"
    1.68 +#define CMDNUM		7
    1.69 +#  endif
    1.70 +# else
    1.71 +#  ifdef CPUTYPE
    1.72 +#define CMDNUM_EXTRA	"-m|-q~-v~"
    1.73 +#define CMDNUM		7
    1.74 +#  else
    1.75 +#define CMDNUM_EXTRA	"-q~-v~"
    1.76 +#define CMDNUM		6
    1.77 +#  endif
    1.78 +# endif
    1.79  	+2
    1.80  #endif
    1.81 -	];
    1.82 +	+1];
    1.83 +#define	skip_alloc	(* (char *) &cmdnum[CMDNUM])
    1.84 +#ifdef CPUTYPE
    1.85 +extern unsigned cputype;
    1.86 +#endif
    1.87  
    1.88  extern _fastcall void memcpy_image_kernel();
    1.89  extern _fastcall void memcpy_image_initrd();