November 2010 - openfirmware - mail.coreboot.org

[commit] r2014 - cpu/arm
by repository service Nov. 5, 2010

Nov. 5, 2010

Author: wmb Date: Fri Nov 5 19:51:45 2010 New Revision: 2014 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2014 Log: ARM - Fixed (dlit) in the ARM kernel - it was pushing the two halves of the double number in the wrong order. Modified: cpu/arm/kerncode.fth Modified: cpu/arm/kerncode.fth ============================================================================== --- cpu/arm/kerncode.fth Fri Nov 5 07:08:59 2010 (r2013) +++ cpu/arm/kerncode.fth Fri Nov 5 19:51:45 2010 (r2014) @@ -139,8 +139,8 @@ c; code (dlit) ( -- d ) ldmia ip!,{r0,r1} - stmdb sp!,{r1,tos} - mov tos,r0 + stmdb sp!,{r0,tos} + mov tos,r1 c; code execute ( cfa -- ) mov r0,tos

1 0

[commit] r2013 - dev/usb2/hcd/ohci
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: wmb Date: Fri Nov 5 07:08:59 2010 New Revision: 2013 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2013 Log: Fixed a compile problem in the OHCI USB-1.1 driver caused by a somewhat-recent refactoring. Modified: dev/usb2/hcd/ohci/ohci.fth Modified: dev/usb2/hcd/ohci/ohci.fth ============================================================================== --- dev/usb2/hcd/ohci/ohci.fth Fri Nov 5 06:12:20 2010 (r2012) +++ dev/usb2/hcd/ohci/ohci.fth Fri Nov 5 07:08:59 2010 (r2013) @@ -21,13 +21,16 @@ 0 value open-count 0 value ohci-reg +: my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; +: my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; + : map-regs ( -- ) 4 my-w@ h# 16 or 4 my-w! - 0 0 my-space h# 0200.0010 + 1000 map-in to ohci-reg + 0 0 my-space h# 0200.0010 + 1000 " map-in" $call-parent to ohci-reg ; : unmap-regs ( -- ) - ohci-reg 1000 map-out 0 to ohci-reg + ohci-reg 1000 " map-out" $call-parent 0 to ohci-reg ; : ohci-reg@ ( idx -- data ) ohci-reg + rl@ ;

1 0

[commit] r2012 - cpu/x86/pc/olpc
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: quozl Date: Fri Nov 5 06:12:20 2010 New Revision: 2012 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2012 Log: OLPC XO-1.5 - fix developer key recognition on dual-boot. Presence of a signed Windows on either internal microSD slot or external SD slot blocked the recognition of a developer key on a USB drive. Fix by Mitch, tested by Luna. Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Fri Nov 5 04:54:21 2010 (r2011) +++ cpu/x86/pc/olpc/security.fth Fri Nov 5 06:12:20 2010 (r2012) @@ -1030,7 +1030,7 @@ " dk" find-tag dup if nip nip then ; -: all-devices$ ( -- list$ ) " ext-sba: int-sba: disk: ext: int:" ; +: all-devices$ ( -- list$ ) " disk: ext-sba: int-sba: ext: int:" ; : secure-startup ( -- ) in-factory? if

1 0

