November 2011 - openfirmware - mail.coreboot.org

[commit] r2717 - cpu/arm/olpc/1.75
by repository service Nov. 29, 2011

Nov. 29, 2011

Author: quozl Date: Wed Nov 30 05:53:27 2011 New Revision: 2717 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2717 Log: Q4C06 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Wed Nov 30 05:49:14 2011 (r2716) +++ cpu/arm/olpc/1.75/fw-version.fth Wed Nov 30 05:53:27 2011 (r2717) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 05 +macro: FW_MINOR 06

1 0

[commit] r2716 - cpu/arm/olpc/1.75
by repository service Nov. 29, 2011

Nov. 29, 2011

Author: quozl Date: Wed Nov 30 05:49:14 2011 New Revision: 2716 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2716 Log: OLPC XO-1.75 - new accelerometer rate setting, not used in build, we leave it at chip default Modified: cpu/arm/olpc/1.75/accelerometer.txt Modified: cpu/arm/olpc/1.75/accelerometer.txt ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.txt Tue Nov 29 22:06:43 2011 (r2715) +++ cpu/arm/olpc/1.75/accelerometer.txt Wed Nov 30 05:49:14 2011 (r2716) @@ -15,17 +15,25 @@ : bdu ( -- ) h# 23 acc-reg@ h# 80 or h# 23 acc-reg! ; \ sample rate setting -: odr! ( n -- ) 4 lshift h# 20 acc-reg@ h# 0f and or h# 20 acc-reg! ; +0 value ctl1 +ctl1@ to ctl1 +: ctl1! ( b -- ) dup to ctl1 h# 20 acc-reg! ; +: ctl1( ( -- n ) ctl1 ; +: )ctl1 ( n -- ) dup to ctl1 ctl1! ; +: nm ( n -- n ) h# 08 invert and ; +: lpm ( n -- n ) h# 08 or ; +: odr! ( n odr -- n ) 4 lshift swap h# 0f and or ; -: 1hz ( -- ) 1 odr! ; -: 10hz ( -- ) 2 odr! ; -: 25hz ( -- ) 3 odr! ; -: 50hz ( -- ) 4 odr! ; \ power up default -: 100hz ( -- ) 5 odr! ; -: 200hz ( -- ) 6 odr! ; -: 400hz ( -- ) 7 odr! ; -: 1.6khz ( -- ) 8 odr! ; -: 5khz ( -- ) 9 odr! ; +: 1hz ( -- ) ctl1( nm 1 odr! )ctl1 ; +: 10hz ( -- ) ctl1( nm 2 odr! )ctl1 ; +: 25hz ( -- ) ctl1( nm 3 odr! )ctl1 ; +: 50hz ( -- ) ctl1( nm 4 odr! )ctl1 ; \ power up default +: 100hz ( -- ) ctl1( nm 5 odr! )ctl1 ; +: 200hz ( -- ) ctl1( nm 6 odr! )ctl1 ; +: 400hz ( -- ) ctl1( nm 7 odr! )ctl1 ; +: 1.25khz ( -- ) ctl1( nm 8 odr! )ctl1 ; +: 1.6khz ( -- ) ctl1( lpm 8 odr! )ctl1 ; +: 5khz ( -- ) ctl1( lpm 9 odr! )ctl1 ; \ sign extend a byte : bext ( b -- n ) dup h# 80 and if h# ffffff00 or then ;

1 0

[commit] r2715 - cpu/arm/olpc/1.75
by repository service Nov. 29, 2011

Nov. 29, 2011

Author: wmb Date: Tue Nov 29 22:06:43 2011 New Revision: 2715 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2715 Log: OLPC XO-1.75 - reset-usb-hub wasn't actually driving the RESET# line low. Modified: cpu/arm/olpc/1.75/usb.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Tue Nov 29 07:46:48 2011 (r2714) +++ cpu/arm/olpc/1.75/usb.fth Tue Nov 29 22:06:43 2011 (r2715) @@ -28,7 +28,7 @@ \ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot : usb-power-on ( -- ) ; \ The EC controls the USB power -: reset-usb-hub ( -- ) d# 146 gpio-set d# 10 ms d# 146 gpio-set ; +: reset-usb-hub ( -- ) d# 146 gpio-clr d# 10 ms d# 146 gpio-set ; : init-usb ( -- ) h# 9 h# 5c pmua! \ Enable clock to USB block

