merge kolibri-cfg into trunk

git-svn-id: svn://kolibrios.org@1962 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-16 17:09:40 +00:00
parent 2b6c1306c4
commit 08246cd957
180 changed files with 318 additions and 95890 deletions
--- a/kernel/trunk/boot/preboot.inc
+++ b/kernel/trunk/boot/preboot.inc
@@ -30,6 +30,9 @@ preboot_device	    db	0 ; boot device
 			  ;!!!! 0 - autodetect !!!!
 preboot_blogesc = 0       ; start immediately after bootlog
 preboot_biosdisk    db	0 ; use V86 to access disks through BIOS (1-yes, 2-no)
+if defined extended_primary_loader
+preboot_timeout     dw  5*18 ; timeout in 1/18th of second for config settings screen
+end if

      if $>0x200
 ERROR: prebooting parameters must fit in first sector!!!