[commit] r2011 - cpu/arm/olpc/1.75 dev/olpc/mmp2camera
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: wmb Date: Fri Nov 5 04:54:21 2010 New Revision: 2011 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2011 Log: OLPC XO-1.75 - Camera test now uses display video port instead of CPU copying into frame buffer. Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/lcd.fth dev/olpc/mmp2camera/ccic.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Fri Nov 5 02:44:07 2010 (r2010) +++ cpu/arm/olpc/1.75/devices.fth Fri Nov 5 04:54:21 2010 (r2011) @@ -27,7 +27,6 @@ fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART 0 value keyboard-ih -0 value screen-ih fload ${BP}/ofw/core/muxdev.fth \ I/O collection/distribution device @@ -86,6 +85,7 @@ \needs md5init fload ${BP}/ofw/ppp/md5.fth \ MD5 hash + [ifdef] notyet fload ${BP}/dev/olpc/confirm.fth \ Selftest interaction modalities fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data @@ -94,6 +94,7 @@ fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports [else] +: confirm-selftest? ( -- flag ) false ; \ XXX implement me : find-tag ( adr len -- false | value$ true ) 2drop false ; [then] Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Nov 5 02:44:07 2010 (r2010) +++ cpu/arm/olpc/1.75/fw.bth Fri Nov 5 04:54:21 2010 (r2011) @@ -11,8 +11,6 @@ \ ' $report-name is include-hook \ ' noop is include-hook -: confirm-selftest? ( -- flag ) true ; \ XXX implement me - fload ${BP}/cpu/arm/olpc/1.75/devices.fth [ifndef] virtual-mode Modified: cpu/arm/olpc/1.75/lcd.fth ============================================================================== --- cpu/arm/olpc/1.75/lcd.fth Fri Nov 5 02:44:07 2010 (r2010) +++ cpu/arm/olpc/1.75/lcd.fth Fri Nov 5 04:54:21 2010 (r2011) @@ -28,3 +28,74 @@ clkdiv h# 1a8 lcd! \ Clock divider h# 08021100 h# 190 lcd! \ DMA CTRL 0 - enable DMA, 24 bpp mode ; + +: normal-hsv ( -- ) + \ The brightness range is from ffff (-255) to 00ff (255) - 8 bits sign-extended + \ 0 is the median value + h# 0000.4000 h# 1ac lcd! \ Brightness.contrast 0 is normal brightness, 4000 is 1.0 contrast + h# 2000.4000 h# 1b0 lcd! \ Multiplier(1).Saturation(1) + h# 0000.4000 h# 1b4 lcd! \ HueSine(0).HueCosine(1) +; +: clear-unused-regs ( -- ) + 0 h# 0c4 lcd! \ Frame 0 U + 0 h# 0c8 lcd! \ Frame 0 V + 0 h# 0cc lcd! \ Frame 0 Command + 0 h# 0d0 lcd! \ Frame 1 Y + 0 h# 0d4 lcd! \ Frame 1 U + 0 h# 0d8 lcd! \ Frame 1 V + 0 h# 0dc lcd! \ Frame 1 Command + 0 h# 0e4 lcd! \ U and V pitch + 0 h# 130 lcd! \ Color key Y + 0 h# 134 lcd! \ Color key U + 0 h# 138 lcd! \ Color key V +; + +: centered ( w h -- ) + hdisp third - 2/ ( w h x ) \ X centering offset + vdisp third - 2/ ( w h x y ) \ Y centering offset + wljoin h# 0e8 lcd! ( w h ) + + wljoin dup h# 0ec lcd! ( h.w ) \ Source size + h# 0f0 lcd! ( ) \ Zoomed size +; +: zoomed ( w h -- ) + 0 h# 0e8 lcd! ( w h ) \ No offset when zooming + wljoin h# 0ec lcd! ( ) \ Source size + hdisp vdisp wljoin h# 0f0 lcd! ( ) \ Zoom to fill screen +; + +defer placement ' zoomed is placement + +: set-video-alpha ( 0..ff -- ) + 8 lshift ( xx00 ) + h# 194 lcd@ ( xx00 regval ) + h# ff00 invert and ( xx00 regval' ) + or ( regval' ) + h# 194 lcd! ( ) +; + +\ 0:RBG565 1:RGB1555 2:RGB888packed 3:RGB888unpacked 4:RGBA888 +\ 5:YUV422packed 6:YUV422planar 7:YUV420planar 8:SmartPanelCmd +\ 9:Palette4bpp A:Palette8bpp B:RGB888A +: set-video-mode ( mode -- ) + d# 20 lshift ( x00000 ) + h# 190 lcd@ ( x00000 regval ) + h# f00000 invert and ( x00000 regval' ) + or ( regval' ) + h# 190 lcd! ( ) +; +: video-on ( -- ) h# 190 lcd@ 1 or h# 190 lcd! ; +: video-off ( -- ) h# 190 lcd@ 1 invert and h# 190 lcd! ; +: set-video-dma-adr ( adr -- ) h# 0c0 lcd! ; + +\ Assumes RGB565 +: start-video ( adr w h -- ) + clear-unused-regs normal-hsv ( adr w h ) + over 2* h# 0e0 lcd! ( adr w h ) \ Pitch - width * 2 bytes/pixel + placement ( adr ) + set-video-dma-adr ( ) \ Video buffer + 0 set-video-mode ( ) \ RGB565 + d# 255 set-video-alpha ( ) \ Opaque video + video-on +; +: stop-video ( -- ) video-off ; Modified: dev/olpc/mmp2camera/ccic.fth ============================================================================== --- dev/olpc/mmp2camera/ccic.fth Fri Nov 5 02:44:07 2010 (r2010) +++ dev/olpc/mmp2camera/ccic.fth Fri Nov 5 04:54:21 2010 (r2011) @@ -18,7 +18,7 @@ then ; : free-dma-bufs ( -- ) - dma-bufs dma-bufs-phys /dma-buf #dma-bufs * " free-capture-buffer" $call-parent + dma-bufs dma-bufs-phys /dma-buf #dma-bufs * free-capture-buffer 0 to dma-bufs 0 to dma-bufs-phys ; @@ -105,21 +105,20 @@ 0 value buf-act : /string ( adr len n -- adr' len' ) tuck - -rot + swap ; -: buf-done? ( -- false | buf-adr true ) +: buf-done? ( -- false | buf# true ) h# 30 cl@ dup 1 next-buf lshift and if ( value ) h# 30 cl! ( ) - next-buf 'dma-buf ( buf-adr ) - true ( buf-adr true ) + next-buf true ( buf# true ) else ( value ) drop false ( false ) then ; -: snap ( timeout -- true | adr false ) +: snap ( timeout -- true | buf# false ) 0 do - buf-done? if ( buf-adr ) - false unloop exit ( -- buf-adr false ) + buf-done? if ( buf# ) + false unloop exit ( -- buf# false ) then 1 ms loop @@ -129,11 +128,12 @@ external : read ( adr len -- actual ) - buf-done? if ( adr len buf-adr ) - -rot /dma-buf min ( buf-adr adr actual ) + buf-done? if ( adr len buf# ) + 'dma-buf -rot ( buf-adr adr len ) + /dma-buf min ( buf-adr adr actual ) dup >r move r> ( actual ) else - 2drop 0 + 2drop -2 then ; @@ -145,7 +145,15 @@ true ; +: start-display ( -- ) + 0 'dma-buf-phys VGA_WIDTH VGA_HEIGHT " start-video" $call-screen +; +: stop-display ( -- ) + " stop-video" $call-screen +; + : close ( -- ) + stop-display ctlr-stop interrupts-off power-off @@ -210,8 +218,9 @@ 2drop ( ) ; -: display-frame ( adr -- ) - fb-pa copy16>24 +: display-frame ( buf# -- ) + 'dma-buf-phys " set-video-dma-adr" $call-screen +\ 'dma-buf fb-pa copy16>24 \ autobright ; @@ -223,7 +232,7 @@ ; : shoot-still ( -- error? ) - d# 1000 snap if true exit then ( adr ) + d# 1000 snap if true exit then ( buf# ) display-frame false ; @@ -243,6 +252,7 @@ : selftest ( -- error? ) open 0= if true exit then d# 300 ms + start-display unmirrored shoot-still ?dup if close exit then ( error? ) d# 1,000 ms mirrored shoot-movie full-brightness ( error? )