1 0

[commit] r2714 - dev/usb2/hcd/uhci
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: quozl Date: Tue Nov 29 07:46:48 2011 New Revision: 2714 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2714 Log: USB UHCI - begin-intr-in stack balance was wrong if already started Modified: dev/usb2/hcd/uhci/intr.fth Modified: dev/usb2/hcd/uhci/intr.fth ============================================================================== --- dev/usb2/hcd/uhci/intr.fth Tue Nov 29 07:22:20 2011 (r2713) +++ dev/usb2/hcd/uhci/intr.fth Tue Nov 29 07:46:48 2011 (r2714) @@ -58,7 +58,7 @@ : begin-intr-in ( buf len pipe interval -- ) debug? if ." begin-intr-in" cr then - intr-in-qh if 3drop exit then \ Already started + intr-in-qh if 4drop exit then \ Already started to intr-in-interval dup to intr-in-pipe

1 0

[commit] r2713 - cpu/x86/pc/olpc
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: quozl Date: Tue Nov 29 07:22:20 2011 New Revision: 2713 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2713 Log: OLPC - fix build fail on XO-1 and XO-1.5 after -r2706, tested on XO-1.5 Modified: cpu/x86/pc/olpc/setwp.fth Modified: cpu/x86/pc/olpc/setwp.fth ============================================================================== --- cpu/x86/pc/olpc/setwp.fth Tue Nov 29 01:27:01 2011 (r2712) +++ cpu/x86/pc/olpc/setwp.fth Tue Nov 29 07:22:20 2011 (r2713) @@ -42,8 +42,7 @@ mfg-data-buf /flash-block + (find-tag) ; -\ FIXME: ifdef XO-1.75 - +[ifdef] /flash-page : set-cp ( adr -- ) " CP" find-tag if ( adr len ) 2drop [char] C ( expected ) @@ -69,6 +68,9 @@ ec-flags-buf set-ap ec-flags-buf ?reflash-ec-flags ; +[else] +: ?sync-ec ; +[then] \ Write mfg data from RAM to FLASH : put-mfg-data ( -- )

1 0

