wok rev 4511
linux/boot: skip 'floppy changed' warning
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Nov 23 22:36:39 2009 +0100 (2009-11-23) |
parents | ecf167c9dacc |
children | a8ca1e0896fe |
files | linux/stuff/bootloader.sh linux/stuff/linux-header-2.6.30.6.u |
line diff
1.1 --- a/linux/stuff/bootloader.sh Mon Nov 23 15:33:20 2009 +0100 1.2 +++ b/linux/stuff/bootloader.sh Mon Nov 23 22:36:39 2009 +0100 1.3 @@ -74,17 +74,18 @@ 1.4 dd if=$KERNEL bs=512 count=1 of=$bs 2> /dev/null 1.5 uudecode <<EOT | dd of=$bs conv=notrunc 2> /dev/null 1.6 begin-base64 644 - 1.7 -v/Sd/GgAkAcxyQYXify7eACO2cU3sQbzpY7ZiSeMRwKg8X2YQAYfxkX4P/qX 1.8 -mEEx2+hAAb4AAoBMEYDHRCQAnAN0DuhmAb4oAjkcci9HixxW6EIBX4s16FIB 1.9 -sCDNELAIzRBOmM0WPAh0BJiJBK07NXTx6CsBPAp14Yh8/rkYAGoA4vyJ5rAP 1.10 -v/QB/k0csQW0k4lEHLABiUQUmYlUEIlUGGYx20PT40tmAx1m0+toABAHv4AA 1.11 -KfuccwIB31NWMdvo1ABeuQCAtIf+RBzNFVudd9yhGgJIvxwCsQk4RBxysDHA 1.12 -zRPqAAAgkLBGKMi+twHovABd6yOA+RNyBDjBd2iA/gJyBDjmd2mA/VBzc2AG 1.13 -UlFTlrQCULkGAFGxBMHFBLAPIegEkCcUQCfodQDi7rAgzRBZ4rSYzRNhMfat 1.14 -ka2SrVAoyHcCsAGYOfhyAon4UFK0As0TWpVeWHKcKfcB8cHmCQHzOMF1JojI 1.15 -/saxATjmdRyI9P7FtgA8E3USgP1Qcg21AGC+ugHoJACYzRZhowQAUlFmjwYA 1.16 -AAn/dZ4WB7AxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w1g6AEluc2VydCBu 1.17 -ZXh0IGZsb3BweSBhbmQgcHJlc3MgYW55IGtleSB0byBjb250aW51ZS4HDQA= 1.18 +v/Sd/GgAkAcxyQYXify7eACO2cU3sQbzpY7ZiSeMRwKg8X2YQAYfxkX4P/qz 1.19 +GFFLdfyXmEHoPgG+AAKATBGAx0QkAJwDdA7oZAG+KAI5HHIuR4scVuhAAV+L 1.20 +NehQAbAgzRCwCM0QTpjNFjwIdAOIBK07NXTy6CoBPAp14oh8/onmsA+/9AH+ 1.21 +TRyxBbSTiUQcsAGJRBSZiVQQiVQYZjHbQ9PjS2YDHWbT62gAEAe/gAAp+5xz 1.22 +AgHfU1Yx2+jaAF65AIC0h/5EHM0VW5133KEaAki/HAKxCThEHHKwMcDNE+oA 1.23 +ACCQsEYoyL65AejCAF3rKYD5E3IEOMF3boD+AnIEOOZ3b4D9UHN5YIH9AAZ0 1.24 +JwZSUVOWtAJQuQYAUbEEwcUEsA8h6ASQJxRAJ+h1AOLusCDNEFnirpjNE2Ex 1.25 +9q2RrZKtUCjIdwKwAZg5+HICifhQUrQCzRNalV5YcpYp9wHxweYJAfM4wXUm 1.26 +iMj+xrEBOOZ1HIj0/sW2ADwTdRKA/VByDbUAYL68AegkAJjNFmGjBABSUWaP 1.27 +BgAACf91nhYHsDEsA7QOuwcAzRA8DXTzw7AN6O//rAjAdfjDWDoASW5zZXJ0 1.28 +IG5leHQgZmxvcHB5IGFuZCBwcmVzcyBhbnkga2V5IHRvIGNvbnRpbnVlLgcN 1.29 +AA== 1.30 ==== 1.31 EOT 1.32
2.1 --- a/linux/stuff/linux-header-2.6.30.6.u Mon Nov 23 15:33:20 2009 +0100 2.2 +++ b/linux/stuff/linux-header-2.6.30.6.u Mon Nov 23 22:36:39 2009 +0100 2.3 @@ -18,7 +18,7 @@ 2.4 2.5 #ifndef SVGA_MODE 2.6 #define SVGA_MODE ASK_VGA 2.7 -@@ -39,53 +41,391 @@ 2.8 +@@ -39,53 +41,394 @@ 2.9 #define ROOT_RDONLY 1 2.10 #endif 2.11 2.12 @@ -104,10 +104,15 @@ 2.13 + 2.14 + cli 2.15 + 2.16 ++ movb $24, %bl # allocate 48 bytes in stack 2.17 ++init_gdt: 2.18 ++ pushw %cx # initialized with 0 2.19 ++ decw %bx 2.20 ++ jnz init_gdt 2.21 ++ 2.22 + xchg %ax, %di # sector count 2.23 + cbw # limits = 0 2.24 + incw %cx # cylinder 0, sector 1 2.25 -+ xorw %bx, %bx 2.26 + call read_first_sectors # read setup 2.27 + 2.28 +#define version_offset 0xE 2.29 @@ -146,8 +151,7 @@ 2.30 + int $0x16 2.31 + cmpb $8, %al # BackSpace ? 2.32 + je cmdbs 2.33 -+ cbw 2.34 -+ movw %ax, (%si) # store end of string too 2.35 ++ movb %al, (%si) # store char 2.36 + lodsw # %si += 2 2.37 +cmdbs: 2.38 + cmpw (%di), %si # lower limit is checked 2.39 @@ -155,7 +159,7 @@ 2.40 + call putc # set %ah and %bx 2.41 + cmpb $10, %al # Enter ? 2.42 + jne cmdlp 2.43 -+ movb %bh,-2(%si) # remove CR 2.44 ++ movb %bh,-2(%si) # set end of line, remove CR 2.45 +endcmdline: 2.46 + 2.47 +nocmdline: 2.48 @@ -168,10 +172,6 @@ 2.49 +# no 64kB boundaries are crossed. We try to load it as fast as 2.50 +# possible, loading whole tracks whenever we can. 2.51 + 2.52 -+ movw $24, %cx # allocate 48 bytes in stack 2.53 -+init_gdt: 2.54 -+ push $0 # initialized with 0 2.55 -+ loop init_gdt 2.56 + movw %sp, %si # for bootsect_gdt 2.57 + movb $0x0F, %al # destination = 0x100000 2.58 + movw $syssize, %di 2.59 @@ -272,6 +272,8 @@ 2.60 +#endif 2.61 + pushaw 2.62 +#ifdef SHOW_REGS 2.63 ++ cmpw $0x600,%bp # disk changed ? 2.64 ++ je reset_floppy 2.65 + pushw %es # print %es (named EX) 2.66 + pushw %dx # print %dx 2.67 + pushw %cx # print %cx 2.68 @@ -299,6 +301,7 @@ 2.69 + int $0x10 2.70 + popw %cx 2.71 + loop print_loop 2.72 ++reset_floppy: 2.73 +#endif 2.74 + cbw # %ah = 0 2.75 + int $0x13 # reset controler