1 0

[commit] r2010 - cpu/x86/pc/olpc/via ofw/gui
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: quozl Date: Fri Nov 5 02:44:07 2010 New Revision: 2010 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2010 Log: OLPC XO-1.5 - dual boot secure operating system choice menu Enable the operating system choice menu for machines that are booted with security enabled. Reduce the menu where no choice is available. * ofw/gui/iconmenu.fth: create a variant of menu which does not establish a new return stack state. * cpu/x86/pc/olpc/via/fw.bth: fix to restore the logo after menu and before freezing display, show operating system choice menu before secure startup. * cpu/x86/pc/olpc/via/chooseos.fth: add test for whether both alternate MBRs are present. * cpu/x86/pc/olpc/via/bootmenu.fth: remove maintenance icon, rewrite to choose operating system and return from menu, show an empty menu if no choice is available. Modified: cpu/x86/pc/olpc/via/bootmenu.fth cpu/x86/pc/olpc/via/chooseos.fth cpu/x86/pc/olpc/via/fw-version.fth cpu/x86/pc/olpc/via/fw.bth ofw/gui/iconmenu.fth Modified: cpu/x86/pc/olpc/via/bootmenu.fth ============================================================================== --- cpu/x86/pc/olpc/via/bootmenu.fth Thu Nov 4 23:13:40 2010 (r2009) +++ cpu/x86/pc/olpc/via/bootmenu.fth Fri Nov 5 02:44:07 2010 (r2010) @@ -1,32 +1,49 @@ -icon: tux.icon rom:\tux.565 -icon: windows.icon rom:\winlogo.565 -icon: maintenance.icon rom:\settings.565 - -: boot-linux-item restore-scroller ." Booting Linux" cr " 0 choose-os boot" eval wait-return ; -: boot-windows-item restore-scroller ." Booting Windows" cr " 1 choose-os boot" eval wait-return ; -: maintenance-item ['] full-menu nest-menu ; +icon: tux.icon rom:tux.565 +icon: windows.icon rom:winlogo.565 + +: choose-linux-item + restore-scroller ." Choosing Linux" cr + 0 " choose-os" eval + menu-done +; + +: choose-windows-item + restore-scroller ." Choosing Windows" cr + 1 " choose-os" eval + menu-done +; : boot-menu ( -- ) d# 1 to rows - d# 2 to cols d# 3 to cols -\ d# 308 to sq-size -\ d# 256 to image-size -\ d# 256 to icon-size clear-menu - " Boot Linux/Sugar" - ['] boot-linux-item tux.icon 0 0 selected install-icon + " Linux/Sugar" + ['] choose-linux-item tux.icon 0 0 selected install-icon + + " Microsoft Windows" + ['] choose-windows-item windows.icon 0 1 install-icon - " Boot Microsoft Windows" - ['] boot-windows-item windows.icon 0 1 install-icon + " Continue" + ['] quit-item play.icon 0 2 install-icon +; + +: no-boot-menu ( -- ) + d# 1 to rows + d# 1 to cols + + clear-menu - " Maintenance Functions" - ['] maintenance-item maintenance.icon 0 2 install-icon + " No operating system choice installed" + ['] quit-item quit.icon 0 0 selected install-icon ; : bootmenu - ['] boot-menu to root-menu - menu + " choice-present?" eval if + ['] boot-menu to root-menu + else + ['] no-boot-menu to root-menu + then + (menu) ; Modified: cpu/x86/pc/olpc/via/chooseos.fth ============================================================================== --- cpu/x86/pc/olpc/via/chooseos.fth Thu Nov 4 23:13:40 2010 (r2009) +++ cpu/x86/pc/olpc/via/chooseos.fth Fri Nov 5 02:44:07 2010 (r2010) @@ -29,22 +29,49 @@ #switched " read-blocks" mbr-ih $call-method ( nread ) #switched <> abort" Read failed" ; + : put-sectors ( adr sector# -- ) #switched " write-blocks" mbr-ih $call-method ( nread ) #switched <> abort" Write failed" ; + +: open-mbr + " int:0" open-dev dup 0= abort" Can't open internal storage" ( ihandle ) + to mbr-ih +; + +: get-desired-mbr ( n -- ) + desired-mbr swap #switched * saved-mbrs-base + get-sectors +; + +: is-desired-mbr? ( -- is-mbr? ) + desired-mbr /mbr is-mbr? +; + +: close-mbr + mbr-ih close-dev +; + +: choice-present? ( -- present? ) + open-mbr + 0 get-desired-mbr is-desired-mbr? + 1 get-desired-mbr is-desired-mbr? + and + close-mbr +; + : choose-os ( n -- ) - " int:0" open-dev dup to mbr-ih 0= abort" Can't open internal storage" ( n ) + open-mbr current-mbr 0 get-sectors ( ) - desired-mbr swap #switched * saved-mbrs-base + get-sectors - desired-mbr /mbr is-mbr? 0= if - mbr-ih close-dev + get-desired-mbr + is-desired-mbr? 0= if + close-mbr true abort" The chosen MBR is invalid" cr then current-mbr desired-mbr /mbr comp if desired-mbr 0 put-sectors then - mbr-ih close-dev + close-mbr ; \ LICENSE_BEGIN Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Thu Nov 4 23:13:40 2010 (r2009) +++ cpu/x86/pc/olpc/via/fw-version.fth Fri Nov 5 02:44:07 2010 (r2010) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 59 +macro: FW_MINOR 59a Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Thu Nov 4 23:13:40 2010 (r2009) +++ cpu/x86/pc/olpc/via/fw.bth Fri Nov 5 02:44:07 2010 (r2010) @@ -648,7 +648,7 @@ : ?boot-menu ( -- ) rocker-down game-key? if - protect-fw visible bootmenu invisible show-child + protect-fw visible bootmenu show-child invisible then ; @@ -708,14 +708,13 @@ ?scan-nand [then] ?fs-update + ?boot-menu factory-test? 0= if secure-startup then unblock-exceptions ['] (interrupt-auto-boot?) to interrupt-auto-boot? ?usb-keyboard auto-banner? if banner then - ?boot-menu - auto-boot frozen? text-on? 0= and ( no-banner? ) Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Thu Nov 4 23:13:40 2010 (r2009) +++ ofw/gui/iconmenu.fth Fri Nov 5 02:44:07 2010 (r2010) @@ -504,13 +504,7 @@ 2r> to current-sq set-menu refresh ; -\ Note that menu establishes a new return stack state. Be sure to -\ clear any installed handler chain and establish a new base catch frame. - -: menu ( -- ) recursive - rp0 @ rp! - 0 handler ! - ['] menu to user-interface +: (menu) ( -- ) setup-menu ['] root-menu ['] nest-menu catch drop @@ -519,8 +513,20 @@ 0 0 ( color x y ) screen-wh ( color x y w y ) fill-rectangle-noff ( ) - + restore-scroller +; + +\ Note that menu establishes a new return stack state. Be sure to +\ clear any installed handler chain and establish a new base catch frame. + +: menu ( -- ) recursive + rp0 @ rp! + 0 handler ! + ['] menu to user-interface + + (menu) + .menu ['] quit to user-interface quit