[commit] r2712 - dev/video/controlr
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: wmb Date: Tue Nov 29 01:27:01 2011 New Revision: 2712 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2712 Log: Initial revision of VESA framebuffer driver. Added: dev/video/controlr/vesa.fth Added: dev/video/controlr/vesa.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/video/controlr/vesa.fth Tue Nov 29 01:27:01 2011 (r2712) @@ -0,0 +1,110 @@ +\ See license at end of file +purpose: VESA framebuffer driver + +0 0 " d0000000" " /" begin-package + +" display" device-name +" vesa" " compatible" string-property +h# 40000 constant /fb + +my-address my-space encode-phys /fb encode-int encode+ " reg" property + +\ Assume mode 117 - 1024x768x16 - for now +d# 16 value depth +d# 1280 value width \ If scaled is false, will be replaced with hdisplay +d# 1024 value height \ If scaled is false, will be replaced with vdisplay + +: setmode ( -- ) ; + +\ : bytes/line ( -- n ) width depth 8 / * ; +: /scanline ( -- n ) width depth 8 / * ; + +: erase-frame-buffer ( -- ) + frame-buffer-adr /fb ( adr len ) + depth case + 8 of h# 0f fill endof + d# 16 of h# ffff " wfill" evaluate endof + d# 32 of h# ffff.ffff " lfill" evaluate endof + ( default ) nip nip + endcase + h# f to background-color +; +: map-frame-buffer ( -- ) + my-space /fb " map-in" $call-parent to frame-buffer-adr +; +: declare-props ( -- ) \ Instantiate screen properties + " width" get-my-property if + width encode-int " width" property + height encode-int " height" property + depth encode-int " depth" property + /scanline encode-int " linebytes" property + else + 2drop + then +; +: set-terminal ( -- ) + width height ( width height ) + over char-width / over char-height / ( width height rows cols ) + /scanline depth " fb-install" evaluate ( gp-install ) ( ) +; + +0 value open-count + +: display-remove ( -- ) + open-count 1 = if + then + open-count 1- 0 max to open-count +; + +: display-install ( -- ) + open-count 0= if + setmode + declare-props \ Setup properites + map-frame-buffer + erase-frame-buffer + else + map-frame-buffer + then + default-font set-font + set-terminal + open-count 1+ to open-count +; + +: display-selftest ( -- failed? ) false ; + +' display-install is-install +' display-remove is-remove +' display-selftest is-selftest + +" display" device-type +" ISO8859-1" encode-string " character-set" property +0 0 encode-bytes " iso6429-1983-colors" property + +fload ${BP}/dev/video/common/rectangle16.fth +alias color! 4drop + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r2711 - cpu/x86/pc/newton
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: wmb Date: Tue Nov 29 01:26:55 2011 New Revision: 2711 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2711 Log: Newton - fixed a number of bugs found in initial testing. Modified: cpu/x86/pc/newton/config.fth cpu/x86/pc/newton/devices.fth cpu/x86/pc/newton/fw.bth cpu/x86/pc/newton/probemem.fth Modified: cpu/x86/pc/newton/config.fth ============================================================================== --- cpu/x86/pc/newton/config.fth Tue Nov 29 01:26:49 2011 (r2710) +++ cpu/x86/pc/newton/config.fth Tue Nov 29 01:26:55 2011 (r2711) @@ -10,10 +10,12 @@ create use-timestamp-counter create use-tsc-timing -\ create use-vesa -create use-ega +create use-vesa +\ create use-ega \ create serial-console +create no-keyboard \ Newton has no PS/2 keyboard and mouse + \ In virtual mode, OFW runs with the MMU on. The advantages are \ that OFW can automatically locate itself out of the way, at the \ top of physical memory, it can dynamically allocate exactly as Modified: cpu/x86/pc/newton/devices.fth ============================================================================== --- cpu/x86/pc/newton/devices.fth Tue Nov 29 01:26:49 2011 (r2710) +++ cpu/x86/pc/newton/devices.fth Tue Nov 29 01:26:55 2011 (r2711) @@ -38,12 +38,13 @@ fload ${BP}/ofw/fs/cbfs.fth \ Coreboot ROM filesystem +h# 80.0000 to /flash \ Entire device \ Create the top-level device node to access the entire boot FLASH device -0 0 " ffa00000" " /" begin-package +0 0 " ff800000" " /" begin-package " flash" device-name - h# 10.0000 value /device - h# 10.0000 constant /device-phys + h# 80.0000 value /device + h# 80.0000 constant /device-phys my-address my-space /device-phys reg fload ${BP}/dev/flashpkg.fth fload ${BP}/dev/flashwrite.fth @@ -52,6 +53,28 @@ \ XXX later \ devalias cbfs /flash//cbfs-file-system +\ Create a node below the top-level FLASH node to accessing the portion +\ containing the dropin modules +0 0 " 200000" " /flash" begin-package + " dropins" device-name + + h# 100000 constant /device + fload ${BP}/dev/subrange.fth +end-package + +devalias dropins /dropins + +\ Create a node below the top-level FLASH node to accessing the portion +\ containing the dropin modules +0 0 " 780000" " /flash" begin-package + " coreboot" device-name + + h# 080000 constant /device + fload ${BP}/dev/subrange.fth +end-package + +devalias coreboot /coreboot + 0 [if] \ This really should be a subrange of /flash 0 0 dropin-base <# u#s u#> " /" begin-package @@ -65,13 +88,15 @@ end-package devalias dropins /dropinram -[else] -patch /l /di-header first-header -patch /l /di-header first-header -\ devalias dropins cbfs:fallback\payload -devalias dropins /flash [then] +\ [else] +\ patch /l /di-header first-header +\ patch /l /di-header first-header +\ \ devalias dropins cbfs:fallback\payload +\ devalias dropins /flash +\ [then] + \ Create a pseudo-device that presents the dropin modules as a filesystem. fload ${BP}/ofw/fs/dropinfs.fth Modified: cpu/x86/pc/newton/fw.bth ============================================================================== --- cpu/x86/pc/newton/fw.bth Tue Nov 29 01:26:49 2011 (r2710) +++ cpu/x86/pc/newton/fw.bth Tue Nov 29 01:26:55 2011 (r2711) @@ -192,15 +192,19 @@ fload ${BP}/cpu/x86/pc/linux.fth hex +: report-net? ( name$ -- found? ) + 2dup find-package if ( name$ phandle ) + drop " net" 2swap $devalias ( ) + true ( found? ) + else ( name$ ) + 2drop false ( found? ) + then ( found? ) +; \ If there is a PCI ethernet adapter, use it as the default net device, \ otherwise use any ethernet that can be found in the device tree. : report-net ( -- ) - " /pci/ethernet" 2dup find-package if ( name$ phandle ) - drop ( name$ ) - else ( name$ ) - 2drop " /ethernet" ( name$' ) - then ( name$ ) - " net" 2swap $devalias ( ) + " /usb@1a/ethernet" report-net? if exit then + " /usb@1b/ethernet" report-net? if exit then ; fload ${BP}/cpu/x86/pc/newton/usb.fth @@ -212,6 +216,7 @@ patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth +fload ${BP}/cpu/x86/pc/newton/testitems.fth fload ${BP}/dev/olpc/confirm.fth : bright! ( level -- ) drop ; : backlight-on ( -- ) ; Modified: cpu/x86/pc/newton/probemem.fth ============================================================================== --- cpu/x86/pc/newton/probemem.fth Tue Nov 29 01:26:49 2011 (r2710) +++ cpu/x86/pc/newton/probemem.fth Tue Nov 29 01:26:55 2011 (r2711) @@ -3,8 +3,8 @@ dev /memory -: /ram ( -- #bytes ) 0 h# b0 config-w@ wljoin ; \ Base of stolen memory -: usable-ramtop ( -- n ) h# ac config-l@ ; \ Top of usable DRAM +: /ram ( -- #bytes ) h# b0 config-l@ ; \ Base of stolen memory +: usable-ramtop ( -- n ) h# b4 config-l@ ; \ Top of usable DRAM : release-range ( start-adr end-adr -- ) over - release ;

