wok rev 4506
linux/boot: fix cmdline tail
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Nov 23 11:01:54 2009 +0100 (2009-11-23) |
parents | 4b16c8ec84b1 |
children | d3d7a8442ba4 |
files | linux/stuff/bootloader.sh linux/stuff/linux-header-2.6.30.6.u |
line diff
1.1 --- a/linux/stuff/bootloader.sh Sun Nov 22 17:34:55 2009 +0100 1.2 +++ b/linux/stuff/bootloader.sh Mon Nov 23 11:01:54 2009 +0100 1.3 @@ -75,17 +75,16 @@ 1.4 uudecode <<EOT | dd of=$bs conv=notrunc 2> /dev/null 1.5 begin-base64 644 - 1.6 v/Sd/GgAkAcxyQYXify7eACO2cU3sQbzpY7ZiSeMRwKg8X2YQAYfxkX4P/qX 1.7 -mEEw9jHb6FcBvgACgEwRgMdEJACcA3QO6GYBvigCORxyLkeLHFboQQFfizXo 1.8 -UgGwIOg+AbAIzRBOmM0WPAh0BZiJBEZGOzV08OgmATwKdd+5GABqAOL8ieaw 1.9 -D7/0Af5NHLEFtJOJRBywAYlEFJmJVBCJVBhmMdtD0+NLZgMdZtPraAAQB7+A 1.10 -ACn7nHMCAd9TVjHb6NQAXrkAgLSH/kQczRVbnXfcoRoCSL8cArEJOEQccrAx 1.11 -wM0T6gAAIJCwRijIvrkB6L0AXesjgPkTcgQ4wXdogP4CcgQ45ndpgP1Qc3Ng 1.12 -BlJRU5a0AlC5BgBRsQTBxQSwDyHoBJAnFEAn6HMA4u6wIM0QWeK0mM0TYTH2 1.13 -rZGtkq1QKMh3ArABmDn4cgKJ+FBStALNE1qVXlhynCn3AfHB5gkB8zjBdSaI 1.14 -yP7GsQE45nUciPS2AP7FPBN1EoD9UHINtQBgvrwB6CUAmM0WYaMEAFJRZo8G 1.15 -AAAJ/3WeFgewLrQOuwcAzRA8DXUOsArr8bAN6Oz/rAjAdfjDWDoASW5zZXJ0 1.16 -IG5leHQgZmxvcHB5IGFuZCBwcmVzcyBhbnkga2V5IHRvIGNvbnRpbnVlLgcN 1.17 -AA== 1.18 +mEEx2+hAAb4AAoBMEYDHRCQAnAN0DuhmAb4oAjkcci9HixxW6EIBX4s16FIB 1.19 +sCDNELAIzRBOmM0WPAh0BJiJBK07NXTx6CsBPAp14Yh8/rkYAGoA4vyJ5rAP 1.20 +v/QB/k0csQW0k4lEHLABiUQUmYlUEIlUGGYx20PT40tmAx1m0+toABAHv4AA 1.21 +KfuccwIB31NWMdvo1ABeuQCAtIf+RBzNFVudd9yhGgJIvxwCsQk4RBxysDHA 1.22 +zRPqAAAgkLBGKMi+twHovABd6yOA+RNyBDjBd2iA/gJyBDjmd2mA/VBzc2AG 1.23 +UlFTlrQCULkGAFGxBMHFBLAPIegEkCcUQCfodQDi7rAgzRBZ4rSYzRNhMfat 1.24 +ka2SrVAoyHcCsAGYOfhyAon4UFK0As0TWpVeWHKcKfcB8cHmCQHzOMF1JojI 1.25 +/saxATjmdRyI9P7FtgA8E3USgP1Qcg21AGC+ugHoJACYzRZhowQAUlFmjwYA 1.26 +AAn/dZ4WB7AxLAO0DrsHAM0QPA1088OwDejv/6wIwHX4w1g6AEluc2VydCBu 1.27 +ZXh0IGZsb3BweSBhbmQgcHJlc3MgYW55IGtleSB0byBjb250aW51ZS4HDQA= 1.28 ==== 1.29 EOT 1.30
2.1 --- a/linux/stuff/linux-header-2.6.30.6.u Sun Nov 22 17:34:55 2009 +0100 2.2 +++ b/linux/stuff/linux-header-2.6.30.6.u Mon Nov 23 11:01:54 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,392 @@ 2.8 +@@ -39,53 +41,391 @@ 2.9 #define ROOT_RDONLY 1 2.10 #endif 2.11 2.12 @@ -107,7 +107,6 @@ 2.13 + xchg %ax, %di # sector count 2.14 + cbw # limits = 0 2.15 + incw %cx # cylinder 0, sector 1 2.16 -+ xorb %dh, %dh # head 0, current drive 2.17 + xorw %bx, %bx 2.18 + call read_first_sectors # read setup 2.19 + 2.20 @@ -137,7 +136,7 @@ 2.21 + call puts 2.22 +cmdlp: 2.23 + movb $32, %al # clear end of line 2.24 -+ call putc # with Space 2.25 ++ int $0x10 # with Space 2.26 + movb $8, %al # and BackSpace 2.27 int $0x10 2.28 - jmp msg_loop 2.29 @@ -149,14 +148,14 @@ 2.30 + je cmdbs 2.31 + cbw 2.32 + movw %ax, (%si) # store end of string too 2.33 -+ incw %si 2.34 -+ incw %si 2.35 ++ lodsw # %si += 2 2.36 +cmdbs: 2.37 + cmpw (%di), %si # lower limit is checked 2.38 + je cmdget # but upper limit not 2.39 -+ call putc 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 +endcmdline: 2.45 + 2.46 +nocmdline: 2.47 @@ -374,9 +373,10 @@ 2.48 + cmpb %cl,%dh # reach head limit ? 2.49 + je bdendlp 2.50 +#endif 2.51 -+ movb $0,%dh # first head 2.52 +# NOTE : support 256 cylinders max 2.53 + incb %ch # next cylinder 2.54 ++read_first_sectors: 2.55 ++ movb $0,%dh # first head 2.56 +#ifndef FLOPPY_1440K_ONLY 2.57 + cmpb $FLOPPY_SECTORS+1,%al # 1.44M floppy ? 2.58 + jne bdendlp 2.59 @@ -393,7 +393,6 @@ 2.60 - int $0x19 2.61 + popaw 2.62 +bdendlp: 2.63 -+read_first_sectors: 2.64 +#ifndef FLOPPY_1440K_ONLY 2.65 + movw %ax, limits 2.66 +#endif 2.67 @@ -405,15 +404,16 @@ 2.68 + jne read_sectorslp 2.69 + pushw %ss 2.70 + popw %es # restore es 2.71 -+ movb $0x2e, %al # loading... message 2e = . 2.72 ++ movb $0x2e+3, %al # 2e = . 2.73 ++putclf: 2.74 ++ subb $3, %al 2.75 +putc: 2.76 + movb $0xe, %ah 2.77 + movw $7, %bx # one dot each 64k 2.78 + int $0x10 2.79 + cmp $0xd, %al # CR ? 2.80 -+ jne return 2.81 -+ movb $0xa, %al # LF 2.82 -+ jmp putc 2.83 ++ je putclf 2.84 ++ ret 2.85 2.86 - # int 0x19 should never return. In case it does anyway, 2.87 - # invoke the BIOS reset code... 2.88 @@ -425,7 +425,6 @@ 2.89 + lodsb 2.90 + orb %al,%al # end of string is \0 2.91 + jnz putcs 2.92 -+return: 2.93 + ret 2.94 2.95 - .section ".bsdata", "a"