1 0

[commit] r2009 - cpu/arm/olpc/1.75
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: wmb Date: Thu Nov 4 23:13:40 2010 New Revision: 2009 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2009 Log: OLPC XO-1.75 - Build automation fixes. Modified: cpu/arm/olpc/1.75/fw-version.fth cpu/arm/olpc/1.75/olpc.bth cpu/arm/olpc/1.75/sourceurl.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Thu Nov 4 19:26:19 2010 (r2008) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Nov 4 23:13:40 2010 (r2009) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 02 +macro: FW_MINOR 03 Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Thu Nov 4 19:26:19 2010 (r2008) +++ cpu/arm/olpc/1.75/olpc.bth Thu Nov 4 23:13:40 2010 (r2009) @@ -4,6 +4,12 @@ in: ${BP}/cpu/arm/olpc/1.75/build/fw.img in: sd8686.bin in: verify.img +in: ${BP}/dev/usb2/device/hub/build/hub.fc +in: ${BP}/dev/usb2/device/generic/build/generic.fc +in: ${BP}/dev/usb2/device/net/build/usbnet.fc +in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/serial/build/usbserial.fc +in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc build-now fload ${BP}/cpu/arm/olpc/1.75/fw-version.fth @@ -37,8 +43,8 @@ \ Main Processor code loaded into DRAM image: OBMI 800 d101c000 ${BP}/cpu/arm/olpc/1.75/dummy.img \ Secure Processor code loaded into SRAM -image: WTMI 1000 d1018000 /scratchbox/users/wmb/home/wmb/cforth.git/build/arm-xo-1.75/shim.img -image: CFTH 2000 d1000000 /scratchbox/users/wmb/home/wmb/cforth.git/build/arm-xo-1.75/app.img +image: WTMI 1000 d1018000 ${BP}/../cforth/build/arm-xo-1.75/shim.img +image: CFTH 2000 d1000000 ${BP}/../cforth/build/arm-xo-1.75/app.img \ anonymous: 20000 ${BP}/cpu/arm/olpc/1.75/build/fw.img reserved: \ fload ${BP}/cpu/arm/olpc/1.75/ddr_samsung_1g.fth Modified: cpu/arm/olpc/1.75/sourceurl.fth ============================================================================== --- cpu/arm/olpc/1.75/sourceurl.fth Thu Nov 4 19:26:19 2010 (r2008) +++ cpu/arm/olpc/1.75/sourceurl.fth Thu Nov 4 23:13:40 2010 (r2009) @@ -2,7 +2,6 @@ show-rebuilds? false to show-rebuilds? \ We don't need to see these commands -" svn info ../../../../.. | grep URL: | cut -d ' ' -f 2 | tr \\n ' ' >sourceurl" $sh -" svnversion -n ../../../../.. >>sourceurl" $sh +" if svn info ${BP} 2>/dev/null >/dev/null; then svn info ${BP} | grep URL: | cut -d ' ' -f 2 | tr \\n ' ' >sourceurl; svnversion -n ${BP} >>sourceurl; else git log -1 | grep git-svn-id: >sourceurl; fi" $sh to show-rebuilds?