1 0

[commit] r2710 - cpu/x86/pc/alex cpu/x86/pc/newton cpu/x86/pc/olpc/via ofw/gui
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: wmb Date: Tue Nov 29 01:26:49 2011 New Revision: 2710 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2710 Log: Manufacturing test infrastructure - fixed a stack order bug in the automatic layout code. Modified: cpu/x86/pc/alex/testitems.fth cpu/x86/pc/newton/testitems.fth cpu/x86/pc/olpc/via/mfgtest.fth cpu/x86/pc/olpc/via/testitems.fth ofw/gui/iconmenu.fth Modified: cpu/x86/pc/alex/testitems.fth ============================================================================== --- cpu/x86/pc/alex/testitems.fth Tue Nov 29 01:26:41 2011 (r2709) +++ cpu/x86/pc/alex/testitems.fth Tue Nov 29 01:26:49 2011 (r2710) @@ -68,7 +68,7 @@ silent-probe-usb 0 to #mfgtests - 0 1 set-col-row + 1 0 set-row-col " CPU" ['] cpu-item cpu.icon add-icon Modified: cpu/x86/pc/newton/testitems.fth ============================================================================== --- cpu/x86/pc/newton/testitems.fth Tue Nov 29 01:26:41 2011 (r2709) +++ cpu/x86/pc/newton/testitems.fth Tue Nov 29 01:26:49 2011 (r2710) @@ -32,7 +32,6 @@ icon: cpu.icon rom:cpu.565 icon: spi.icon rom:spi.565 icon: ram.icon rom:ram.565 -icon: sdcard.icon rom:sdcard.565 icon: usb.icon rom:usb.565 icon: wifi.icon rom:wifi.565 icon: audio.icon rom:audio.565 @@ -62,7 +61,7 @@ silent-probe-usb 0 to #mfgtests - 0 1 set-col-row + 1 0 set-row-col " CPU" ['] cpu-item cpu.icon add-icon @@ -73,9 +72,6 @@ " RAM chips" ['] memory-item ram.icon add-icon - " Internal mass storage" - ['] int-sd-item sdcard.icon add-icon - " Timer" ['] timer-item timer.icon add-icon Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Tue Nov 29 01:26:41 2011 (r2709) +++ cpu/x86/pc/olpc/via/mfgtest.fth Tue Nov 29 01:26:49 2011 (r2710) @@ -102,7 +102,7 @@ 0 value cur-row : cur-col++ ( -- ) cur-col 1+ to cur-col ; : cur-row++ ( -- ) cur-row 1+ to cur-row ; -: set-col-row ( row col -- ) to cur-col to cur-row ; +: set-row-col ( row col -- ) to cur-col to cur-row ; : add-icon ( -- ) cur-col #mfgcols = if cur-row++ cur-row #mfgcols >= if abort" Too many icons" then Modified: cpu/x86/pc/olpc/via/testitems.fth ============================================================================== --- cpu/x86/pc/olpc/via/testitems.fth Tue Nov 29 01:26:41 2011 (r2709) +++ cpu/x86/pc/olpc/via/testitems.fth Tue Nov 29 01:26:49 2011 (r2710) @@ -40,7 +40,7 @@ : olpc-test-menu-items ( -- ) 0 to #mfgtests - 0 1 set-col-row + 1 0 set-row-col \ " CPU" \ ['] cpu-item cpu.icon add-icon Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Tue Nov 29 01:26:41 2011 (r2709) +++ ofw/gui/iconmenu.fth Tue Nov 29 01:26:49 2011 (r2710) @@ -118,7 +118,7 @@ : clear-sq ( sq - ) >r null$ ['] noop 0 r> set-sq ; headers -: clear-menu ( - ) squares 0 do i clear-sq loop ; +: clear-menu ( - ) squares 0 ?do i clear-sq loop ; headerless : active? ( sq - active? )

