wok-6.x diff linld/stuff/src/LINLD.CPP @ rev 24584

Up tazlito (534)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 27 21:20:06 2022 +0000 (2022-02-27)
parents 8db826af003e
children 048ed88bf832
line diff
     1.1 --- a/linld/stuff/src/LINLD.CPP	Sun Feb 27 10:47:38 2022 +0000
     1.2 +++ b/linld/stuff/src/LINLD.CPP	Sun Feb 27 21:20:06 2022 +0000
     1.3 @@ -22,32 +22,40 @@
     1.4  	"\t-r minRAM" NL
     1.5  #endif
     1.6  #ifdef CPUTYPE
     1.7 -        "\t-m minCPU	family*256+model" NL
     1.8 +        "\t-c minCPU\tfamily*256+model" NL
     1.9  #endif
    1.10  #ifdef CPU64
    1.11 -        "\t-64 cpu64 only" NL
    1.12 +        "\t-64\t\t64 bits cpu" NL
    1.13  #endif
    1.14 -        "Defaults:"
    1.15 -        "\timage=bzImage"
    1.16 -        "\tmem=256m"
    1.17 -        "\tcl=auto" 
    1.18 -        "\t-b 1088k" NL
    1.19 -        "Use quotes: \"cl=...\" if you need spaces in cmdline" NL
    1.20 -        "Use cl=@filename to get it from a file"
    1.21 +#ifdef WITH_XMM_ALLOC
    1.22 +	"\t-f\t\tskip XMMS alloc" NL
    1.23 +#endif
    1.24 +#ifdef QUICK_BOOT
    1.25 +# ifdef VCPI
    1.26 +	"\t-v\t\tV86 mode" NL
    1.27 +# endif
    1.28 +	"\t-q\t\tskip shutdown" NL
    1.29 +#endif
    1.30 +        "Defaults:\t"
    1.31 +        "image=bzImage "
    1.32 +        "mem=256m "
    1.33 +        "cl=auto " 
    1.34 +        "-b 1088k" NL
    1.35 +        "Use quotes \"cl=...\" for spaces in cmdline"
    1.36 +        ", cl=@filename to get it from a file"
    1.37  #if 1
    1.38          NL NL "Examples:" NL
    1.39  	"\tLINLD "
    1.40 -	"-b 64m "
    1.41  #ifdef MINRAM
    1.42  	"-r 96m "
    1.43  #endif
    1.44  #ifdef CPUTYPE
    1.45 -	"-m 0x600 "
    1.46 +	"-c 0x600 "
    1.47  #endif
    1.48 -        "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "
    1.49 +        "initrd=rootfs.gz,mycfg.gz "
    1.50  	"\"cl=root=/dev/null video=-32\""
    1.51  	NL "\tLINLD memtest"
    1.52 -	NL "\tLINLD @args"
    1.53 +	NL "\tLINLD @linld.cmd"
    1.54  #endif
    1.55      );
    1.56  }
    1.57 @@ -69,7 +77,10 @@
    1.58  	}
    1.59  #endif
    1.60  	if (argstr(*argv,"cl|image|initrd" CMDSTR_EXTRA,clp) == (int) clp) continue;
    1.61 -	if (argnum(*argv,"root|vga|mem|-b|" CMDNUM_EXTRA "-f~"
    1.62 +	if (argnum(*argv,"root|vga|mem|-b|" CMDNUM_EXTRA
    1.63 +#ifdef WITH_XMM_ALLOC
    1.64 +		"-f~"
    1.65 +#endif
    1.66  		,&root_dev) >= (int) &base_himem) continue;
    1.67  	if (fileexist(*argv) != -1) {
    1.68              kernel_name=*argv;