1 0

[commit] r2008 - cpu/arm/olpc/1.75
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: wmb Date: Thu Nov 4 19:26:19 2010 New Revision: 2008 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2008 Log: OLPC XO-1.75 - Added crypto-version.fth Added: cpu/arm/olpc/1.75/crypto-version.fth Added: cpu/arm/olpc/1.75/crypto-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/crypto-version.fth Thu Nov 4 19:26:19 2010 (r2008) @@ -0,0 +1,6 @@ +\ The public keys +macro: KEYS mpkeys +\ macro: KEYS testkeys + +\ The bios_verify image +macro: CRYPTO_VERSION 0.5-ARM

1 0

[commit] r2007 - cpu/arm/olpc/1.75
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: wmb Date: Thu Nov 4 19:25:24 2010 New Revision: 2007 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2007 Log: OLPC XO-1.75 - Added verify.bth Added: cpu/arm/olpc/1.75/verify.bth Added: cpu/arm/olpc/1.75/verify.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/verify.bth Thu Nov 4 19:25:24 2010 (r2007) @@ -0,0 +1,24 @@ +purpose: Fetch the Crypto code and keys + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/1.75/crypto-version.fth + +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img…" expand$ $sh + +" md5sum -b bios_verify-${CRYPTO_VERSION}.img | cmp - bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh + +" mv bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh +" rm bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh + +\ This forces the creation of an verify.log file, so we don't re-fetch +writing verify.version +" ${CRYPTO_VERSION}"n" expand$ ofd @ fputs +ofd @ fclose