1 0

[commit] r2709 - cpu/arm/olpc/1.75 cpu/x86/pc/alex cpu/x86/pc/biosload cpu/x86/pc/newton cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/usb2/device/mouse
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: wmb Date: Tue Nov 29 01:26:41 2011 New Revision: 2709 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2709 Log: Added USB mouse class driver and included it in most active builds. Added: dev/usb2/device/mouse/ dev/usb2/device/mouse/mouse.fth dev/usb2/device/mouse/usbmouse.bth Modified: cpu/arm/olpc/1.75/olpc.bth cpu/x86/pc/alex/ofw.bth cpu/x86/pc/biosload/ofw.bth cpu/x86/pc/newton/ofw.bth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/olpc.bth cpu/x86/pc/olpc/via/olpc.bth Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/arm/olpc/1.75/olpc.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -11,6 +11,7 @@ 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/mouse/build/usbmouse.fc in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: testicons.bin @@ -80,7 +81,8 @@ " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-deflated-dropin " ${BP}/dev/usb2/device/generic/build/generic.fc" " usbdevice" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin Modified: cpu/x86/pc/alex/ofw.bth ============================================================================== --- cpu/x86/pc/alex/ofw.bth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/x86/pc/alex/ofw.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -13,6 +13,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc in: ${BP}/dev/usb2/device/webcam/build/webcam.fc in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/dev/ide/build/leghier.fc @@ -47,7 +48,8 @@ " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc" " class0c0300" $add-deflated-dropin " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin Modified: cpu/x86/pc/biosload/ofw.bth ============================================================================== --- cpu/x86/pc/biosload/ofw.bth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/x86/pc/biosload/ofw.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -14,6 +14,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc \ in: ${BP}/ofw/fs/nfs/build/nfs.di \ in: ${BP}/ofw/fs/cdfs/build/cdfs.di \ in: ${BP}/ofw/fs/fatfs/build/fatfs.di @@ -118,7 +119,8 @@ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin Modified: cpu/x86/pc/newton/ofw.bth ============================================================================== --- cpu/x86/pc/newton/ofw.bth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/x86/pc/newton/ofw.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -13,6 +13,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc in: ${BP}/dev/usb2/device/webcam/build/webcam.fc in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/dev/ide/build/leghier.fc @@ -48,7 +49,8 @@ " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc" " class0c0300" $add-deflated-dropin " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin Modified: cpu/x86/pc/olpc/loaddropins.fth ============================================================================== --- cpu/x86/pc/olpc/loaddropins.fth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/x86/pc/olpc/loaddropins.fth Tue Nov 29 01:26:41 2011 (r2709) @@ -9,7 +9,8 @@ " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin " ${BP}/dev/usb2/device/generic/build/generic.fc" " usbdevice" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin " ${BP}/dev/usb2/device/wlan/build/usb8388.fc" " usb1286,2001" $add-deflated-dropin Modified: cpu/x86/pc/olpc/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/olpc.bth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/x86/pc/olpc/olpc.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -19,6 +19,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc in: ${BP}/dev/usb2/device/wlan/build/usb8388.fc in: ${BP}/dev/olpc/cafenand/build/cafenand.fc in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc Modified: cpu/x86/pc/olpc/via/olpc.bth ============================================================================== --- cpu/x86/pc/olpc/via/olpc.bth Tue Nov 29 01:26:31 2011 (r2708) +++ cpu/x86/pc/olpc/via/olpc.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -20,6 +20,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/dev/usb2/device/mouse/build/usbmouse.fc in: ${BP}/clients/memtest86/memtest in: ${BP}/clients/emacs/x86/emacs in: ${BP}/cpu/x86/pc/olpc/via/build/verify.img @@ -88,7 +89,8 @@ " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin " ${BP}/dev/usb2/device/generic/build/generic.fc" " usbdevice" $add-deflated-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1,1" $add-deflated-dropin + " ${BP}/dev/usb2/device/mouse/build/usbmouse.fc" " usb,class3,1,2" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin \ " mrv8686.bin" " mrv8686.bin" $add-deflated-dropin Added: dev/usb2/device/mouse/mouse.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/mouse/mouse.fth Tue Nov 29 01:26:41 2011 (r2709) @@ -0,0 +1,113 @@ +purpose: USB HID mouse driver using the mouse boot protocol +\ See license at end of file + +hex +headers + +\ >dr-request constants specific to HID +h# 0b constant SET_PROTOCOL + +\ Report buffer +8 constant /report-buf +0 value report-buf + +: init-buf ( -- ) + report-buf 0= if + /report-buf dma-alloc + to report-buf + then +; +: free-buf ( -- ) + report-buf if + report-buf /report-buf dma-free + 0 to report-buf + then +; + +: set-boot-protocol ( -- error? ) + 0 0 my-address ( interface ) 0 DR_HIDD DR_OUT or SET_PROTOCOL + control-set +; + +\ Retrieve report data. + +: begin-scan ( -- ) + report-buf /report-buf intr-in-pipe intr-in-interval begin-intr-in +; +: end-scan ( -- ) end-intr-in ; + +: get-data? ( adr len -- actual ) + intr-in? if nip nip restart-intr-in exit then \ USB error; restart + ?dup if ( adr len actual ) + min tuck report-buf -rot move ( actual ) + restart-intr-in ( actual ) + else + 2drop 0 ( actual ) + then +; +: b>n ( b -- n ) dup h# 80 and if h# ff invert or then ; +8 buffer: pkt-buf +: stream-poll? ( -- false | x y buttons true ) + pkt-buf 8 get-data? 0= if false exit then + pkt-buf c@ h# 42 = if false exit then + pkt-buf 1+ c@ b>n ( x ) + pkt-buf 2+ c@ b>n negate ( x y ) + pkt-buf c@ 7 and ( x y buttons ) + true +; + +variable refcount 0 refcount ! +: +refcount ( n -- ) refcount +! ; + +\ report-buf must have been allocated +: setup-hardware? ( -- error? ) + set-device? if true exit then + device set-target + reset? if + configuration set-config if + ." Failed to set USB mouse configuration" cr + true exit + then + then + set-boot-protocol if ." Failed to set USB mouse boot protocol" cr then + false +; + +: open ( -- flag ) + refcount @ if 1 +refcount true exit then + init-buf + setup-hardware? if free-buf false exit then + begin-scan + 1 +refcount + true +; +: close ( -- ) + -1 +refcount refcount @ if exit then + free-buf +; + +init + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: dev/usb2/device/mouse/usbmouse.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/mouse/usbmouse.bth Tue Nov 29 01:26:41 2011 (r2709) @@ -0,0 +1,17 @@ +purpose: Load file for USB boot mouse driver + +command: &tokenize &this +build-now + +silent on + +begin-tokenizing usbmouse.fc + +FCode-version2 + +fload ${BP}/dev/usb2/device/common.fth \ USB device driver common routines +fload ${BP}/dev/usb2/device/mouse/mouse.fth \ HID requests + +end0 + +end-tokenizing

1 0

[commit] r2708 - cpu/x86/pc/newton
by repository service Nov. 28, 2011

Nov. 28, 2011

Author: wmb Date: Tue Nov 29 01:26:31 2011 New Revision: 2708 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2708 Log: Initial revision of Newton files Added: cpu/x86/pc/newton/devices.fth Added: cpu/x86/pc/newton/devices.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/newton/devices.fth Tue Nov 29 01:26:31 2011 (r2708) @@ -0,0 +1,237 @@ +\ See license at end of file +purpose: Load device drivers according to configuration definitions + +0 0 " " " /" begin-package + fload ${BP}/cpu/x86/pc/mappci.fth \ Map PCI to root + fload ${BP}/dev/pcibus.fth \ Generic PCI bus package + + 0 0 " addresses-preassigned" property +[then] + + fload ${BP}/cpu/x86/pc/newton/pcinode.fth \ System-specific words for PCI +end-package +stand-init: PCI host bridge + " /pci" " init" execute-device-method drop +; + +fload ${BP}/dev/pciprobe.fth \ Generic PCI probing + +\ Use the CPU chip's Time Stamp Counter for timing +fload ${BP}/cpu/x86/tsc.fth + +0 0 " " " /" begin-package + fload ${BP}/cpu/x86/pc/isabus.fth \ ISA Bus Bridge under root node +end-package + +dev /interrupt-controller +h# 20 to vector-base0 +h# 28 to vector-base1 +device-end + +fload ${BP}/dev/olpc/spiflash/flashif.fth \ Generic FLASH interface + +fload ${BP}/dev/olpc/spiflash/memflash.fth \ Memory-mapped FLASH read access + +warning @ warning off +: stand-init-io stand-init-io h# fff8.0000 to flash-base ; +warning ! + +fload ${BP}/ofw/fs/cbfs.fth \ Coreboot ROM filesystem + +\ Create the top-level device node to access the entire boot FLASH device +0 0 " ffa00000" " /" begin-package + " flash" device-name + + h# 10.0000 value /device + h# 10.0000 constant /device-phys + my-address my-space /device-phys reg + fload ${BP}/dev/flashpkg.fth + fload ${BP}/dev/flashwrite.fth +end-package + +\ XXX later +\ devalias cbfs /flash//cbfs-file-system + +0 [if] +\ This really should be a subrange of /flash +0 0 dropin-base <# u#s u#> " /" begin-package + " dropinram" device-name + + dropin-size + dup value /device + constant /device-phys + my-address my-space /device-phys reg + fload ${BP}/dev/flashpkg.fth +end-package + +devalias dropins /dropinram +[else] +patch /l /di-header first-header +patch /l /di-header first-header +\ devalias dropins cbfs:fallback\payload +devalias dropins /flash +[then] + +\ Create a pseudo-device that presents the dropin modules as a filesystem. +fload ${BP}/ofw/fs/dropinfs.fth + +\ This devalias lets us say, for example, "dir rom:" +devalias rom /dropin-fs + +fload ${BP}/cpu/x86/forthint.fth \ Low-level interrupt handling code +fload ${BP}/dev/isa/irq.fth \ ISA interrupt dispatcher +fload ${BP}/cpu/x86/pc/isatick.fth \ Use ISA timer as the alarm tick timer +fload ${BP}/cpu/x86/pc/olpc/timertest.fth \ Selftest for PIT timer + +fload ${BP}/dev/pci/isaall.fth +devalias mouse /usb/mouse + +fload ${BP}/cpu/x86/pc/tsccal1.fth + +fload ${BP}/dev/null2.fth + +[ifdef] serial-console +[ifdef] resident-packages +support-package: 16550 +fload ${BP}/dev/16550pkg/16550.fth \ Serial port support package +end-support-package +[then] + +0 0 hex mem-uart-base (u.) " /" begin-package + 4 encode-int 0 encode-int encode+ " interrupts" property + fload ${BP}/dev/16550pkg/ns16550p.fth + d# 64,000,000 " clock-frequency" integer-property + fload ${BP}/dev/16550pkg/isa-int.fth +end-package +devalias com1 /serial:115200 +: com1 ( -- adr len ) " com1" ; +' com1 to fallback-device +[else] +: devnull ( -- adr len ) " /null" ; +' devnull to fallback-device +[then] + +0 0 " i70" " /isa" begin-package \ Real-time clock node + fload ${BP}/dev/ds1385r.fth + 8 encode-int 0 encode-int encode+ " interrupts" property + 2 encode-int " device#" property +end-package +stand-init: RTC + " /rtc" open-dev clock-node ! +; + +fload ${BP}/cpu/x86/pc/cpunode.fth +fload ${BP}/cpu/x86/k6cputest.fth \ Burnin test for K6 CPU +dev /cpu 1 to default#passes dend + +fload ${BP}/ofw/core/countdwn.fth \ Startup countdown +fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching +fload ${BP}/forth/lib/tofile.fth \ to-file and append-to-file +\ XXX remove the OS file commands from tools.dic +fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc. + +[ifdef] use-ega +0 0 " " " /" begin-package + fload ${BP}/dev/egatext.fth +end-package +devalias screen /ega-text +[then] + +[ifdef] use-vesa +fload ${BP}/dev/video/controlr/vesa.fth +devalias screen /display \ Explicit, because it's not probed +[then] + +[ifdef] use-pineview +0 0 " 2,0" " /pci" begin-package + " display" name + fload ${BP}/dev/intel/graphics/pineview.fth + alias /scanline bytes/line + fload ${BP}/dev/video/common/rectangle16.fth + alias color! 4drop +end-package +devalias screen /pci/display@2,0 \ Explicit, because it's not probed +[then] + +\ Create the alias unless it already exists +: $?devalias ( alias$ value$ -- ) + 2over not-alias? if $devalias exit then ( alias$ value$ alias$ ) + 2drop 4drop +; + +: report-disk ( -- ) + " /pci-ide" locate-device 0= if + drop + " disk" " /pci-ide/ide@0/disk@0" $devalias + " c" " /pci-ide/ide@0/disk@0" $devalias + " d" " /pci-ide/ide@0/disk@1" $devalias + " e" " /pci-ide/ide@1/disk@0" $devalias + " f" " /pci-ide/ide@1/disk@1" $devalias + exit + then + " /ide" locate-device 0= if + drop + " disk" " /ide@1f0/disk@0" $devalias + " c" " /ide@1f0/disk@0" $devalias + " d" " /ide@170/disk@1" $devalias + " e" " /ide@1f0/disk@0" $devalias + " f" " /ide@170/disk@2" $devalias + exit + then +; + +fload ${BP}/cpu/x86/inoutstr.fth \ Multiple I/O port read/write + +[ifdef] serial-console +fload ${BP}/dev/isa/diaguart.fth \ ISA COM port driver +fload ${BP}/forth/lib/sysuart.fth \ Use UART for key and emit +[else] +fload ${BP}/dev/nulluart.fth \ Null UART driver +[then] +[ifdef] use-ega +fload ${BP}/cpu/x86/pc/egauart.fth \ Output also to EGA +[then] + +0 value keyboard-ih +0 value screen-ih + +fload ${BP}/ofw/core/muxdev.fth \ I/O collection/distribution device + +fload ${BP}/dev/olpc/spiflash/spiif.fth \ Generic low-level SPI bus access +fload ${BP}/dev/intel/spi.fth \ SPI FLASH programming + +\ XXX we probably need to use the port CF9 method +fload ${BP}/cpu/x86/pc/reset.fth \ reset-all + +\ fload ${BP}/dev/acpiec.fth \ Access to ACPI EC internal variables +\ fload ${BP}/cpu/x86/pc/newton/ec.fth \ Battery, AC, CPU temperature, Fan controls + +: ?enough-power ; \ Implement based on AC presence and battery status + +fload ${BP}/cpu/x86/pc/newton/spiui.fth \ User interface for SPI FLASH programming +: urom ( -- ) " flash! u:\stumpy.rom" evaluate ; +: netrom ( -- ) " flash! http:\\192.168.200.200\stumpy.rom" evaluate ; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0