1 0

[commit] r2006 - in cpu/arm: . mmp2 olpc/1.75
by repository service Nov. 4, 2010

Nov. 4, 2010

Author: wmb Date: Thu Nov 4 19:18:07 2010 New Revision: 2006 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2006 Log: OLPC XO-1.75 - Add crypto verifier, fix screen flashing bug. Added: cpu/arm/olpc/1.75/wlan-version.fth Modified: cpu/arm/call.fth cpu/arm/mmp2/hash.fth cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/lcd.fth cpu/arm/olpc/1.75/olpc.bth cpu/arm/olpc/1.75/prefw.bth cpu/arm/olpc/1.75/sdhci.fth Modified: cpu/arm/call.fth ============================================================================== --- cpu/arm/call.fth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/call.fth Thu Nov 4 19:18:07 2010 (r2006) @@ -1,7 +1,7 @@ purpose: From Forth, call the C subroutine whose address is on the stack \ See license at end of file -code sp-call ( [ arg5 .. arg0 ] adr sp -- [ arg5 .. arg0 ] result ) +code sp-call ( [ arg19 .. arg0 ] adr sp -- [ arg19 .. arg0 ] result ) pop r6,sp \ Get the subroutine address str sp,'user saved-sp \ Save for callbacks @@ -10,10 +10,22 @@ mov rp,#0 \ Set the frame pointer to null - \ Pass up to 6 arguments - ldmia sp,{r0,r1,r2,r3,r4,r5} + \ Pass up to 20 arguments + add r4,sp,#0x10 + sub r5,tos,#0x50 + + ldmia r4!,{r0,r1,r2,r3} \ Arguments 4-7 + stmia r5!,{r0,r1,r2,r3} \ .. onto new stack + ldmia r4!,{r0,r1,r2,r3} \ Arguments 8-11 + stmia r5!,{r0,r1,r2,r3} \ .. onto new stack + ldmia r4!,{r0,r1,r2,r3} \ Arguments 12-15 + stmia r5!,{r0,r1,r2,r3} \ .. onto new stack + ldmia r4!,{r0,r1,r2,r3} \ Arguments 16-19 + stmia r5!,{r0,r1,r2,r3} \ .. onto new stack - mov sp,tos \ Switch to the new stack + ldmia sp,{r0,r1,r2,r3} \ First 4 arguments in registers + + sub sp,tos,#0x50 \ Switch to the new stack mov lk,pc \ Set link register to return address mov pc,r6 \ Call the subroutine @@ -23,7 +35,7 @@ ldr sp,'user saved-sp \ Restore the stack pointer mov tos,r0 \ Return subroutine result c; -: call ( [ arg5 .. arg0 ] adr -- [ arg5 .. arg0 ] result ) sp@ sp-call ; +: call ( [ arg19 .. arg0 ] adr -- [ arg19 .. arg0 ] result ) sp@ sp-call ; \ LICENSE_BEGIN \ Copyright (c) 1997 FirmWorks Modified: cpu/arm/mmp2/hash.fth ============================================================================== --- cpu/arm/mmp2/hash.fth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/mmp2/hash.fth Thu Nov 4 19:18:07 2010 (r2006) @@ -137,7 +137,7 @@ ; [else] \ This procedure works -: init-entropy-digital ( -- ) +: init-entropy ( -- ) \ Using digital method h# 21117c0 h# d4292c00 l! ; [then] @@ -149,6 +149,11 @@ : random-long ( -- l ) random-short random-short wljoin ; +alias random random-long + +stand-init: Random number generator + init-entropy +; \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/olpc/1.75/devices.fth Thu Nov 4 19:18:07 2010 (r2006) @@ -185,6 +185,7 @@ devalias int /sd@d4281000/disk devalias ext /sd@d4280000/disk +devalias net /wlan \ XXX should report-net in case of USB Ethernet fload ${BP}/dev/olpc/kb3700/spicmd.fth Modified: cpu/arm/olpc/1.75/lcd.fth ============================================================================== --- cpu/arm/olpc/1.75/lcd.fth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/olpc/1.75/lcd.fth Thu Nov 4 19:18:07 2010 (r2006) @@ -26,5 +26,5 @@ h# 2000000d h# 1b8 lcd! \ Dumb panel controller - 18 bit RGB666 on LDD[17:0] h# 01330133 h# 13c lcd! \ Panel VSYNC Pulse Pixel Edge Control clkdiv h# 1a8 lcd! \ Clock divider - h# 00021100 h# 190 lcd! \ DMA CTRL 0 - enable DMA, 24 bpp mode + h# 08021100 h# 190 lcd! \ DMA CTRL 0 - enable DMA, 24 bpp mode ; Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/olpc/1.75/olpc.bth Thu Nov 4 19:18:07 2010 (r2006) @@ -3,6 +3,7 @@ command: &builder &this in: ${BP}/cpu/arm/olpc/1.75/build/fw.img in: sd8686.bin +in: verify.img build-now fload ${BP}/cpu/arm/olpc/1.75/fw-version.fth @@ -126,14 +127,13 @@ " memtest" " memtest" $add-deflated-dropin [then] -0 [if] " verify.img" " verify" $add-deflated-dropin " os.public" " ospubkey" $add-dropin \ Incompressible " fw.public" " fwpubkey" $add-dropin \ Incompressible " fs.public" " fspubkey" $add-dropin \ Incompressible " lease.public" " leasepubkey" $add-dropin \ Incompressible " developer.public" " develpubkey" $add-dropin \ Incompressible -[then] + " sourceurl" " sourceurl" $add-dropin 0 [if] Modified: cpu/arm/olpc/1.75/prefw.bth ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/olpc/1.75/prefw.bth Thu Nov 4 19:18:07 2010 (r2006) @@ -167,6 +167,10 @@ fload ${BP}/forth/lib/selstr.fth +fload ${BP}/cpu/arm/mmp2/hash.fth \ Hashes - SHA1, SHA-256, MD5 +fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation +fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory + fload ${BP}/ofw/inet/loadtcp.fth support-package: http @@ -185,8 +189,6 @@ fload ${BP}/cpu/arm/olpc/1.75/memtest.fth [then] -fload ${BP}/cpu/arm/mmp2/hash.fth \ Hashes - SHA1, SHA-256, MD5 - fload ${BP}/ofw/wifi/wifi-cfg.fth support-package: supplicant fload ${BP}/ofw/wifi/loadpkg.fth Modified: cpu/arm/olpc/1.75/sdhci.fth ============================================================================== --- cpu/arm/olpc/1.75/sdhci.fth Thu Nov 4 04:35:15 2010 (r2005) +++ cpu/arm/olpc/1.75/sdhci.fth Thu Nov 4 19:18:07 2010 (r2006) @@ -96,7 +96,7 @@ end-package -stand-init: \ SDHC clocks +stand-init: SDHC clocks h# 41b h# d4282854 l! \ SD0 (external SD) clocks, plus set master clock divisor h# 1b h# d4282858 l! \ SD1 (WLAN) clocks h# 1b h# d42828e8 l! \ SD2 (internal microSD) clocks Added: cpu/arm/olpc/1.75/wlan-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/wlan-version.fth Thu Nov 4 19:18:07 2010 (r2006) @@ -0,0 +1,7 @@ +\ The wireless LAN module firmware +macro: WLAN_VERSION 9.0.7.p2 + +\ Alternate command for getting WLAN firmware, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin +\ macro: GET_WLAN wget http://dev.laptop.org/pub/firmware/libertas/thinfirm/lbtf_sdio-9.0.7.p2.bin -O sd8686.bin

1 0

[commit] r2005 - cpu/x86/pc/olpc/via
by repository service Nov. 3, 2010

Nov. 3, 2010

Author: quozl Date: Thu Nov 4 04:35:15 2010 New Revision: 2005 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2005 Log: Q3A59 release for dual-boot testing, for Luna. Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Wed Nov 3 10:40:59 2010 (r2004) +++ cpu/x86/pc/olpc/via/fw-version.fth Thu Nov 4 04:35:15 2010 (r2005) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 58b +macro: FW_MINOR 59

1 0