openfirmware December 2011

openfirmware@openfirmware.info

1 participants
78 discussions

[commit] r2735 - cpu/arm/olpc/3.0
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:40 2011 New Revision: 2735 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2735 Log: OLPC XO-3 - Included EC image in dropins. Modified: cpu/arm/olpc/3.0/olpc.bth Modified: cpu/arm/olpc/3.0/olpc.bth ============================================================================== --- cpu/arm/olpc/3.0/olpc.bth Tue Dec 6 08:10:34 2011 (r2734) +++ cpu/arm/olpc/3.0/olpc.bth Tue Dec 6 08:10:40 2011 (r2735) @@ -152,7 +152,7 @@ " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin -\ " ec.img" " ecimage.bin" $add-deflated-dropin + " ec.img" " ecimage.bin" $add-deflated-dropin \ " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin \ " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin \ " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin

1 0

[commit] r2734 - in cpu/arm: mmp2 olpc/3.0
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:34 2011 New Revision: 2734 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2734 Log: OLPC XO-3 - USB SPH / ULPI PHY now working. Added: cpu/arm/mmp2/ulpiphy.fth Modified: cpu/arm/olpc/3.0/usb.fth Added: cpu/arm/mmp2/ulpiphy.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/ulpiphy.fth Tue Dec 6 08:10:34 2011 (r2734) @@ -0,0 +1,38 @@ +\ See license at end of file +purpose: Access to miscellaneous control/enable registers for the ULPI PHY portion of the USB SPH controller + +h# 3800 io2-va + constant usbsph-misc-va +: usbsph-misc@ ( -- n ) usbsph-misc-va 4 + l@ ; +: usbsph-misc! ( n -- ) usbsph-misc-va 4 + l! ; +: usbsph-int@ ( -- n ) usbsph-misc-va h# 28 + l@ ; +: usbsph-int! ( n -- ) usbsph-misc-va h# 28 + l! ; +: usbsph-ctrl@ ( -- n ) usbsph-misc-va h# 30 + l@ ; +: usbsph-ctrl! ( n -- ) usbsph-misc-va h# 30 + l! ; +: ulpi-on ( -- ) h# 0800.0000 usbsph-misc! ; +: ulpi-resume-interrupt-on ( -- ) 2 usbsph-int! ; +: ulpi-clock-on ( -- ) usbsph-ctrl@ 1 or usbsph-ctrl! ; +: ulpi-clock-select ( -- ) usbsph-ctrl@ h# 400 or usbsph-ctrl! ; + +\ 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 Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Tue Dec 6 08:10:23 2011 (r2733) +++ cpu/arm/olpc/3.0/usb.fth Tue Dec 6 08:10:34 2011 (r2734) @@ -20,7 +20,7 @@ : wake ( -- ) ; end-package -0 0 " f0001000" " /" begin-package \ USB Host Controller 1 - ULPI +0 0 " f0003000" " /" begin-package \ USB Host Controller 1 - ULPI h# 200 constant /regs my-address my-space /regs reg : my-map-in ( len -- adr ) @@ -44,6 +44,9 @@ ; : reset-usb-hub ( -- ) d# 146 gpio-clr d# 10 ms d# 146 gpio-set \ Resets ULPI hub + ulpi-clock-on + ulpi-clock-select + ulpi-on ; : init-usb ( -- )

1 0

[commit] r2733 - cpu/arm/olpc
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:23 2011 New Revision: 2733 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2733 Log: OLPC XO-3 - More of Added I/O mapping support for the fragment of I/O space that is discontinous with the rest of I/O space, for the benefit of the USB Single-Port Host controller which is in that other area. Modified: cpu/arm/olpc/addrs.fth Modified: cpu/arm/olpc/addrs.fth ============================================================================== --- cpu/arm/olpc/addrs.fth Tue Dec 6 08:10:17 2011 (r2732) +++ cpu/arm/olpc/addrs.fth Tue Dec 6 08:10:23 2011 (r2733) @@ -15,6 +15,7 @@ h# fdc0.0000 constant fb-mem-va h# fe00.0000 constant io-va \ We map IO (APB + AXI) space at this virtual address +h# fe30.0000 constant io2-va \ Mapping area for AXI2 space [ifdef] virtual-mode h# f700.0000 constant fw-virt-base

1 0

[commit] r2732 - in cpu/arm: mmp2 olpc
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:17 2011 New Revision: 2732 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2732 Log: OLPC XO-3 - Added I/O mapping support for the fragment of I/O space that is discontinous with the rest of I/O space, for the benefit of the USB Single-Port Host controller which is in that other area. Modified: cpu/arm/mmp2/hwaddrs.fth cpu/arm/mmp2/rootnode.fth cpu/arm/olpc/initmmu.fth Modified: cpu/arm/mmp2/hwaddrs.fth ============================================================================== --- cpu/arm/mmp2/hwaddrs.fth Tue Dec 6 08:10:06 2011 (r2731) +++ cpu/arm/mmp2/hwaddrs.fth Tue Dec 6 08:10:17 2011 (r2732) @@ -6,12 +6,17 @@ h# d400.0000 constant apb-pa \ Base of APB bus h# d420.0000 constant axi-pa \ Base of AXI bus +h# f000.0000 constant axi2-pa \ Another AXI bus area h# e000.0000 constant audio-sram-pa \ Base of Audio SRAM h# 0010.0000 constant /audio-sram \ Size of Audio SRAM apb-pa constant io-pa \ We use this as the base for most IO accesses -h# 0040.0000 constant /io +h# 0030.0000 constant /io + +axi2-pa constant io2-pa \ Additional I/O space +h# 0010.0000 constant /io2 + \ The following are offsets from io-pa \ AXI devices Modified: cpu/arm/mmp2/rootnode.fth ============================================================================== --- cpu/arm/mmp2/rootnode.fth Tue Dec 6 08:10:06 2011 (r2731) +++ cpu/arm/mmp2/rootnode.fth Tue Dec 6 08:10:17 2011 (r2732) @@ -25,10 +25,18 @@ : close ( -- ) ; : map-in ( phys size -- virt ) - drop ( phys ) + drop ( phys ) \ The display driver uses fb-mem-va directly instead of calling map-in \ dup fb-mem-va >physical = if drop fb-mem-va exit then ( phys ) - io-pa - io-va + + dup io2-pa u>= if ( phys ) + io2-pa - io2-va + ( virt ) + exit + then ( phys ) + dup io-pa u>= if ( phys ) + io-pa - io-va + ( virt ) + exit + then ( phys ) + \ Fall through to return virt == phys ; : map-out ( virtual size -- ) 2drop Modified: cpu/arm/olpc/initmmu.fth ============================================================================== --- cpu/arm/olpc/initmmu.fth Tue Dec 6 08:10:06 2011 (r2731) +++ cpu/arm/olpc/initmmu.fth Tue Dec 6 08:10:17 2011 (r2732) @@ -316,6 +316,12 @@ set r4,`io-va #` \ Virtual address bl `map-sections` + set r1,`io2-pa #` \ Address of I/O + set r2,`/io2 #` \ Size of I/O region + set r3,#0xc02 \ No caching or write buffering + set r4,`io2-va #` \ Virtual address + bl `map-sections` + mov pc, r10 end-code

1 0

[commit] r2731 - cpu/arm/marvell
by repository service 06 Dec '11

06 Dec '11

Author: wmb Date: Tue Dec 6 08:10:06 2011 New Revision: 2731 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2731 Log: Marvell UTMI-PHY driver - added access words for some currently-unused functions. Modified: cpu/arm/marvell/utmiphy.fth Modified: cpu/arm/marvell/utmiphy.fth ============================================================================== --- cpu/arm/marvell/utmiphy.fth Sat Dec 3 01:51:56 2011 (r2730) +++ cpu/arm/marvell/utmiphy.fth Tue Dec 6 08:10:06 2011 (r2731) @@ -8,7 +8,16 @@ h# 0c +utmi constant utmi-tx h# 10 +utmi constant utmi-rx h# 14 +utmi constant utmi-ivref -h# 18 +utmi constant utmi-t0 +h# 18 +utmi constant utmi-test0 +\ h# 1c +utmi constant utmi-test1 +\ h# 20 +utmi constant utmi-test2 +\ h# 24 +utmi constant utmi-id-grp +\ h# 28 +utmi constant utmi-usb-int +\ h# 2c +utmi constant utmi-dbg-ctl +h# 30 +utmi constant utmi-ctl1 +\ h# 34 +utmi constant utmi-test3 +\ h# 38 +utmi constant utmi-test4 +\ h# 3c +utmi constant utmi-test5 : wait-cal ( spins -- ) 0 do @@ -44,7 +53,7 @@ \ Linux code does this, perhaps redundantly h# 1800.0000 utmi-ctrl io-set \ INPKT_DELAY_SOF, PU_REF - h# 0000.8000 utmi-t0 io-clr \ REG_FIFO_SQ_RST + h# 0000.8000 utmi-test0 io-clr \ REG_FIFO_SQ_RST \ Configure the PLLs pll-clr utmi-pll io-clr \ PLLCALI12, PLLVDD18, PLLVDD12, KVCO, ICP, FBDIV, REFDIV, @@ -72,3 +81,5 @@ d# 1000 wait-cal \ ." UTMI calibration done" cr ; +: enable-ulpi-phy ( -- ) h# 100 utmi-ctl1 io-set ; +: select-ulpi-data ( -- ) h# 200 utmi-ctl1 io-set ;

1 0

[commit] r2730 - cpu/arm/olpc/3.0
by repository service 03 Dec '11

03 Dec '11

Author: wmb Date: Sat Dec 3 01:51:56 2011 New Revision: 2730 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2730 Log: OLPC XO-3 - changed cforth-version from "modify" back to HEAD Modified: cpu/arm/olpc/3.0/cforth-version.fth Modified: cpu/arm/olpc/3.0/cforth-version.fth ============================================================================== --- cpu/arm/olpc/3.0/cforth-version.fth Sat Dec 3 01:45:21 2011 (r2729) +++ cpu/arm/olpc/3.0/cforth-version.fth Sat Dec 3 01:51:56 2011 (r2730) @@ -3,7 +3,7 @@ \ If CFORTH_VERSION is "modify", the repository will be cloned with git+ssh: so can push changes. \ You need ssh access to the server. -macro: CFORTH_VERSION modify +\ macro: CFORTH_VERSION modify \ If CFORTH_VERSION is "clone", the repository will be cloned with git:. You won't be able to \ push changes, but you will get the full metadata so you can use commands like git grep. @@ -12,6 +12,6 @@ \ Otherwise, the source code will be will be downloaded as a tarball via gitweb. \ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6 -\ macro: CFORTH_VERSION HEAD +macro: CFORTH_VERSION HEAD macro: CFORTH_BUILD_DIR cforth/build/arm-xo-3.0

1 0

[commit] r2729 - in cpu/arm/olpc: . 1.75 3.0
by repository service 03 Dec '11

03 Dec '11

Author: wmb Date: Sat Dec 3 01:45:21 2011 New Revision: 2729 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2729 Log: OLPC XO-3 - Fixed LCD and USB drivers, moved testitems.fth up to olpc/ Added: cpu/arm/olpc/testitems.fth - copied, changed from r2728, cpu/arm/olpc/1.75/testitems.fth Deleted: cpu/arm/olpc/1.75/testitems.fth cpu/arm/olpc/3.0/sdhci.fth cpu/arm/olpc/3.0/testitems.fth Modified: cpu/arm/olpc/3.0/lcdcfg.fth cpu/arm/olpc/3.0/olpc.bth cpu/arm/olpc/3.0/testinstructions.fth cpu/arm/olpc/3.0/usb.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/3.0/lcdcfg.fth ============================================================================== --- cpu/arm/olpc/3.0/lcdcfg.fth Sat Dec 3 01:45:15 2011 (r2728) +++ cpu/arm/olpc/3.0/lcdcfg.fth Sat Dec 3 01:45:21 2011 (r2729) @@ -2,13 +2,15 @@ h# 00000700 value pmua-disp-clk-sel \ PLL1 / 7 -> 113.86 MHz d# 8 value hsync \ Sync width -d# 1200 value hdisp \ Display width -d# 1256 value htotal \ Display + FP + Sync + BP +d# 1024 value hdisp \ Display width +d# 1344 value htotal \ Display + FP + Sync + BP +\ d# 1200 value hdisp \ Display width +\ d# 1256 value htotal \ Display + FP + Sync + BP d# 24 value hbp \ Back porch d# 3 value vsync \ Sync width -d# 900 value vdisp \ Display width -d# 912 value vtotal \ Display + FP + Sync + BP +d# 768 value vdisp \ Display width +d# 806 value vtotal \ Display + FP + Sync + BP d# 5 value vbp \ Back porch : hfp ( -- n ) htotal hdisp - hsync - hbp - ; \ 24 Modified: cpu/arm/olpc/3.0/olpc.bth ============================================================================== --- cpu/arm/olpc/3.0/olpc.bth Sat Dec 3 01:45:15 2011 (r2728) +++ cpu/arm/olpc/3.0/olpc.bth Sat Dec 3 01:45:21 2011 (r2729) @@ -152,10 +152,10 @@ " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin - " ec.img" " ecimage.bin" $add-deflated-dropin - " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin - " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin - " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin +\ " ec.img" " ecimage.bin" $add-deflated-dropin +\ " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin +\ " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin +\ " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin .( Dropin top is ) ofd @ fsize .x cr @@ -216,4 +216,3 @@ \ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ \ LICENSE_END - Modified: cpu/arm/olpc/3.0/testinstructions.fth ============================================================================== --- cpu/arm/olpc/3.0/testinstructions.fth Sat Dec 3 01:45:15 2011 (r2728) +++ cpu/arm/olpc/3.0/testinstructions.fth Sat Dec 3 01:45:21 2011 (r2729) @@ -1,3 +1,4 @@ +.( *** testinstructions.fth needs to be fixed for XO-3) cr \ See license at end of file purpose: Drawings of OLPC XO-1.75 board and components for test instructions Modified: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- cpu/arm/olpc/3.0/usb.fth Sat Dec 3 01:45:15 2011 (r2728) +++ cpu/arm/olpc/3.0/usb.fth Sat Dec 3 01:45:21 2011 (r2729) @@ -1,7 +1,7 @@ purpose: Platform-specific USB elaborations \ See license at end of file -0 0 " d4208000" " /" begin-package \ USB Host Controller +0 0 " d4208000" " /" begin-package \ USB OTG Host Controller h# 200 constant /regs my-address my-space /regs reg : my-map-in ( len -- adr ) @@ -16,19 +16,35 @@ : otg-set-host-mode 3 h# a8 ehci-reg! ; \ Force host mode ' otg-set-host-mode to set-host-mode - \ Port 1 on the hub is connected to unused pins on the WLAN connector, - \ so testing it is confusing - \ Port 2 is right upper - \ Port 3 is left - \ Port 4 is right lower - " 3,4,2" " usb-hub-test-list" string-property + : sleep ( -- ) true to first-open? ; + : wake ( -- ) ; +end-package + +0 0 " f0001000" " /" begin-package \ USB Host Controller 1 - ULPI + h# 200 constant /regs + my-address my-space /regs reg + : my-map-in ( len -- adr ) + my-space swap " map-in" $call-parent h# 100 + ( adr ) + ; + : my-map-out ( adr len -- ) swap h# 100 - swap " map-out" $call-parent ; + false constant has-dbgp-regs? + false constant needs-dummy-qh? + : grab-controller ( config-adr -- error? ) drop false ; + fload ${BP}/dev/usb2/hcd/ehci/loadpkg.fth +\ false to delay? \ No need for a polling delay on this platform + : sleep ( -- ) true to first-open? ; : wake ( -- ) ; end-package \ 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-clr d# 10 ms d# 146 gpio-set ; +: usb-power-on ( -- ) + d# 126 gpio-clr \ OTG 5V on + d# 127 gpio-clr \ ULPI 5V on +; +: reset-usb-hub ( -- ) + d# 146 gpio-clr d# 10 ms d# 146 gpio-set \ Resets ULPI hub +; : init-usb ( -- ) h# 9 h# 5c pmua! \ Enable clock to USB block Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Sat Dec 3 01:45:15 2011 (r2728) +++ cpu/arm/olpc/build-fw.fth Sat Dec 3 01:45:21 2011 (r2729) @@ -536,8 +536,7 @@ \ so exiting from emacs doesn't invoke the diag menu. ' quit to user-interface fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth -\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/testitems.fth -\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/testitems.fth +fload ${BP}/cpu/arm/olpc/testitems.fth [ifdef] notyet fload ${BP}/cpu/x86/pc/olpc/via/bootmenu.fth Copied and modified: cpu/arm/olpc/testitems.fth (from r2728, cpu/arm/olpc/1.75/testitems.fth) ============================================================================== --- cpu/arm/olpc/1.75/testitems.fth Sat Dec 3 01:45:15 2011 (r2728, copy source) +++ cpu/arm/olpc/testitems.fth Sat Dec 3 01:45:21 2011 (r2729) @@ -7,9 +7,9 @@ icon: camera.icon rom:camera.565 icon: wifi.icon rom:wifi.565 icon: audio.icon rom:audio.565 -icon: touchpad.icon rom:touchpad.565 +\- olpc-cl3 icon: touchpad.icon rom:touchpad.565 icon: display.icon rom:display.565 -icon: keyboard.icon rom:keyboard.565 +\- olpc-cl3 icon: keyboard.icon rom:keyboard.565 icon: timer.icon rom:timer.565 icon: clock.icon rom:clock.565 icon: ebook.icon rom:ebook.565 @@ -25,15 +25,15 @@ : memory-item ( -- ) " /memory" mfg-test-dev ; : usb-item ( -- ) " /usb/hub" mfg-test-dev ; : int-sd-item ( -- ) " int:0" mfg-test-dev ; -: ext-sd-item ( -- ) " ext:0" mfg-test-dev ; +\- olpc-cl3 : ext-sd-item ( -- ) " ext:0" mfg-test-dev ; : rtc-item ( -- ) " /rtc" mfg-test-dev ; : display-item ( -- ) " /display" mfg-test-dev ; : audio-item ( -- ) " /audio" mfg-test-dev ; : camera-item ( -- ) " /camera" mfg-test-dev ; : wlan-item ( -- ) " /wlan" mfg-test-dev ; : timer-item ( -- ) " /timer" mfg-test-dev ; -: touchpad-item ( -- ) " mouse" mfg-test-dev ; -: keyboard-item ( -- ) " keyboard" mfg-test-dev ; +\- olpc-cl3 : touchpad-item ( -- ) " mouse" mfg-test-dev ; +\- olpc-cl3 : keyboard-item ( -- ) " keyboard" mfg-test-dev ; : switch-item ( -- ) " /accelerometer" mfg-test-dev " /switches" mfg-test-dev ; : leds-item ( -- ) " /leds" mfg-test-dev ; @@ -52,8 +52,8 @@ " Internal mass storage" ['] int-sd-item sdcard.icon 1 2 install-icon - " Plug-in SD card" - ['] ext-sd-item sdcard.icon 1 3 install-icon +\- olpc-cl3 " Plug-in SD card" +\- olpc-cl3 ['] ext-sd-item sdcard.icon 1 3 install-icon " Wireless LAN" ['] wlan-item wifi.icon 1 4 install-icon @@ -79,11 +79,11 @@ \ These are last because they require user participation. \ The earlier tests are all included in automatic batch-mode. - " Keyboard" - ['] keyboard-item keyboard.icon 3 1 install-icon +\- olpc-cl3 " Keyboard" +\- olpc-cl3 ['] keyboard-item keyboard.icon 3 1 install-icon - " Touchpad" - ['] touchpad-item touchpad.icon 3 2 install-icon +\- olpc-cl3 " Touchpad" +\- olpc-cl3 ['] touchpad-item touchpad.icon 3 2 install-icon " LEDs" ['] leds-item leds.icon 3 3 install-icon

1 0

[commit] r2728 - cpu/arm/olpc
by repository service 03 Dec '11

03 Dec '11

Author: wmb Date: Sat Dec 3 01:45:15 2011 New Revision: 2728 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2728 Log: .gitignore Added: cpu/arm/olpc/.gitignore Added: cpu/arm/olpc/.gitignore ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/.gitignore Sat Dec 3 01:45:15 2011 (r2728) @@ -0,0 +1,6 @@ +armforth +build +cforth +multicast-nand +sourceurl +testicons

1 0

[commit] r2727 - in cpu/arm/olpc/3.0: . build
by repository service 03 Dec '11

03 Dec '11

Author: wmb Date: Sat Dec 3 01:45:08 2011 New Revision: 2727 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2727 Log: OLPC XO-3 - Initial revisions of files to support the new platform Added: cpu/arm/olpc/3.0/ cpu/arm/olpc/3.0/build/ cpu/arm/olpc/3.0/build/Makefile cpu/arm/olpc/3.0/cforth-version.fth cpu/arm/olpc/3.0/cforth.bth cpu/arm/olpc/3.0/config.fth cpu/arm/olpc/3.0/crypto-version.fth cpu/arm/olpc/3.0/ec-version.fth cpu/arm/olpc/3.0/ec.bth cpu/arm/olpc/3.0/fw-version.fth cpu/arm/olpc/3.0/fw.bth cpu/arm/olpc/3.0/lcdcfg.fth cpu/arm/olpc/3.0/leds.fth cpu/arm/olpc/3.0/mcastnand.bth cpu/arm/olpc/3.0/mcnand-version.fth cpu/arm/olpc/3.0/olpc.bth cpu/arm/olpc/3.0/prefw.bth cpu/arm/olpc/3.0/sd8686.bth cpu/arm/olpc/3.0/sdhci.fth cpu/arm/olpc/3.0/switches.fth cpu/arm/olpc/3.0/testinstructions.fth cpu/arm/olpc/3.0/testitems.fth cpu/arm/olpc/3.0/usb.fth cpu/arm/olpc/3.0/verify.bth cpu/arm/olpc/3.0/wlan-version.fth Added: cpu/arm/olpc/3.0/build/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/build/Makefile Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,70 @@ +ROMNAME=olpc + +BASEDIR= `(cd ../../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + +TAGFILES= ../../../build/*.tag *.tag +CLIENTDIR=../../../../../clients +CLIENTPROGS=${CLIENTDIR}/emacs/arm/emacs + +all: ${ROMNAME}.rom tags + +${ROMNAME}.tag: ${ROMNAME}.rom + +tags: ${ROMNAME}.tag + @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} + +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ${HOSTDIR}/armforth + ./build $@ + +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth + +${HOSTDIR}/armforth: + @make -C ${HOSTDIR} armforth + +../../build/inflate.bin: + @make -C ../../build inflate.bin + +${CLIENTDIR}/emacs/arm/emacs: + @make -C ${CLIENTDIR}/emacs/arm emacs + +build: + @ln -sf ${BUILDSH} build + +clean: + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag + +clean-all: clean + @make -C ../../build clean + @make -C ${HOSTDIR} clean + +.PHONY: FORCE clean all clean-all + +# LICENSE_BEGIN +# Copyright (c) 2009 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: cpu/arm/olpc/3.0/cforth-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/cforth-version.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,17 @@ +\ This file controls which CForth source version to include in the OFW build +\ and the method for fetching it + +\ If CFORTH_VERSION is "modify", the repository will be cloned with git+ssh: so can push changes. +\ You need ssh access to the server. +macro: CFORTH_VERSION modify + +\ If CFORTH_VERSION is "clone", the repository will be cloned with git:. You won't be able to +\ push changes, but you will get the full metadata so you can use commands like git grep. +\ You don't need ssh access to the server. +\ macro: CFORTH_VERSION clone + +\ Otherwise, the source code will be will be downloaded as a tarball via gitweb. +\ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6 +\ macro: CFORTH_VERSION HEAD + +macro: CFORTH_BUILD_DIR cforth/build/arm-xo-3.0 Added: cpu/arm/olpc/3.0/cforth.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/cforth.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,7 @@ +purpose: Fetch and compile CForth for the Security Processor + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/3.0/cforth-version.fth +fload ${BP}/cpu/arm/olpc/build-cforth.fth Added: cpu/arm/olpc/3.0/config.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/config.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,11 @@ +create debug-startup +create olpc +create trust-ec-keyboard +create use-null-nvram +create use-elf +create olpc-cl3 + +fload ${BP}/cpu/arm/mmp2/hwaddrs.fth +fload ${BP}/cpu/arm/olpc/addrs.fth + +create machine-signature ," CL3" Added: cpu/arm/olpc/3.0/crypto-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/crypto-version.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,6 @@ +\ The public keys +macro: KEYS mpkeys +\ macro: KEYS testkeys + +\ The bios_verify image +macro: CRYPTO_VERSION 0.5-ARM Added: cpu/arm/olpc/3.0/ec-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/ec-version.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,10 @@ +\ The EC microcode +\ macro: EC_PLATFORM cl3 +macro: EC_PLATFORM cl2 +macro: EC_VERSION 4_0_3_05 + +\ Alternate command for getting EC microcode, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img +\ macro: GET_EC cp no_event.bin ec.img Added: cpu/arm/olpc/3.0/ec.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/ec.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,7 @@ +purpose: Fetch the EC (Embedded Controller, i.e. KB3700) microcode + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/3.0/ec-version.fth +fload ${BP}/cpu/arm/olpc/fetch-ec.fth Added: cpu/arm/olpc/3.0/fw-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/fw-version.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,4 @@ +\ The overall firmware revision +macro: FW_PREFIX Q5 +macro: FW_MAJOR A +macro: FW_MINOR 00 Added: cpu/arm/olpc/3.0/fw.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/fw.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,10 @@ +purpose: Build OFW Forth dictionary for OLPC ARM platforms +\ See license at end of file + +dictionary: ${BP}/cpu/arm/olpc/3.0/build/prefw.dic +command: &armforth &dictionary &this +build-now + +" fw.tag" r/w create-file drop tag-file ! + +fload ${BP}/cpu/arm/olpc/build-fw.fth Added: cpu/arm/olpc/3.0/lcdcfg.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/lcdcfg.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,38 @@ +h# 40001102 value clkdiv \ Display Clock 1 / 2 -> 56.93 MHz +h# 00000700 value pmua-disp-clk-sel \ PLL1 / 7 -> 113.86 MHz + +d# 8 value hsync \ Sync width +d# 1200 value hdisp \ Display width +d# 1256 value htotal \ Display + FP + Sync + BP +d# 24 value hbp \ Back porch + +d# 3 value vsync \ Sync width +d# 900 value vdisp \ Display width +d# 912 value vtotal \ Display + FP + Sync + BP +d# 5 value vbp \ Back porch + +: hfp ( -- n ) htotal hdisp - hsync - hbp - ; \ 24 +: vfp ( -- n ) vtotal vdisp - vsync - vbp - ; \ 4 + +0 [if] +3 constant #lanes +3 constant bytes/pixel +d# 24 constant bpp +[else] +2 constant #lanes +2 constant bytes/pixel +d# 16 constant bpp +[then] + +: >bytes ( pixels -- chunks ) bytes/pixel * ; +: >chunks ( pixels -- chunks ) >bytes #lanes / ; + +alias width hdisp +alias height vdisp +alias depth bpp +width >bytes constant /scanline + +: init-xo-display ; +: bright! ( level -- ) drop ; +: backlight-on ( -- ) ; +: backlight-off ( -- ) ; Added: cpu/arm/olpc/3.0/leds.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/leds.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,48 @@ +\ See license at end of file +purpose: Driver/selftest for OLPC XO-1.75 LEDs + +0 0 " 0" " /" begin-package +0 0 reg \ So test-all will run the test +" leds" device-name +: open ( -- okay? ) true ; +: close ( -- ) ; + +: selftest ( -- ) + ." Flashing LEDs" cr + + d# 10 0 do ols-led-on d# 200 ms ols-led-off d# 200 ms loop + ols-led-ec-control + ols-assy-mode-on + + " /wlan:quiet" test-dev " /wlan:quiet" test-dev \ Twice for longer flashing + + ols-assy-mode-off + + confirm-selftest? +; + +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 Added: cpu/arm/olpc/3.0/mcastnand.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/mcastnand.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,7 @@ +purpose: Fetch and compile the multicast NAND reflash program + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/3.0/mcnand-version.fth +fload ${BP}/cpu/arm/olpc/build-mcnand.fth Added: cpu/arm/olpc/3.0/mcnand-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/mcnand-version.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,8 @@ +\ The multicast NAND updater code version +\ Use a specific git commit ID for a formal release or "test" for development. +\ With a specific ID, mcastnand.bth will download a tarball without .git stuff. +\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ +\ is not already present, then you can modify the git subtree as needed. +macro: MCNAND_VERSION 60b7230fcfb4abd42c3274475b5447e0bc344a5b +\ macro: MCNAND_VERSION test +\ macro: MCNAND_VERSION HEAD Added: cpu/arm/olpc/3.0/olpc.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/olpc.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,219 @@ +purpose: Construct the Open Firmware module collection + +command: &builder &this +in: ec.img +in: fw.img +in: resetvec.img +in: mcastnand.bin +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/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 +in: ${BP}/clients/emacs/arm/emacs +in: cforth.img +build-now + +fload ${BP}/cpu/arm/olpc/3.0/fw-version.fth + +" macro: FW_VERSION Q5${FW_MAJOR}${FW_MINOR}" expand$ eval + +fload ${BP}/cpu/arm/olpc/3.0/config.fth + +\ Always re-create the builton.fth file when we make a new rom.img +fload ${BP}/cpu/x86/pc/builton.bth +fload ${BP}/cpu/arm/olpc/sourceurl.fth + +fload ${BP}/forth/lib/crc32.fth + +hex + +: pad-file ( location -- ) + ofd @ fsize + 2dup u< abort" The ROM image is too large" + ?do h# ff ofd @ fputc loop +; + +fload ${BP}/cpu/arm/marvell/tim.fth + +\ Marvel Trusted Image Module image creation script for +\ XO-3.0 platform. + +tim: 00030102 0 Sky! PXA688 +flash: SPI'10 +timh: TIMH 0 d101f000 +\ Main Processor code loaded into DRAM +image: OBMI 800 d101c000 ${BP}/cpu/arm/olpc/dummy.img +\ Secure Processor code loaded into SRAM +image: WTMI 1000 d1018000 shim.img +image: CFTH 2000 d1000000 cforth.img +reserved: + term: +end-reserved +end-tim + +h# e.0000 to reserved-start +h# f.0000 to reserved-end + +.( --- Saving as ) +" ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) +2dup type cr ( adr len ) +$new-file + tim$ ofd @ fputs + + dropin-offset pad-file + +\ Loads the set of drivers that is common to different output formats + + " ${BP}/cpu/arm/build/inflate.bin" " inflate" $add-dropin + " fw.img" " firmware" $add-deflated-dropin +\ " fw.img" " firmware" $add-dropin + " resetvec.img" " reset" $add-dropin + +\ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin + " ${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,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 + + " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin + " sd8686.bin" " sd8686.bin" $add-deflated-dropin + + " builton.fth" " probe-" $add-dropin + +0 [if] + " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin +[then] + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + +\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin + + " 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 + + " sourceurl" " sourceurl" $add-dropin + + " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin + + \ icons for mfg test gui + " testicons/play.565" " play.565" $add-deflated-dropin + " testicons/quit.565" " quit.565" $add-deflated-dropin + " testicons/cpu.565" " cpu.565" $add-deflated-dropin + " testicons/spi.565" " spi.565" $add-deflated-dropin + " testicons/ram.565" " ram.565" $add-deflated-dropin + " testicons/sdcard.565" " sdcard.565" $add-deflated-dropin + " testicons/keyboard.565" " keyboard.565" $add-deflated-dropin + " testicons/display.565" " display.565" $add-deflated-dropin + " testicons/touchpad.565" " touchpad.565" $add-deflated-dropin + " testicons/audio.565" " audio.565" $add-deflated-dropin + " testicons/usb.565" " usb.565" $add-deflated-dropin + " testicons/battery.565" " battery.565" $add-deflated-dropin + " testicons/camera.565" " camera.565" $add-deflated-dropin + " testicons/wifi.565" " wifi.565" $add-deflated-dropin + " testicons/clock.565" " clock.565" $add-deflated-dropin + " testicons/timer.565" " timer.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigx.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/bigcheck.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file + + " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + " ec.img" " ecimage.bin" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin + " ${BP}/clients/emacs/arm/emacs" " emacs" $add-deflated-dropin + +.( Dropin top is ) ofd @ fsize .x cr + +/rom pad-file + +\ Insert the revision signature +/rom h# 40 - ofd @ fseek +h# 10 buffer: signature +signature h# 10 blank +machine-signature count signature swap move +" ${FW_VERSION}" expand$ signature 6 + swap move +" ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move +signature h# 10 ofd @ fputs + +/l buffer: crcbuf +/rom buffer: filebuf + +\ Read the entire image, compute the CRC, and store it h# 28 from the end +0 ofd @ fseek +filebuf /rom ofd @ fgets /rom <> abort" Can't read back image" +0 crctab filebuf /rom ($crc) crcbuf ! + +crc-offset ofd @ fseek +crcbuf /l ofd @ fputs + +ofd @ fclose + +\ Creating olpc.version serves two purposes: +\ a) It reports the firmware revision for use by external scripts +\ b) It provides an olpc.* artifact for the builder dependency management. + +writing olpc.version +" ${FW_VERSION}" expand$ 2dup lower ofd @ fputs +ofd @ fclose + + + +\ 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: cpu/arm/olpc/3.0/prefw.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/prefw.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,13 @@ +purpose: Build OFW Forth dictionary for OLPC XO-1.75 +\ See license at end of file + +dictionary: ${BP}/cpu/arm/build/basefw.dic +command: &armforth &dictionary &this +build-now + +\ This line must be in this file instead of in prefw.fth so the definitions +\ in config.fth will be tagged. +" prefw.tag" r/w create-file drop tag-file ! + +fload ${BP}/cpu/arm/olpc/3.0/config.fth +fload ${BP}/cpu/arm/olpc/prefw.fth Added: cpu/arm/olpc/3.0/sd8686.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/sd8686.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,8 @@ +purpose: Fetch the firmware for the Marvell 8686 wireless LAN module + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/3.0/wlan-version.fth + +fload ${BP}/cpu/arm/olpc/build-wlan.fth Added: cpu/arm/olpc/3.0/sdhci.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/sdhci.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,44 @@ +purpose: Load file for SDHCI (Secure Digital Host Controller Interface) + +0 0 " d4280000" " /" begin-package + + fload ${BP}/cpu/arm/olpc/sdregs.fth + fload ${BP}/dev/mmc/sdhci/sdhci.fth + + d# 1 to power-off-time \ A2 and A3 have turn-off clamps +\ true to avoid-high-speed? + + hex + : olpc-card-inserted? ( -- flag ) + slot 1 = if d# 31 gpio-pin@ 0= else true then + ; + ' olpc-card-inserted? to card-inserted? + + \ Slot:power_GPIO - 1:35, 2:34, 3:33 + : gpio-power-on ( -- ) sdhci-card-power-on d# 36 slot - gpio-set ; + ' gpio-power-on to card-power-on + + : gpio-power-off ( -- ) d# 36 slot - gpio-clr sdhci-card-power-off ; + ' gpio-power-off to card-power-off + + new-device + 2 encode-int " reg" property + fload ${BP}/dev/mmc/sdhci/mv8686/loadpkg.fth + finish-device + + new-device + 3 encode-int " reg" property + fload ${BP}/dev/mmc/sdhci/sdmmc.fth + fload ${BP}/dev/mmc/sdhci/selftest.fth + " internal" " slot-name" string-property + finish-device + +end-package + +stand-init: SDHC clocks + h# 41b h# 282854 io! \ SD0 (external SD) clocks, plus set master clock divisor + h# 1b h# 282858 io! \ SD1 (WLAN) clocks + h# 1b h# 2828e8 io! \ SD2 (internal microSD) clocks + h# 70a h# 200104 io! \ Clock gating + h# 70a h# 201104 io! \ Clock gating +; Added: cpu/arm/olpc/3.0/switches.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/switches.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,34 @@ +\ See license at end of file +purpose: Driver/selftest for OLPC lid and ebook switches + +0 0 " 0" " /" begin-package +" switches" device-name +0 0 reg \ So test-all will run the test +: open ( -- okay? ) true ; +: close ( -- ) ; +: selftest ( -- error? ) false ; +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 Added: cpu/arm/olpc/3.0/testinstructions.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/testinstructions.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,553 @@ +\ See license at end of file +purpose: Drawings of OLPC XO-1.75 board and components for test instructions + +support-package: test-instructions + +decimal + +\ Common items + +\ FIXME: these might be shared between XO-1.5 and XO-1.75 + +: headphones-logo + 24 5 rmove -6 0 -10 6 -10 13 rcurve + 10 -13 rmove 6 0 10 6 10 13 rcurve + -16 4 rmove -2 0 -3 -1 -3 -2 rcurve 0 -3 1 -3 3 -3 rcurve 0 5 rline + 12 -5 rmove 2 0 3 0 3 2 rcurve 0 3 -1 3 -3 3 rcurve 0 -5 rline +; + +: led-symbol ( x y -- ) + moveto 5 5 rline 5 -5 rline -5 -5 rline -5 5 rline +; +: usb-logo + 14 11 rmove + 1 1 1 3 0 4 rcurve + -1 1 -2 1 -3 0 rcurve + -1 -1 -1 -3 0 -4 rcurve + 1 -1 2 -1 3 0 rcurve + + 10 -4 rmove + 1 -1 1 -2 0 -2 rcurve + 0 -1 -1 -1 -1 0 rcurve + 0 0 0 1 0 2 rcurve + 0 0 1 0 1 0 rcurve + + -12 6 rmove 18 0 rline + 5 0 rmove -5 -2 rline 0 4 rline 5 -2 rline + -7 6 rmove 2 0 rline 0 3 rline -2 0 rline 0 -3 rline + -11 -6 rmove + 1 -2 2 -5 3 -6 rcurve + 1 -2 2 -1 3 -1 rcurve + + -2 7 rmove + 2 2 2 5 4 7 rcurve + 1 1 3 0 5 0 rcurve +; +: mic-logo + -4 0 -6 -3 -6 -5 rcurve + 6 5 rmove 3 0 6 -3 6 -5 rcurve + -4 -8 rmove + 0 8 rline 0 1 -1 2 -2 2 rcurve -1 0 -2 -1 -2 -2 rcurve + 0 -8 rline 0 -1 1 -2 2 -2 rcurve 1 0 2 1 2 2 rcurve + -2 13 rmove 0 3 rline 3 0 rmove -7 0 rline +; + +\ Board bottom items + +: rantenna ( -- ) + -5 -5 rmove 10 10 rbox 5 5 rmove rpoint 5 rcircle +; +: wlan-card + 122 6 75 74 boxat + 10 9 rmove rantenna + 55 0 rmove rantenna +; + +: board-outline + ( lower left corner ) 2 370 moveto + ( left side cutout ) 0 -117 rline 9 0 rline + 0 -17 rline -5 0 rline + ( upper left corner ) 0 -199 rline + ( wireless cutout ) 54 0 rline 0 -37 rline 54 0 rline + 0 96 rline 91 0 rline 0 -96 rline + 319 0 rline 0 37 rline + ( upper right corner ) 56 0 rline + ( right side cutout ) 0 127 rline -11 0 rline 0 43 rline + 7 0 rline 0 35 rline -7 0 rline + 0 17 rline 11 0 rline + ( lower right corner ) 0 111 rline + ( lower cutout ) -85 0 rline 0 -4 rline -49 0 rline + 0 -13 rline -23 0 rline 0 -17 rline + -27 0 rline 0 -105 rline -213 0 rline + 0 102 rline -28 0 rline 0 16 rline + -23 0 rline 0 17 rline -37 0 rline + 0 4 rline + ( lower left corner ) -93 0 rline +; + +: mic-conn + 535 52 45 28 boxat + 24 20 rmove mic-logo + 580 58 8 16 boxat +; +: headphone-conn + 535 90 45 28 boxat + headphones-logo + 580 96 8 16 boxat +; +: ac-conn 553 306 36 27 boxat ; +: ext-sd-slot 2 280 81 90 boxat ; +: kbd-conn 165 300 12 23 boxat ; + +: ext-sd-card + 9 293 moveto + 9 379 lineto 76 379 lineto 76 304 lineto 65 293 lineto 9 293 lineto +; + +: usb0-conn + 537 126 45 27 boxat + usb-logo +; +: usb1-conn + 0 54 45 27 boxat + usb-logo +; +: usb2-conn + 0 99 45 45 boxat + 0 9 rmove usb-logo +; +: battery-conn + 435 321 25 20 boxat + 435 299 10 12 boxat +; + +: led0 103 356 led-symbol ; +: led1 119 356 led-symbol ; +: led2 454 356 led-symbol ; +: led3 474 356 led-symbol ; +: cmos-battery-conn + 259 47 12 18 boxat + 261 43 8 4 boxat + 261 65 8 4 boxat +; + +\ FIXME: find out where this is to go for A2 +: cmos-battery + 262 60 22 circleat + \ Wires + 243 71 moveto + 238 75 228 81 229 86 curveto + 229 90 242 99 249 100 curveto + 255 100 262 89 269 89 curveto + 275 89 280 100 286 100 curveto + 292 100 297 93 303 90 curveto + 247 76 moveto + 241 81 231 89 229 93 curveto + 226 96 230 99 234 99 curveto + 237 99 244 90 250 91 curveto + 255 91 261 101 268 101 curveto + 274 100 280 90 286 90 curveto + 292 90 298 96 304 99 curveto +; + +: rspkr-conn + 20 153 18 16 boxat + 16 157 4 8 boxat + 38 157 4 8 boxat +; +: lspkr-conn + 544 170 18 16 boxat + 540 174 4 8 boxat + 562 174 4 8 boxat +; + +: wlan-conn 109 75 101 28 boxat ; + +: serial-conn + 71 46 18 27 boxat + 75 42 8 4 boxat + 75 73 8 4 boxat + + 519 154 22 12 boxat + +; + +: int-sd-slot 115 143 32 37 boxat ; + +: int-sd-card + 101 146 moveto 43 0 rline 0 27 rline -13 0 rline -5 4 rline + -5 0 rline 0 -4 rline -4 0 rline -2 4 rline -15 0 rline 0 -31 rline +; + +: basic-layout ( -- ) + clear-drawing + d# 10 d# 20 offsetat + double-drawing +; +: draw-board ( -- ) + basic-layout + board-outline + mic-conn + headphone-conn + ac-conn + ext-sd-slot + kbd-conn + usb0-conn + usb1-conn + usb2-conn + battery-conn + led0 led1 led2 led3 + cmos-battery-conn + cmos-battery + rspkr-conn + lspkr-conn + wlan-conn + serial-conn + int-sd-slot + + wlan-card + int-sd-card + ext-sd-card +; + +\ Board top items +\ FIXME: still has XO-1.5 image, yet to update for XO-1.75 + +: button-symbol ( x y -- ) + 2dup 18 18 boxat + swap 9 + swap 9 + 6 circleat +; + +: top-outline + 584 370 moveto + 0 -117 rline -9 0 rline 0 -17 rline 5 0 rline 0 -199 rline -54 0 rline + 0 -37 rline -54 0 rline 0 96 rline -91 0 rline 0 -96 rline -319 0 rline + 0 37 rline -56 0 rline 0 127 rline 11 0 rline 0 43 rline -7 0 rline + 0 35 rline 7 0 rline 0 17 rline -11 0 rline 0 111 rline 85 0 rline + 0 -4 rline 49 0 rline 0 -13 rline 23 0 rline 0 -17 rline 27 0 rline + 0 -105 rline 213 0 rline 0 102 rline 28 0 rline 0 16 rline 23 0 rline + 0 17 rline 37 0 rline 0 4 rline 93 0 rline +; + +: headphones-top + 2 95 7 18 boxat + 9 91 45 28 boxat + headphones-logo +; +: mic-top + 9 54 45 28 boxat + 24 20 rmove mic-logo + 2 59 7 18 boxat +; +: acin 0 307 36 27 boxat ; +: int-mic-conn + 70 146 18 18 boxat + 28 15 rmove mic-logo +; +: usb0 + 7 128 45 27 boxat + usb-logo +; +: usb1 + 543 55 45 27 boxat + usb-logo +; +: usb2 + 543 100 45 45 boxat + 0 9 rmove usb-logo +; +: display-conn 252 1 89 18 boxat ; +: camera-conn 540 154 36 18 boxat ; +: backlight-conn 63 46 27 17 boxat ; +: above-int-mic-conn + 79 87 18 27 boxat + 81 82 9 5 boxat + 81 114 9 5 boxat +; +: pwr-but 543 338 button-symbol ; +: rotate-but 30 338 button-symbol ; +: up-but 37 237 button-symbol ; +: down-but 37 278 button-symbol ; +: left-but 14 258 button-symbol ; +: right-but 57 258 button-symbol ; +: o-but 543 239 button-symbol ; +: x-but + 543 279 18 18 boxat + 548 283 moveto 557 292 lineto 548 292 moveto 557 283 lineto +; +: square-but + 521 260 18 18 boxat + 525 264 moveto 534 264 lineto 534 273 lineto 525 273 lineto 525 264 lineto +; +: check-but + 564 259 18 18 boxat + 570 269 moveto 573 273 lineto 578 263 lineto +; +: led0-top 518 348 led-symbol ; +: led1-top 491 348 led-symbol ; +: led2-top 72 348 led-symbol ; +: led3-top 99 348 led-symbol ; +: mic-led 31 45 led-symbol ; +: camera-led 569 45 led-symbol ; +: wlan-conn-top 374 76 104 27 boxat ; +: wlan-card-top 389 7 75 75 boxat ; +: ext-sd-slot-top 497 360 81 9 boxat ; +: ext-sd-card-top + 504 369 moveto 0 -75 rline 11 -11 rline 56 0 rline 0 86 rline -67 0 rline +; +: draw-top ( -- ) + basic-layout + + top-outline + headphones-top + mic-top + acin + int-mic-conn + usb0 usb1 usb2 + display-conn + camera-conn + backlight-conn + above-int-mic-conn + pwr-but + rotate-but + up-but + down-but + left-but + right-but + o-but + x-but + square-but + check-but + led0-top + led1-top + led2-top + led3-top + mic-led + camera-led + wlan-conn-top + wlan-card-top + ext-sd-slot-top +; + +: usb-key ( -- ) + 95 155 moveto 130 165 lineto 130 155 lineto 95 145 lineto 95 155 lineto + 130 155 moveto 150 140 lineto 150 150 lineto 130 165 lineto + 150 140 moveto 115 130 lineto 95 145 lineto + 146 153 moveto 155 155 lineto 155 135 lineto 110 122 lineto 110 133 lineto + 110 122 moveto 110 122 171 67 197 54 curveto 229 38 295 42 155 135 curveto + 155 156 moveto 218 111 229 100 241 81 curveto 248 65 239 51 239 51 curveto +; + +: scanner ( -- ) + 195 98 moveto + 195 111 174 121 149 121 curveto + 123 121 103 111 102 98 curveto + 103 85 123 75 149 75 curveto + 174 75 195 85 195 98 curveto + + 111 84 moveto + 193 36 228 48 239 61 curveto + 261 90 171 122 171 118 curveto + + 235 85 moveto + 281 177 310 177 267 201 curveto + 251 209 227 200 235 189 curveto + 243 177 249 179 248 172 curveto + 239 121 196 109 200 109 curveto +; + +: usb-ethernet + 130 212 moveto + 141 218 145 220 145 205 curveto 145 190 145 190 125 180 curveto + 105 170 105 171 105 185 curveto 105 190 105 185 105 190 curveto + + 105 190 moveto + 106 190 105 192 105 185 curveto 105 170 105 170 135 155 curveto 165 140 165 140 185 150 curveto + 205 160 205 160 205 175 curveto 205 190 205 190 175 205 curveto 145 220 146 221 130 212 curveto + + 125 190 moveto 135 195 lineto 115 205 lineto 95 195 lineto 115 185 lineto 120 188 lineto + 105 215 moveto 115 220 lineto 115 205 lineto 95 195 lineto 95 206 lineto + 115 220 moveto 135 210 lineto 135 195 lineto 115 205 lineto 115 220 lineto + 102 202 moveto 105 201 109 202 110 205 curveto 111 208 111 211 109 213 curveto + 109 213 moveto 78 232 38 242 38 242 curveto + 103 202 moveto 76 219 38 230 38 230 curveto + 130 188 moveto 121 193 lineto 115 190 lineto 125 185 lineto 130 188 lineto + 130 188 moveto 130 189 130 193 130 193 curveto + 115 185 moveto 120 188 lineto + 135 195 moveto 126 191 lineto + + 321 96 moveto 321 106 lineto 322 106 308 124 287 118 curveto + 306 108 moveto 313 105 321 96 321 96 curveto 303 89 lineto 303 89 296 92 289 98 curveto 275 112 291 117 306 108 curveto + 327 90 moveto 327 96 lineto 321 101 lineto + 307 90 moveto 315 85 lineto 327 90 lineto 319 95 lineto + 283 111 moveto 284 114 287 112 288 113 curveto 289 114 289 116 288 117 curveto + 284 111 moveto 284 110 lineto + + 287 111 moveto 250 134 198 157 198 157 curveto + 288 117 moveto 238 147 203 161 203 161 curveto +; + + +0 value blink-time +-1 value blink-state +0 value blink-color +h# ff0000 constant red-888 +h# 00ff00 constant green-888 +h# 0000ff constant blue-888 +h# 000000 constant black-888 +h# ffffff constant white-888 +h# ff00ff constant magenta-888 +magenta-888 to blink-color + +: set-default-color ( -- ) black-888 set-fg ; + +defer selected-object ' noop to selected-object + +: idle ( -- ) + blink-state -1 = if exit then + 1 ms + get-msecs blink-time - 0>= if + blink-state 1 xor dup to blink-state ( state ) + if blink-color set-fg else white-888 set-fg then + selected-object + get-msecs d# 400 + to blink-time + then +; + +: highlight ( xt color -- ) + to blink-color + to selected-object + get-msecs to blink-time + 0 to blink-state + idle +; +: message-off ( -- ) d# 2 d# 27 at-xy kill-line ; +: message ( adr len -- ) cursor-off message-off red-letters type black-letters ; + +: performed ( -- ) + -1 to blink-state + message-off + set-default-color + selected-object + cr +; + +: connect-scanner ( -- ) + basic-layout + " Connect USB barcode scanner to continue.." message + ['] scanner green-888 highlight +; + +: connect-usb-key ( -- ) + basic-layout + " Connect USB stick to continue.." message + ['] usb-key green-888 highlight +; + +: connect-usb-ethernet ( -- ) + basic-layout + " Connect USB Ethernet to continue.." message + ['] usb-ethernet green-888 highlight +; + +: connect-headphones ( -- ) + draw-top + " Connect headphones to continue.." message + ['] headphones-top h# 00e000 highlight \ Green like headphone jack +; +: disconnect-headphones ( -- ) + draw-top + " Disconnect headphones to continue.." message + ['] headphones-top red-888 highlight +; +: connect-microphone ( -- ) + draw-top + " Connect microphone to continue.." message + ['] mic-top h# ff80c0 highlight \ Close enough to the pink of the mic jack +; +: disconnect-microphone ( -- ) + draw-top + " Disconnect microphone to continue.." message + ['] mic-top red-888 highlight +; +: mic+phones-top ( -- ) mic-top headphones-top ; +: connect-loopback ( -- ) + draw-top + " Connect loopback cable to continue.." message + ['] mic+phones-top green-888 highlight +; +: disconnect-loopback ( -- ) + draw-top + " Disconnect loopback cable to continue.." message + ['] mic+phones-top red-888 highlight +; + +: connect-int-sd ( -- ) + draw-board + " Connect internal SD card to continue.." message + ['] int-sd-card green-888 highlight +; +: connect-ext-sd ( -- ) + draw-top + " Connect external SD card to continue.." message + ['] ext-sd-card-top green-888 highlight +; + +: disconnect-int-sd ( -- ) + draw-board + " Disconnect internal SD card to continue.." message + ['] int-sd-card red-888 highlight +; +: disconnect-ext-sd ( -- ) + draw-top + " Disconnect external SD card to continue.." message + ['] ext-sd-card-top red-888 highlight +; + +: open ( -- ok ) true ; +: close ( -- ) ; + +end-support-package +0 value instructions-ih + +: ($instructions) ( name$ -- ) + instructions-ih 0= if + " " " test-instructions" $open-package to instructions-ih + then + instructions-ih $call-method +; +' ($instructions) to $instructions + +: (instructions-idle) ( -- ) " idle" $instructions ; +' (instructions-idle) to instructions-idle + +: (instructions-done) ( -- ) " performed" $instructions ; +' (instructions-done) to instructions-done + +: diag-mode ( -- ) true to diag-switch? ; + +hex + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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: cpu/arm/olpc/3.0/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/testitems.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,94 @@ +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: battery.icon rom:battery.565 +icon: camera.icon rom:camera.565 +icon: wifi.icon rom:wifi.565 +icon: audio.icon rom:audio.565 +icon: touchpad.icon rom:touchpad.565 +icon: display.icon rom:display.565 +icon: keyboard.icon rom:keyboard.565 +icon: timer.icon rom:timer.565 +icon: clock.icon rom:clock.565 +icon: ebook.icon rom:ebook.565 +icon: leds.icon rom:leds.565 + +d# 15 to #mfgtests +d# 5 to #mfgcols +d# 4 to #mfgrows + +: cpu-item ( -- ) " /cpu" mfg-test-dev ; +: battery-item ( -- ) " /battery" mfg-test-dev ; +: spiflash-item ( -- ) " /flash" mfg-test-dev ; +: memory-item ( -- ) " /memory" mfg-test-dev ; +: usb-item ( -- ) " /usb/hub" mfg-test-dev ; +: int-sd-item ( -- ) " int:0" mfg-test-dev ; +: ext-sd-item ( -- ) " ext:0" mfg-test-dev ; +: rtc-item ( -- ) " /rtc" mfg-test-dev ; +: display-item ( -- ) " /display" mfg-test-dev ; +: audio-item ( -- ) " /audio" mfg-test-dev ; +: camera-item ( -- ) " /camera" mfg-test-dev ; +: wlan-item ( -- ) " /wlan" mfg-test-dev ; +: timer-item ( -- ) " /timer" mfg-test-dev ; +: touchpad-item ( -- ) " mouse" mfg-test-dev ; +: keyboard-item ( -- ) " keyboard" mfg-test-dev ; +: switch-item ( -- ) " /accelerometer" mfg-test-dev " /switches" mfg-test-dev ; +: leds-item ( -- ) " /leds" mfg-test-dev ; + +: olpc-test-menu-items ( -- ) + clear-menu + +\ " CPU" +\ ['] cpu-item cpu.icon 1 0 install-icon + + " SPI Flash: Contains EC code, firmware, manufacturing data." + ['] spiflash-item spi.icon 1 0 install-icon + + " RAM chips" + ['] memory-item ram.icon 1 1 install-icon + + " Internal mass storage" + ['] int-sd-item sdcard.icon 1 2 install-icon + + " Plug-in SD card" + ['] ext-sd-item sdcard.icon 1 3 install-icon + + " Wireless LAN" + ['] wlan-item wifi.icon 1 4 install-icon + + " Display" + ['] display-item display.icon 2 0 install-icon + + " Camera" + ['] camera-item camera.icon 2 1 install-icon + + " Audio: Speaker and microphone" + ['] audio-item audio.icon 2 2 install-icon + + " Battery" + ['] battery-item battery.icon 2 3 install-icon + + " RTC (Real-Time Clock)" + ['] rtc-item clock.icon 2 4 install-icon + + " USB ports" + ['] usb-item usb.icon 3 0 install-icon + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + + " Keyboard" + ['] keyboard-item keyboard.icon 3 1 install-icon + + " Touchpad" + ['] touchpad-item touchpad.icon 3 2 install-icon + + " LEDs" + ['] leds-item leds.icon 3 3 install-icon + + " Switches and Accelerometer" + ['] switch-item ebook.icon 3 4 install-icon +; +' olpc-test-menu-items to test-menu-items Added: cpu/arm/olpc/3.0/usb.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/usb.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,187 @@ +purpose: Platform-specific USB elaborations +\ See license at end of file + +0 0 " d4208000" " /" begin-package \ USB Host Controller + h# 200 constant /regs + my-address my-space /regs reg + : my-map-in ( len -- adr ) + my-space swap " map-in" $call-parent h# 100 + ( adr ) + ; + : my-map-out ( adr len -- ) swap h# 100 - swap " map-out" $call-parent ; + false constant has-dbgp-regs? + false constant needs-dummy-qh? + : grab-controller ( config-adr -- error? ) drop false ; + fload ${BP}/dev/usb2/hcd/ehci/loadpkg.fth +\ false to delay? \ No need for a polling delay on this platform + : otg-set-host-mode 3 h# a8 ehci-reg! ; \ Force host mode + ' otg-set-host-mode to set-host-mode + + \ Port 1 on the hub is connected to unused pins on the WLAN connector, + \ so testing it is confusing + \ Port 2 is right upper + \ Port 3 is left + \ Port 4 is right lower + " 3,4,2" " usb-hub-test-list" string-property + : sleep ( -- ) true to first-open? ; + : wake ( -- ) ; +end-package + +\ 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-clr d# 10 ms d# 146 gpio-set ; + +: init-usb ( -- ) + h# 9 h# 5c pmua! \ Enable clock to USB block + reset-usb-hub + init-usb-phy +; + +stand-init: Init USB Phy +\ usb-power-on \ The EC now controls the USB power + init-usb +; + +d# 350 config-int usb-delay \ Milliseconds to wait before probing hub ports + +devalias u /usb/disk + +\ Like $show-devs, but ignores pagination keystrokes +: $nopage-show-devs ( nodename$ -- ) + ['] exit? behavior >r ['] false to exit? + $show-devs + r> to exit? +; + +\ Restrict selftest to external USB ports 1,2,3 +\ dev / 3 " usb-test-ports" integer-property dend + +: (probe-usb2) ( -- ) + " device_type" get-property if exit then +[ifdef] use-usb-debug-port + \ I haven't figured out how to turn on the EHCI cleanly + \ when the Debug Port is running + dbgp-off +[then] + get-encoded-string " ehci" $= if + pwd$ open-dev ?dup if close-dev then + then +; +: (show-usb2) ( -- ) + " device_type" get-property if exit then + get-encoded-string " ehci" $= if + pwd$ $nopage-show-devs + then +; + +true value first-usb-probe? +: (silent-probe-usb) ( -- ) " /" ['] (probe-usb2) scan-subtree ; +: silent-probe-usb ( -- ) + (silent-probe-usb) + report-disk report-net report-keyboard +; +: probe-usb ( -- ) + first-usb-probe? if + false to first-usb-probe? + \ Initial probe to awaken the hub + (silent-probe-usb) + \ A little delay to let slow devices like USB scanner wake up + d# 150 ms + then + silent-probe-usb + + ." USB devices:" cr + " /" ['] (show-usb2) scan-subtree + +; +alias p2 probe-usb + +0 value usb-keyboard-ih + +: attach-usb-keyboard ( -- ) + " usb-keyboard" expand-alias if ( devspec$ ) + drop " /usb" comp 0= if ( ) + " usb-keyboard" open-dev to usb-keyboard-ih + usb-keyboard-ih add-input + exit + then + else ( devspec$ ) + 2drop + then +; + +: detach-usb-keyboard ( -- ) + usb-keyboard-ih if + usb-keyboard-ih remove-input + usb-keyboard-ih close-dev + 0 to usb-keyboard-ih + then +; + +: ?usb-keyboard ( -- ) + attach-usb-keyboard + " /usb/serial" open-dev ?dup if + add-input + then +; + +: suspend-usb ( -- ) + detach-usb-keyboard + " /usb" " sleep" execute-device-method drop +; +: has-children? ( devspec$ -- flag ) + locate-device if false else child 0<> then +; +: any-usb-devices? ( -- flag ) " /usb/hub" has-children? ; +: resume-usb ( -- ) + init-usb + " /usb" " wake" execute-device-method drop + any-usb-devices? if + d# 2000 ms \ USB misses devices if you probe too soon + then + silent-probe-usb + attach-usb-keyboard +; + +\ Unlink every node whose phys.hi component matches port +: port-match? ( port -- flag ) + get-unit if drop false exit then + get-encoded-int = +; +: rm-usb-children ( port -- ) + device-context? 0= if drop exit then + also ( port ) + 'child ( port prev ) + first-child begin while ( port prev ) + over port-match? if ( port prev ) + 'peer link@ over link! ( port prev ) \ Disconnect + else ( port prev ) + drop 'peer ( port prev' ) + then ( port prev ) + next-child repeat ( port prev ) + 2drop ( ) + previous definitions +; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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: cpu/arm/olpc/3.0/verify.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/verify.bth Sat Dec 3 01:45:08 2011 (r2727) @@ -0,0 +1,7 @@ +purpose: Fetch the Crypto code and keys + +command: &builder &this +build-now + +fload ${BP}/cpu/arm/olpc/3.0/crypto-version.fth +fload ${BP}/cpu/arm/olpc/build-crypto.fth Added: cpu/arm/olpc/3.0/wlan-version.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/3.0/wlan-version.fth Sat Dec 3 01:45:08 2011 (r2727) @@ -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] r2726 - cpu/arm/olpc cpu/arm/olpc/1.75 cpu/arm/olpc/1.75/attic dev/olpc/dcon
by repository service 03 Dec '11

03 Dec '11

Author: wmb Date: Sat Dec 3 01:44:58 2011 New Revision: 2726 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2726 Log: OLPC XO-1.75 - big rearrangement, moving files from cpu/arm/olpc/1.75 up to cpu/arm/olpc, in preparation for XO-3 Added: cpu/arm/olpc/1.75/attic/ cpu/arm/olpc/1.75/attic/audiosmb.fth - copied, changed from r2725, cpu/arm/olpc/1.75/audiosmb.fth cpu/arm/olpc/1.75/attic/dram-forth.fth - copied, changed from r2725, cpu/arm/olpc/1.75/dram-forth.fth cpu/arm/olpc/1.75/attic/dram-xdb.fth - copied, changed from r2725, cpu/arm/olpc/1.75/dram-xdb.fth cpu/arm/olpc/1.75/attic/dram.fth - copied, changed from r2725, cpu/arm/olpc/1.75/dram.fth cpu/arm/olpc/1.75/attic/draminit.bth - copied, changed from r2725, cpu/arm/olpc/1.75/draminit.bth cpu/arm/olpc/1.75/attic/ofw.bth - copied, changed from r2725, cpu/arm/olpc/1.75/ofw.bth cpu/arm/olpc/1.75/attic/sp.bth - copied, changed from r2725, cpu/arm/olpc/1.75/sp.bth cpu/arm/olpc/1.75/attic/xo-dram.fth - copied, changed from r2725, cpu/arm/olpc/1.75/xo-dram.fth cpu/arm/olpc/accelerometer.fth - copied, changed from r2725, cpu/arm/olpc/1.75/accelerometer.fth cpu/arm/olpc/accelerometer.txt - copied, changed from r2725, cpu/arm/olpc/1.75/accelerometer.txt cpu/arm/olpc/addrs.fth - copied, changed from r2725, cpu/arm/olpc/1.75/addrs.fth cpu/arm/olpc/alc5624.fth - copied, changed from r2725, cpu/arm/olpc/1.75/alc5624.fth cpu/arm/olpc/alc5631.fth - copied, changed from r2725, cpu/arm/olpc/1.75/alc5631.fth cpu/arm/olpc/bbedi.fth - copied, changed from r2725, cpu/arm/olpc/1.75/bbedi.fth cpu/arm/olpc/boardrev.fth - copied, changed from r2725, cpu/arm/olpc/1.75/boardrev.fth cpu/arm/olpc/build-cforth.fth - copied, changed from r2725, cpu/arm/olpc/1.75/cforth.bth cpu/arm/olpc/build-crypto.fth - copied, changed from r2725, cpu/arm/olpc/1.75/verify.bth cpu/arm/olpc/build-fw.fth cpu/arm/olpc/build-mcnand.fth - copied, changed from r2725, cpu/arm/olpc/1.75/mcastnand.bth cpu/arm/olpc/build-wlan.fth - copied, changed from r2725, cpu/arm/olpc/1.75/sd8686.bth cpu/arm/olpc/ecflash.fth - copied, changed from r2725, cpu/arm/olpc/1.75/ecflash.fth cpu/arm/olpc/edi.fth - copied, changed from r2725, cpu/arm/olpc/1.75/edi.fth cpu/arm/olpc/emmc.fth - copied, changed from r2725, cpu/arm/olpc/1.75/emmc.fth cpu/arm/olpc/exc7200-touchscreen.fth - copied, changed from r2725, cpu/arm/olpc/1.75/exc7200-touchscreen.fth cpu/arm/olpc/fetch-ec.fth - copied, changed from r2725, cpu/arm/olpc/1.75/ec.bth cpu/arm/olpc/getmfgdata.fth - copied, changed from r2725, cpu/arm/olpc/1.75/getmfgdata.fth cpu/arm/olpc/help.fth - copied, changed from r2725, cpu/arm/olpc/1.75/help.fth cpu/arm/olpc/lcd.fth - copied, changed from r2725, cpu/arm/olpc/1.75/lcd.fth cpu/arm/olpc/pinch.fth - copied, changed from r2725, cpu/arm/olpc/1.75/pinch.fth cpu/arm/olpc/prefw.fth - copied, changed from r2725, cpu/arm/olpc/1.75/prefw.bth cpu/arm/olpc/probemem.fth - copied, changed from r2725, cpu/arm/olpc/1.75/probemem.fth cpu/arm/olpc/rm3150-touchscreen.fth - copied, changed from r2725, cpu/arm/olpc/1.75/rm3150-touchscreen.fth cpu/arm/olpc/roller.fth - copied, changed from r2725, cpu/arm/olpc/1.75/roller.fth cpu/arm/olpc/rtc.fth - copied, changed from r2725, cpu/arm/olpc/1.75/rtc.fth cpu/arm/olpc/sdhci.fth - copied, changed from r2725, cpu/arm/olpc/1.75/sdhci.fth cpu/arm/olpc/sdregs.fth - copied, changed from r2725, cpu/arm/olpc/1.75/sdregs.fth cpu/arm/olpc/smbus.fth - copied, changed from r2725, cpu/arm/olpc/1.75/smbus.fth cpu/arm/olpc/sound.fth - copied, changed from r2725, cpu/arm/olpc/1.75/sound.fth cpu/arm/olpc/sourceurl.fth - copied, changed from r2725, cpu/arm/olpc/1.75/sourceurl.fth cpu/arm/olpc/testicons.bth - copied, changed from r2725, cpu/arm/olpc/1.75/testicons.bth cpu/arm/olpc/viaedi.fth - copied, changed from r2725, cpu/arm/olpc/1.75/viaedi.fth Deleted: cpu/arm/olpc/1.75/accelerometer.fth cpu/arm/olpc/1.75/accelerometer.txt cpu/arm/olpc/1.75/addrs.fth cpu/arm/olpc/1.75/alc5624.fth cpu/arm/olpc/1.75/alc5631.fth cpu/arm/olpc/1.75/audiosmb.fth cpu/arm/olpc/1.75/bbedi.fth cpu/arm/olpc/1.75/boardrev.fth cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/dram-forth.fth cpu/arm/olpc/1.75/dram-xdb.fth cpu/arm/olpc/1.75/dram.fth cpu/arm/olpc/1.75/draminit.bth cpu/arm/olpc/1.75/dummy.img cpu/arm/olpc/1.75/ecflash.fth cpu/arm/olpc/1.75/edi.fth cpu/arm/olpc/1.75/emmc.fth cpu/arm/olpc/1.75/exc7200-touchscreen.fth cpu/arm/olpc/1.75/getmfgdata.fth cpu/arm/olpc/1.75/help.fth cpu/arm/olpc/1.75/lcd.fth cpu/arm/olpc/1.75/ofw.bth cpu/arm/olpc/1.75/pinch.fth cpu/arm/olpc/1.75/probemem.fth cpu/arm/olpc/1.75/rm3150-touchscreen.fth cpu/arm/olpc/1.75/roller.fth cpu/arm/olpc/1.75/rtc.fth cpu/arm/olpc/1.75/sdhci.fth cpu/arm/olpc/1.75/sdregs.fth cpu/arm/olpc/1.75/smbus.fth cpu/arm/olpc/1.75/sound.fth cpu/arm/olpc/1.75/sourceurl.fth cpu/arm/olpc/1.75/sp.bth cpu/arm/olpc/1.75/spiui.fth cpu/arm/olpc/1.75/testicons.bth cpu/arm/olpc/1.75/viaedi.fth cpu/arm/olpc/1.75/xo-dram.fth Modified: cpu/arm/olpc/1.75/cforth-version.fth cpu/arm/olpc/1.75/cforth.bth cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/1.75/ec-version.fth cpu/arm/olpc/1.75/ec.bth cpu/arm/olpc/1.75/fw-version.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/mcastnand.bth cpu/arm/olpc/1.75/olpc.bth cpu/arm/olpc/1.75/prefw.bth cpu/arm/olpc/1.75/sd8686.bth cpu/arm/olpc/1.75/verify.bth dev/olpc/dcon/mmp2dcon.fth Copied and modified: cpu/arm/olpc/1.75/attic/audiosmb.fth (from r2725, cpu/arm/olpc/1.75/audiosmb.fth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/dram-forth.fth (from r2725, cpu/arm/olpc/1.75/dram-forth.fth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/dram-xdb.fth (from r2725, cpu/arm/olpc/1.75/dram-xdb.fth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/dram.fth (from r2725, cpu/arm/olpc/1.75/dram.fth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/draminit.bth (from r2725, cpu/arm/olpc/1.75/draminit.bth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/ofw.bth (from r2725, cpu/arm/olpc/1.75/ofw.bth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/sp.bth (from r2725, cpu/arm/olpc/1.75/sp.bth) ============================================================================== Copied and modified: cpu/arm/olpc/1.75/attic/xo-dram.fth (from r2725, cpu/arm/olpc/1.75/xo-dram.fth) ============================================================================== Modified: cpu/arm/olpc/1.75/cforth-version.fth ============================================================================== --- cpu/arm/olpc/1.75/cforth-version.fth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/cforth-version.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -13,3 +13,5 @@ \ Otherwise, the source code will be will be downloaded as a tarball via gitweb. \ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6 macro: CFORTH_VERSION HEAD + +macro: CFORTH_BUILD_DIR cforth/build/arm-xo-1.75 Modified: cpu/arm/olpc/1.75/cforth.bth ============================================================================== --- cpu/arm/olpc/1.75/cforth.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/cforth.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -4,39 +4,4 @@ build-now fload ${BP}/cpu/arm/olpc/1.75/cforth-version.fth - -macro: CFORTH_BUILD_DIR cforth/build/arm-xo-1.75 - -\ Don't re-fetch the cforth source, thus preventing overwrites of development modifications. -\ If you change cforth-version.fth to specify a different cforth source version, you must -\ manually delete the old cforth subtree. - -" ${CFORTH_BUILD_DIR}/Makefile" expand$ $file-exists? 0= [if] - " ${CFORTH_VERSION}" expand$ " modify" $= [if] - " git clone -q git+ssh://dev.laptop.org/git/users/wmb/cforth" expand$ $sh - [else] - " ${CFORTH_VERSION}" expand$ " clone" $= [if] - " git clone -q git://dev.laptop.org/users/wmb/cforth" expand$ $sh - [else] - " wget -q -O - http://dev.laptop.org/git/users/wmb/cforth/snapshot/cforth-${CFORTH_VERSION… | tar xfz -" expand$ $sh - " mv cforth-${CFORTH_VERSION} cforth" expand$ $sh - " wget -q -O - http://dev.laptop.org/git/users/wmb/cforth/patch | head -1 | cut -f 2 -d ' ' >>${CFORTH_BUILD_DIR}/version" expand$ $sh - \ " echo -n const char cforth_version[] = '""' >${CFORTH_BUILD_DIR}/cforth_version.c" expand$ $sh - \ " wget -q -O - http://dev.laptop.org/git/users/wmb/cforth/patch | head -1 | cut -f 2 -d ' ' >>${CFORTH_BUILD_DIR}/cforth_version.c" expand$ $sh - \ " echo '"";' >>${CFORTH_BUILD_DIR}/cforth_version.c" expand$ $sh - [then] - [then] -[then] - -" (cd ${CFORTH_BUILD_DIR}; make --no-print-directory)" expand$ $sh - -\ If the above make changed either cforth.img or shim.img, copy the new one into this directory, -\ thus triggering a rebuild of the OFW .rom file - -" cforth.img" modtime " ${CFORTH_BUILD_DIR}/cforth.img" expand$ modtime < [if] - " (cp ${CFORTH_BUILD_DIR}/cforth.img .)" expand$ $sh -[then] - -" shim.img" modtime " ${CFORTH_BUILD_DIR}/shim.img" expand$ modtime < [if] - " (cp ${CFORTH_BUILD_DIR}/shim.img .)" expand$ $sh -[then] +fload ${BP}/cpu/arm/olpc/build-cforth.fth Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/config.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,11 +1,12 @@ \ create cl2-a1 create debug-startup create olpc +create olpc-cl2 create trust-ec-keyboard create use-null-nvram create use-elf fload ${BP}/cpu/arm/mmp2/hwaddrs.fth -fload ${BP}/cpu/arm/olpc/1.75/addrs.fth +fload ${BP}/cpu/arm/olpc/addrs.fth create machine-signature ," CL2" Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/ec-version.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,4 +1,5 @@ \ The EC microcode +macro: EC_PLATFORM cl2 macro: EC_VERSION 4_0_3_06 \ Alternate command for getting EC microcode, for testing new versions. Modified: cpu/arm/olpc/1.75/ec.bth ============================================================================== --- cpu/arm/olpc/1.75/ec.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/ec.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -4,15 +4,4 @@ build-now fload ${BP}/cpu/arm/olpc/1.75/ec-version.fth - -\ If there is a GET_EC macro, use it instead of fetching the released version. -" ${GET_EC}" expand$ nip [if] - " ${GET_EC}" expand$ $sh -[else] - " wget -q http://dev.laptop.org/pub/ec/cl2-${EC_VERSION}.img -O ec.img" expand$ $sh -[then] - -\ This forces the creation of an ec.log file, so we don't re-fetch ec.img -writing ec.version -" ${EC_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose +fload ${BP}/cpu/arm/olpc/fetch-ec.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,3 +1,4 @@ \ The overall firmware revision +macro: FW_PREFIX Q4 macro: FW_MAJOR C macro: FW_MINOR 07 Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/fw.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -7,614 +7,4 @@ " fw.tag" r/w create-file drop tag-file ! -hex -\ ' $report-name is include-hook -\ ' noop is include-hook - -fload ${BP}/cpu/arm/olpc/fbnums.fth -fload ${BP}/cpu/arm/olpc/fbmsg.fth - -fload ${BP}/cpu/arm/olpc/1.75/devices.fth - -[ifndef] virtual-mode -warning off -: stand-init-io - stand-init-io - go-fast \ From mmuon.fth -; -warning on -[then] - -fload ${BP}/cpu/arm/linux.fth - -\ The bottom of extra-mem is the top of DMA memory. -\ We give everything up to that address to Linux. -: olpc-memory-limit ( -- adr ) extra-mem-va >physical ; -' olpc-memory-limit to memory-limit - -: usb-quiet ( -- ) - [ ' linux-hook behavior compile, ] \ Chain to old behavior - unload-crypto - " /usb" " reset-usb" execute-device-method drop -; - -d# 9999 to arm-linux-machine-type \ Marvell Jasper - -\ Add a tag describing the linear frame buffer -: mmp-fb-tag, ( -- ) - 8 tag-l, - h# 54410008 tag-l, \ ATAG_VIDEOLFB - d# 1200 tag-w, \ Width - d# 900 tag-w, \ Height - d# 24 tag-w, \ Depth - d# 1200 3 * tag-w, \ Pitch - fb-mem-va tag-l, \ Base address - d# 1200 3 * d# 900 * tag-l, \ Total size - perhaps could be larger - 5 tag-b, \ Red size - d# 11 tag-b, \ Red position - 6 tag-b, \ Green size - d# 5 tag-b, \ Green position - 5 tag-b, \ Blue size - d# 0 tag-b, \ Blue position - 0 tag-b, \ Rsvd size - d# 16 tag-b, \ Rsvd position -; -' mmp-fb-tag, to fb-tag, - -\ Add a tag describing the OFW callback -3 constant MT_DEVICE_WC -9 constant MT_MEMORY -: (ofw-tag,) ( -- ) - 4 2 * 3 + tag-l, \ size - h# 41000502 tag-l, \ ATAG_MEM - cif-handler tag-l, \ Client interface handler callback address - - \ Each of these groups is a struct map_desc as defined in arch/arm/include/asm/mach/ - extra-mem-va dup tag-l, \ VA of OFW memory - >physical pageshift rshift tag-l, \ Page frame number of OFW memory - fw-mem-va /fw-mem + extra-mem-va - tag-l, \ Size of OFW memory - MT_MEMORY tag-l, \ Mapping type of OFW memory - - fb-mem-va dup tag-l, \ VA of OFW Frame Buffer - >physical pageshift rshift tag-l, \ PA of OFW Frame Buffer - /fb-mem tag-l, \ Size of OFW memory - MT_DEVICE_WC tag-l, \ Mapping type of OFW frame buffer -; -' (ofw-tag,) to ofw-tag, - -false to stand-init-debug? -\ true to stand-init-debug? - -: sec-trg ( -- ) d# 73 gpio-set ; \ rising edge latches SPI_WP# low -: sec-trg? ( -- bit ) d# 73 gpio-pin@ ; - -alias ec-indexed-io-off sec-trg -alias ec-indexed-io-off? sec-trg? -alias ec-ixio-reboot ec-power-cycle \ clears latch, brings SPI_WP# high - -false value secure? - -: protect-fw ( -- ) secure? if flash-protect sec-trg then ; - -hex -: i-key-wait ( ms -- pressed? ) - cr ." Type 'i' to interrupt stand-init sequence" cr ( ms ) - 0 do - ukey? if - ukey upc ascii I = if true unloop exit then - then - d# 1000 us \ 1000 us is more precise than 1 ms, which is often close to 2 ms - loop - false -; - -: rotate-button? ( -- flag ) d# 15 gpio-pin@ 0= ; -warning @ warning off -: init -\ initial-heap add-memory - init - - standalone? if - disable-interrupts -\ d# 1000 i-key-wait if - rotate-button? if - protect-fw - \ Make the frame buffer visible so CForth won't complain about OFW not starting - h# 8009.1100 h# 20.b190 io! - ." Interacting" cr hex interact - then - \ Turn on USB power here to overlap the time with other startup actions - usb-power-on - then -; -warning ! - -: (.firmware) ( -- ) - ." Open Firmware " .built cr - ." Copyright 2010 FirmWorks All Rights Reserved" cr -; -' (.firmware) to .firmware - -\ Uninstall the diag menu from the general user interface vector -\ so exiting from emacs doesn't invoke the diag menu. -' quit to user-interface -fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth -fload ${BP}/cpu/arm/olpc/1.75/testitems.fth - -[ifdef] notyet -fload ${BP}/cpu/x86/pc/olpc/via/bootmenu.fth -[then] - -: screen-#lines ( -- n ) - screen-ih 0= if default-#lines exit then - screen-ih package( #lines )package -; -' screen-#lines to lines/page - -true value text-on? -: text-off ( -- ) - text-on? if - screen-ih remove-output - false to text-on? - then -; -: text-on ( -- ) - text-on? 0= if - screen-ih add-output - cursor-on - true to text-on? - then -; - -fload ${BP}/cpu/x86/pc/olpc/via/banner.fth - -devalias keyboard /ap-sp/keyboard -devalias mouse /ap-sp/mouse - -: console-start ( -- ) - install-mux-io - cursor-off - true to text-on? - - " //null" open-dev to null-ih \ For text-off state -; -: keyboard-off ( -- ) - keyboard-ih if - keyboard-ih remove-input - keyboard-ih close-dev - 0 to keyboard-ih - then -; - -: teardown-mux-io ( -- ) - install-uart-io - text-off - keyboard-off - fallback-out-ih remove-output - fallback-in-ih remove-input - stdin off - stdout off - in-mux-ih close-dev - out-mux-ih close-dev -; -: quiesce ( -- ) - teardown-mux-io - timers-off - usb-quiet - close-ec - \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) - d# 125 af@ h# 100 invert and d# 125 af! -; - -\ This must precede the loading of gui.fth, which chains from linux-hook's behavior -' quiesce to linux-hook - -\ This must be defined after spiui.fth, otherwise spiui will choose some wrong code -: rom-pa ( -- adr ) mfg-data-buf mfg-data-offset - ; \ Fake out setwp.fth -fload ${BP}/cpu/x86/pc/olpc/setwp.fth - -fload ${BP}/cpu/arm/olpc/1.75/help.fth -fload ${BP}/cpu/x86/pc/olpc/gui.fth -fload ${BP}/cpu/x86/pc/olpc/strokes.fth -fload ${BP}/cpu/x86/pc/olpc/plot.fth -fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth - -fload ${BP}/cpu/arm/mmp2/dramrecal.fth - -code halt ( -- ) wfi c; - -fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches -fload ${BP}/cpu/arm/mmp2/rtc.fth \ Internal RTC, used for wakeups -fload ${BP}/cpu/arm/olpc/1.75/leds.fth \ LEDs -fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools - -fload ${BP}/cpu/arm/olpc/1.75/accelerometer.fth -fload ${BP}/cpu/arm/olpc/1.75/compass.fth - -\ Suppress long memory test at final test stage -dev /memory -0 value old-diag-switch? -: not-final-test? ( -- flag ) - final-test? if false exit then - smt-test? if false exit then - old-diag-switch? -; -warning @ warning off -: selftest ( -- error? ) - diag-switch? to old-diag-switch? - not-final-test? to diag-switch? - selftest - old-diag-switch? to diag-switch? -; -warning ! -device-end - -\ When reprogramming this machine's SPI FLASH, rebooting the EC is unnecessary -: no-kbc-reboot ['] noop to spi-reprogrammed ; -: kbc-on ; - -\ Pseudo device that appears in the boot order before net booting -0 0 " " " /" begin-package - " prober" device-name - : open - visible - false - ; - : close ; -end-package - -\ it seems to be difficult to get SoC wakeups from the keypad controller, -\ so we set them up as gpio, instead. -[ifdef] use_mmp2_keypad_control -fload ${BP}/cpu/arm/mmp2/keypad.fth -[ifdef] notdef \ CForth turns on the keypad; resetting it makes it not work -stand-init: keypad - keypad-on - 8 keypad-direct-mode -; -[then] -: keypad-bit ( n keypad out-mask key-mask -- n' keypad ) - third invert and if ( n keypad out-mask ) - rot or swap ( n' keypad ) - else ( n keypad out-mask ) - drop ( n keypad ) - then ( n' keypad ) -; -[then] - -fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth - -: game-key@ ( -- n ) - 0 ( n ) -[ifdef] cl2-a1 - d# 16 gpio-pin@ 0= if h# 80 or then \ O - d# 17 gpio-pin@ 0= if h# 02 or then \ Check - d# 18 gpio-pin@ 0= if h# 100 or then \ X - d# 19 gpio-pin@ 0= if h# 01 or then \ Square - d# 20 gpio-pin@ 0= if h# 40 or then \ Rotate -[else] -[ifdef] use_mmp2_keypad_control - d# 15 gpio-pin@ 0= if button-rotate or then ( n ) - scan-keypad ( n keypad ) - button-o h# 01 keypad-bit ( n' keypad ) - button-check h# 02 keypad-bit ( n' keypad ) - button-x h# 04 keypad-bit ( n' keypad ) - button-square h# 08 keypad-bit ( n' keypad ) - rocker-up h# 10 keypad-bit ( n' keypad ) - rocker-right h# 20 keypad-bit ( n' keypad ) - rocker-down h# 40 keypad-bit ( n' keypad ) - rocker-left h# 80 keypad-bit ( n' keypad ) - drop ( n ) -[else] - d# 15 gpio-pin@ 0= if button-rotate or then - d# 16 gpio-pin@ 0= if button-o or then - d# 17 gpio-pin@ 0= if button-check or then - d# 18 gpio-pin@ 0= if button-x or then - d# 19 gpio-pin@ 0= if button-square or then - d# 20 gpio-pin@ 0= if rocker-up or then - d# 21 gpio-pin@ 0= if rocker-right or then - d# 22 gpio-pin@ 0= if rocker-down or then - d# 23 gpio-pin@ 0= if rocker-left or then -[then] -[then] -; - -fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth - -fload ${BP}/dev/logdev.fth -fload ${BP}/cpu/x86/pc/olpc/disptest.fth -dev /ap-sp/keyboard -fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic -device-end -stand-init: Keyboard - " /ap-sp/keyboard" " set-keyboard-type" execute-device-method drop -; -dev /ap-sp/mouse -fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic -device-end -fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools -fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth -\ fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic -fload ${BP}/cpu/arm/olpc/1.75/rm3150-touchscreen.fth \ Touchscreen driver and diagnostic -fload ${BP}/cpu/arm/olpc/1.75/roller.fth \ Accelerometer test - -\ fload ${BP}/cpu/arm/olpc/1.75/pinch.fth \ Touchscreen gestures -\ : pinch " pinch" screen-ih $call-method ; - -: emacs ( -- ) - false to already-go? - boot-getline to boot-file " rom:emacs" $boot -; -defer rm-go-hook \ Not used, but makes security happy -: tsc@ ( -- d.ticks ) timer0@ u>d ; -d# 6500 constant ms-factor - -\ idt1338 rtc and ram address map -\ 00 -> 0f rtc -\ 10 -> 3f cmos - -: >rtc ( index -- rtc-address ) h# 3f and h# 10 + ; - -: cmos@ ( index -- data ) - >rtc " rtc@" clock-node @ ( index adr len ih ) - ['] $call-method catch if 4drop 0 then -; -: cmos! ( data index -- ) - >rtc " rtc!" clock-node @ ( data index adr len ih ) - ['] $call-method catch if 2drop 3drop then -; - -\ cmos address map -\ 80 audio volume -\ 81 audio volume -\ 82 alternate boot -\ 83 xid - -: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; -: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; - -fload ${BP}/cpu/x86/pc/olpc/sound.fth -fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth -fload ${BP}/cpu/x86/pc/olpc/security.fth -2 to bundle-suffix - -stand-init: xid - h# 83 cmos@ dup 1+ h# 83 cmos! ( n ) - d# 24 lshift ( new-xid ) - " dev /obp-tftp to rpc-xid dend" evaluate -; - -: pre-setup-for-linux ( -- ) - [ ' linux-pre-hook behavior compile, ] \ Chain to old behavior - sound-end -; -' pre-setup-for-linux to linux-pre-hook - -: show-temperature ( -- ) space cpu-temperature .d ; -fload ${BP}/cpu/arm/bootascall.fth -create use-thinmac -fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth -fload ${BP}/cpu/x86/pc/olpc/via/nbtx.fth -fload ${BP}/cpu/x86/pc/olpc/via/nbrx.fth -fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth - -alias fast-hash crypto-hash \ fast-hash uses acceleration when available -fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth -fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth -devalias fsdisk int:0 - -\ create pong-use-touchscreen -fload ${BP}/ofw/gui/ofpong.fth -fload ${BP}/cpu/x86/pc/olpc/life.fth - -" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /usb/wlan" - ' boot-device set-config-string-default - -\needs ramdisk " " d# 128 config-string ramdisk -" " ' boot-file set-config-string-default \ Let the boot script set the cmdline - -2 config-int auto-boot-countdown - -\ Eliminate 4 second delay in install console for the case where -\ there is no keyboard. The delay is unnecessary because the screen -\ does not go blank when the device is closed. -patch drop ms install-console - -alias reboot bye - -alias crcgen drop ( crc byte -- crc' ) - -\ Dictionary growth size for the ARM Image Format header -\ 1 section before origin section table -h# 10.0000 h# 8000 - h# 4000 - dictionary-size ! - -fload ${BP}/cpu/arm/saverom.fth \ Save the dictionary for standalone startup - -fload ${BP}/ofw/core/countdwn.fth \ Startup countdown - -fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package - -\ Because visible doesn't work sometimes when calling back from Linux -dev /client-services patch noop visible enter dend - -: interpreter-init ( -- ) - hex - warning on - only forth also definitions - - install-alarm - - page-mode - #line off - -\ .built cr -; - - -: factory-test? ( -- flag ) - \ TS is the "test station" tag, whose value is set to "SHIP" at the - \ end of manufacturing test. - " TS" find-tag if ( adr len ) - ?-null " SHIP" $= 0= ( in-factory? ) - else ( ) - \ Missing TS tag is treated as not in factory test - false - then ( in-factory? ) -; - -: ?sound ( -- ) - \ Suppress the jingle if a game key is pressed, because we don't want - \ the jingle to interfere with diags and stuff - -1 game-key? if exit then - ['] sound catch drop -; - -: ?games ( -- ) - rocker-right game-key? if - protect-fw - time&date 5drop 1 and if - ['] pong guarded - else - ['] life-demo guarded - then - power-off - then -; -: ?diags ( -- ) - rocker-left game-key? if - protect-fw - text-on ['] gamekey-auto-menu guarded - ." Tests complete - powering off" cr d# 5000 ms power-off - then -; - -: ?fs-update ( -- ) - button-check button-x or button-o or button-square or ( mask ) - game-key-mask = if protect-fw try-fs-update then -; - -fload ${BP}/cpu/arm/mmp2/clocks.fth - -: startup ( -- ) - standalone? 0= if exit then - - block-exceptions - no-page - - ?factory-mode - - disable-user-aborts - console-start - - read-game-keys - - factory-test? 0= if text-off then - - " probe-" do-drop-in - - show-child - - update-ec-flash? if - ['] ?enough-power catch ?dup if ( error ) - show-no-power - .error - ." Skipping EC reflash, not enough power" cr - d# 1000 ms - else - show-reflash - ['] show-reflash-dot to edi-progress - update-ec-flash - then - then - - install-alarm - ?sound - - ?games - - ['] false to interrupt-auto-boot? -[ifdef] probe-usb - factory-test? if d# 1000 ms then \ Extra USB probe delay in the factory - probe-usb - report-disk - report-keyboard -[then] - " probe+" do-drop-in - - interpreter-init - - ?diags - ?fs-update - - factory-test? 0= if secure-startup then - unblock-exceptions - ['] (interrupt-auto-boot?) to interrupt-auto-boot? - - ?usb-keyboard - - auto-banner? if banner then - - auto-boot - - frozen? text-on? 0= and ( no-banner? ) - unfreeze visible cursor-on ( no-banner? ) - if banner then \ Reissue banner if it was suppressed - - blue-letters ." Type 'help' for more information." black-letters cancel - cr cr - - enable-user-aborts - stop-sound - quit -; - -: newrom - " flash! http:\\192.168.200.200\new.rom" eval -; -: newec - " flash-ec http:\\192.168.200.200\ecimage.bin" eval -; -: qz - " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron -; -: urom " flash! u:\new.rom" eval ; -: uec " flash-ec! u:\ecimage.bin" eval ; -: erom " flash! ext:\new.rom" eval ; -: no-usb-delay " dev /usb false to delay? dend" evaluate ; -: null-fsdisk - " dev /null : write-blocks-start 3drop ; : write-blocks-finish ; dend" evaluate - " devalias fsdisk //null" evaluate -; - -tag-file @ fclose tag-file off - -.( --- Saving fw.dic ...) -" fw.dic" $save-forth cr - -fload ${BP}/cpu/arm/mmp2/rawboot.fth - -.( --- Saving fw.img --- ) cr " fw.img" $save-rom - -\ LICENSE_BEGIN -\ Copyright (c) 2010 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 +fload ${BP}/cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/1.75/mcastnand.bth ============================================================================== --- cpu/arm/olpc/1.75/mcastnand.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/mcastnand.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -4,20 +4,4 @@ build-now fload ${BP}/cpu/arm/olpc/1.75/mcnand-version.fth - -" ${MCNAND_VERSION}" expand$ " test" $= [if] - " multicast-nand/Makefile" $file-exists? 0= [if] - " git clone -q git+ssh://dev.laptop.org/git/users/wmb/multicast-nand" expand$ $sh - [then] -[else] - " rm -rf multicast-nand" $sh - " wget -q -O - http://dev.laptop.org/git/users/wmb/multicast-nand/snapshot/multicast-nand-… | tar xfz -" expand$ $sh - " mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh -[then] - -" (cd multicast-nand; make BPDIR=../../../../../.. OFW_CPU=arm nandblaster15_rx.bin nandblaster_tx.bin; cp nandblaster15_rx.bin nandblaster_tx.bin ..)" expand$ $sh - -\ This forces the creation of a .log file, so we don't re-fetch -writing mcastnand.version -" ${MCNAND_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose +fload ${BP}/cpu/arm/olpc/build-mcnand.fth Modified: cpu/arm/olpc/1.75/olpc.bth ============================================================================== --- cpu/arm/olpc/1.75/olpc.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/olpc.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -21,13 +21,13 @@ fload ${BP}/cpu/arm/olpc/1.75/fw-version.fth -" macro: FW_VERSION Q4${FW_MAJOR}${FW_MINOR}" expand$ eval +" macro: FW_VERSION ${FW_PREFIX}${FW_MAJOR}${FW_MINOR}" expand$ eval fload ${BP}/cpu/arm/olpc/1.75/config.fth \ Always re-create the builton.fth file when we make a new rom.img fload ${BP}/cpu/x86/pc/builton.bth -fload ${BP}/cpu/arm/olpc/1.75/sourceurl.fth +fload ${BP}/cpu/arm/olpc/sourceurl.fth fload ${BP}/forth/lib/crc32.fth @@ -48,13 +48,11 @@ flash: SPI'10 timh: TIMH 0 d101f000 \ Main Processor code loaded into DRAM -image: OBMI 800 d101c000 ${BP}/cpu/arm/olpc/1.75/dummy.img +image: OBMI 800 d101c000 ${BP}/cpu/arm/olpc/dummy.img \ Secure Processor code loaded into SRAM image: WTMI 1000 d1018000 shim.img image: CFTH 2000 d1000000 cforth.img -\ anonymous: 20000 ${BP}/cpu/arm/olpc/1.75/build/fw.img reserved: -\ fload ${BP}/cpu/arm/olpc/1.75/ddr_samsung_1g.fth term: end-reserved end-tim @@ -152,8 +150,8 @@ " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file - " ${BP}/cpu/arm/olpc/1.75/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin - " ${BP}/cpu/arm/olpc/1.75/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + " nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " nandblaster_tx.bin" " nb_tx" $add-deflated-dropin 0 [if] " ${BP}/cpu/x86/pc/olpc/images/tux.565" " tux.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/settings.565" " settings.565" $add-deflated-dropin @@ -173,7 +171,7 @@ signature h# 10 blank machine-signature count signature swap move " ${FW_VERSION}" expand$ signature 6 + swap move -" Q4${FW_MAJOR}" expand$ signature d# 13 + swap move +" ${FW_PREFIX}${FW_MAJOR}" expand$ signature d# 13 + swap move signature h# 10 ofd @ fputs /l buffer: crcbuf Modified: cpu/arm/olpc/1.75/prefw.bth ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/prefw.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -5,254 +5,9 @@ command: &armforth &dictionary &this build-now +\ This line must be in this file instead of in prefw.fth so the definitions +\ in config.fth will be tagged. " prefw.tag" r/w create-file drop tag-file ! -hex -\ ' $report-name is include-hook -' noop is include-hook - fload ${BP}/cpu/arm/olpc/1.75/config.fth - -: headerless ; : headers ; : headerless0 ; - -' (quit) to quit - -: \Tags [compile] \ ; immediate -: \NotTags [compile] \ ; immediate - -def-load-base ' load-base set-config-int-default - -true ' fcode-debug? set-config-int-default - -[ifdef] serial-console -" com1" ' output-device set-config-string-default -" com1" ' input-device set-config-string-default -[then] - -fload ${BP}/ofw/core/memlist.fth \ Resource list common routines -fload ${BP}/ofw/core/showlist.fth \ Linked list display tool - -\ Memory management services -[ifdef] virtual-mode -fload ${BP}/ofw/core/clntmem1.fth \ client services for memory -[else] -fload ${BP}/ofw/core/clntphy1.fth \ client services for memory -defer page-table-va -: >physical ( va -- pa ) - dup d# 20 rshift ( va section-index ) - page-table-va swap la+ l@ ( va pte ) - h# fffff invert and ( va pa-base ) - swap h# fffff and or ( pa ) -; -[then] - -fload ${BP}/cpu/arm/mmp2/rootnode.fth \ Root node mapping - physical mode - -fload ${BP}/ofw/core/allocph1.fth \ S Physical memory allocator -fload ${BP}/ofw/core/availpm.fth \ Available memory list - -dev / - " olpc,XO-1.75" model - " OLPC" encode-string " architecture" property -\ The clock frequency of the root bus may be irrelevant, since the bus is internal to the SOC -\ d# 1,000,000,000 " clock-frequency" integer-property -device-end - -: (cpu-arch ( -- adr len ) - " architecture" ['] root-node get-package-property drop - get-encoded-string -; -' (cpu-arch to cpu-arch - -[ifndef] virtual-mode -fload ${BP}/cpu/arm/mmp2/mmuon.fth -[then] -fload ${BP}/cpu/arm/olpc/1.75/probemem.fth \ Memory probing - -stand-init: Probing memory - " probe" memory-node @ $call-method -; - -[ifdef] virtual-mode -fload ${BP}/cpu/arm/loadvmem.fth \ /mmu node -stand-init: MMU - " /mmu" open-dev mmu-node ! -; -fload ${BP}/ofw/core/initdict.fth \ Dynamic dictionary allocation -fload ${BP}/arch/arm/loadarea.fth \ Allocate and map program load area -[then] - -\ XXX should be elsewhere -dev /client-services -: chain ( len args entry size virt -- ) - release ( len args entry ) - h# 8000 alloc-mem h# 8000 + (init-program) ( len args ) - to r1 to r2 - go -; -device-end - -fload ${BP}/cpu/arm/crc32.fth \ Assembly language Zip CRC calculation -fload ${BP}/forth/lib/crc32.fth \ High-level portion of CRC calculation - -[ifdef] resident-packages - -\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation -support-package: ext2-file-system - fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system -end-support-package - -[ifdef] jffs2-support -\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation -support-package: jffs2-file-system - fload ${BP}/ofw/fs/jffs2/jffs2.fth \ Journaling flash file system 2 -end-support-package -[then] - -support-package: zip-file-system - fload ${BP}/ofw/fs/zipfs.fth \ Zip file system -end-support-package -[then] - -fload ${BP}/ofw/core/osfile.fth \ For testing - -\ Load file format handlers - -: call32 ; - -fload ${BP}/ofw/core/allocsym.fth \ Allocate memory for symbol table -fload ${BP}/ofw/core/symcif.fth -fload ${BP}/ofw/core/symdebug.fth -: release-load-area ( boundary-adr -- ) drop ; - -[ifdef] use-elf -fload ${BP}/ofw/elf/elf.fth -fload ${BP}/ofw/elf/elfdebug.fth -[ifdef] virtual-mode -\ Depends on the assumption that physical memory is mapped 1:1 already -: (elf-map-in) ( va size -- ) 0 mem-claim drop ; -[else] -: (elf-map-in) ( va size -- ) 2drop ; -[then] -' (elf-map-in) is elf-map-in -[then] - -\ Reboot and re-entry code -fload ${BP}/ofw/core/reboot.fth \ Restart the client program -fload ${BP}/ofw/core/reenter.fth \ Various entries into Forth - -headerless -[ifdef] virtual-mode -: (initial-heap) ( -- adr len ) sp0 @ ps-size - dict-limit tuck - ; -[else] - \ : (initial-heap) ( -- adr len ) RAMtop heap-size ; -: (initial-heap) ( -- adr len ) limit heap-size ; -[then] -' (initial-heap) is initial-heap -headers - -" /openprom" find-device - " FirmWorks,3.0" encode-string " model" property -device-end - -[ifdef] virtual-mode -fload ${BP}/cpu/arm/mmusetup.fth \ Initial values for MMU lists -[then] - -: background-rgb ( -- r g b ) h# ff h# ff h# ff ; - -fload ${BP}/forth/lib/selstr.fth - -fload ${BP}/cpu/arm/mmp2/socregs.fth \ MMP2 registers used by many functional units - -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 - fload ${BP}/ofw/inet/http.fth \ HTTP client -end-support-package - -support-package: cifs - fload ${BP}/ofw/fs/cifs/loadpkg.fth -end-support-package -devalias smb tcp//cifs -devalias cifs tcp//cifs -: op " select smb:\\test:testxxx@10.20.0.14\XTest\hello.txt" eval ; -: dsmb " dir smb:\\test:testxxx@10.20.0.14\XTest\" eval ; - -[ifdef] notyet -fload ${BP}/cpu/arm/olpc/1.75/memtest.fth -[then] - -fload ${BP}/ofw/wifi/wifi-cfg.fth -support-package: supplicant -fload ${BP}/ofw/wifi/loadpkg.fth -end-support-package - -: olpc-ssids ( -- $ ) " OLPCOFW" ; -' olpc-ssids to default-ssids - -fload ${BP}/ofw/inet/sntp.fth -: olpc-ntp-servers ( -- ) - " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" -; -' olpc-ntp-servers to ntp-servers -: ntp-time&date ( -- s m h d m y ) - ntp-timestamp abort" Can't contact NTP server" - ntp>time&date -; -: .clock ( -- ) - time&date .date space .time ." UTC" cr -; -: ntp-set-clock ( -- ) - ntp-time&date " set-time" clock-node @ $call-method - .clock -; - -[ifdef] use-ppp -fload ${BP}/ofw/ppp/loadppp.fth -[then] - -" dhcp" ' ip-address set-config-string-default - -fload ${BP}/ofw/gui/bmptools.fth -fload ${BP}/dev/null.fth -fload ${BP}/ofw/core/bailout.fth - -true ' local-mac-address? set-config-int-default -[ifdef] resident-packages -support-package: nfs - fload ${BP}/ofw/fs/nfs/loadpkg.fth -end-support-package -[then] -devalias nfs net//obp-tftp:last//nfs - -\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - -\ GUI -false value gui-safeboot? - -: 2tuck ( d1 d2 -- d2 d1 d2 ) 2swap 2over ; -false value fru-test? -: user-ok "ok" ; \ This is supposed to check for authorization -true value user-mode? - -fload ${BP}/ofw/gui/loadmenu.fth -\ fload ${BP}/ofw/gui/insticon.fth - -\ Uninstall the diag menu from the general user interface vector -\ so exiting from emacs doesn't invoke the diag menu. -' quit to user-interface - -tag-file @ fclose tag-file off - -.( --- Saving prefw.dic ...) -" prefw.dic" $save-forth cr +fload ${BP}/cpu/arm/olpc/prefw.fth Modified: cpu/arm/olpc/1.75/sd8686.bth ============================================================================== --- cpu/arm/olpc/1.75/sd8686.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/sd8686.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -3,35 +3,6 @@ command: &builder &this build-now -\needs to-file fload ${BP}/forth/lib/tofile.fth -\needs $md5sum-file fload ${BP}/forth/lib/md5file.fth - fload ${BP}/cpu/arm/olpc/1.75/wlan-version.fth -" macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" expand$ eval - -" ${GET_WLAN}" expand$ nip [if] - " ${GET_WLAN}" expand$ $sh -[else] -" rm -f sd8686.bin sd8686_helper.bin" expand$ $sh - -" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin.md5" expand$ $sh - -to-file md5string " " " ${WLAN_FILE}.bin" expand$ $md5sum-file -" cmp md5string ${WLAN_FILE}.bin.md5" expand$ $sh - -" cp ${WLAN_FILE}.bin sd8686.bin" expand$ $sh - -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh -to-file md5string " *" " sd8686_helper.bin" $md5sum-file -" cmp md5string sd8686_helper.bin.md5" expand$ $sh - -" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5 md5string" expand$ $sh -[then] - -\ This forces the creation of a .log file, so we don't re-fetch -writing sd8686.version -" ${WLAN_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose +fload ${BP}/cpu/arm/olpc/build-wlan.fth Modified: cpu/arm/olpc/1.75/verify.bth ============================================================================== --- cpu/arm/olpc/1.75/verify.bth Fri Dec 2 23:14:43 2011 (r2725) +++ cpu/arm/olpc/1.75/verify.bth Sat Dec 3 01:44:58 2011 (r2726) @@ -3,26 +3,5 @@ command: &builder &this build-now -\needs to-file fload ${BP}/forth/lib/tofile.fth -\needs $md5sum-file fload ${BP}/forth/lib/md5file.fth - 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 - -to-file md5string " *" " bios_verify-${CRYPTO_VERSION}.img" expand$ $md5sum-file -" cmp md5string bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh - -" cp bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh -" rm bios_verify-${CRYPTO_VERSION}.img.md5 md5string" 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 +fload ${BP}/cpu/arm/olpc/build-crypto.fth Copied and modified: cpu/arm/olpc/accelerometer.fth (from r2725, cpu/arm/olpc/1.75/accelerometer.fth) ============================================================================== Copied and modified: cpu/arm/olpc/accelerometer.txt (from r2725, cpu/arm/olpc/1.75/accelerometer.txt) ============================================================================== Copied and modified: cpu/arm/olpc/addrs.fth (from r2725, cpu/arm/olpc/1.75/addrs.fth) ============================================================================== Copied and modified: cpu/arm/olpc/alc5624.fth (from r2725, cpu/arm/olpc/1.75/alc5624.fth) ============================================================================== Copied and modified: cpu/arm/olpc/alc5631.fth (from r2725, cpu/arm/olpc/1.75/alc5631.fth) ============================================================================== Copied and modified: cpu/arm/olpc/bbedi.fth (from r2725, cpu/arm/olpc/1.75/bbedi.fth) ============================================================================== Copied and modified: cpu/arm/olpc/boardrev.fth (from r2725, cpu/arm/olpc/1.75/boardrev.fth) ============================================================================== Copied and modified: cpu/arm/olpc/build-cforth.fth (from r2725, cpu/arm/olpc/1.75/cforth.bth) ============================================================================== --- cpu/arm/olpc/1.75/cforth.bth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/build-cforth.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,11 +1,6 @@ -purpose: Fetch and compile CForth for the Security Processor +purpose: Common instructions for fetching and building CForth -command: &builder &this -build-now - -fload ${BP}/cpu/arm/olpc/1.75/cforth-version.fth - -macro: CFORTH_BUILD_DIR cforth/build/arm-xo-1.75 +\ The macros CFORTH_VERSION and CFORTH_BUILD_DIR must be set externally \ Don't re-fetch the cforth source, thus preventing overwrites of development modifications. \ If you change cforth-version.fth to specify a different cforth source version, you must Copied and modified: cpu/arm/olpc/build-crypto.fth (from r2725, cpu/arm/olpc/1.75/verify.bth) ============================================================================== --- cpu/arm/olpc/1.75/verify.bth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/build-crypto.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,13 +1,10 @@ -purpose: Fetch the Crypto code and keys +purpose: Common code for fetching and building the crypto support code -command: &builder &this -build-now +\ The macro CRYPTO_VERSION must be defined externally \needs to-file fload ${BP}/forth/lib/tofile.fth \needs $md5sum-file fload ${BP}/forth/lib/md5file.fth -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 Added: cpu/arm/olpc/build-fw.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/build-fw.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -0,0 +1,1021 @@ +purpose: Common code for build OFW Forth dictionaries for OLPC ARM platforms +\ See license at end of file + +hex +\ ' $report-name is include-hook +\ ' noop is include-hook + +fload ${BP}/cpu/arm/olpc/fbnums.fth +fload ${BP}/cpu/arm/olpc/fbmsg.fth + +fload ${BP}/dev/omap/diaguart.fth \ OMAP UART + +h# 18000 +io to uart-base \ UART3 base address on MMP2 +\ h# 30000 +io to uart-base \ UART1 base address on MMP2 +d# 26000000 to uart-clock-frequency + +\ CForth has already set up the serial port +: inituarts ( -- ) ; + +fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART + +0 value keyboard-ih + +fload ${BP}/ofw/core/muxdev.fth \ I/O collection/distribution device + +\ Install the simple UART driver from the standalone I/O init chain +warning off +: stand-init-io ( -- ) + stand-init-io + inituarts install-uart-io +; +warning on + +[ifdef] use-null-nvram +\ For not storing configuration variable changes across reboots ... +\ This is useful for "turnkey" systems where configurability would +\ increase support costs. + +fload ${BP}/cpu/x86/pc/nullnv.fth +stand-init: Null-NVRAM + " /null-nvram" open-dev to nvram-node + ['] init-config-vars catch drop +; +[then] + +[ifdef] use-flash-nvram +\ For configuration variables stored in a sector of the boot FLASH ... + +\ Create a node below the top-level FLASH node to access the portion +\ containing the configuration variables. +0 0 " d0000" " /flash" begin-package + " nvram" device-name + + h# 10000 constant /device + fload ${BP}/dev/subrange.fth +end-package + +stand-init: NVRAM + " /nvram" open-dev to nvram-node + ['] init-config-vars catch drop +; +[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/pc/cpunode.fth \ The PC CPU node is actually fairly generic + +: cpu-mhz ( -- n ) + " /cpu@0" find-package drop ( phandle ) + " clock-frequency" rot get-package-property if 0 exit then ( adr ) + decode-int nip nip d# 1000000 / +; + + +fload ${BP}/cpu/arm/mmp2/timer.fth +fload ${BP}/cpu/arm/mmp2/twsi.fth +fload ${BP}/cpu/arm/mmp2/mfpr.fth +fload ${BP}/cpu/arm/mmp2/gpio.fth + +: init-stuff + acgr-clocks-on + init-timers + init-twsi +; +warning @ warning off +: stand-init-io + stand-init-io + init-stuff +; +warning ! + +fload ${BP}/cpu/arm/mmp2/irq.fth + +fload ${BP}/cpu/arm/mmp2/watchdog.fth \ reset-all using watchdog timer + +0 0 " d4018000" " /" begin-package \ UART3 + fload ${BP}/cpu/arm/mmp2/uart.fth +end-package +devalias com1 /uart +: com1 " com1" ; +' com1 is fallback-device + +0 0 " d4030000" " /" begin-package \ UART1 + fload ${BP}/cpu/arm/mmp2/uart.fth +end-package +devalias com2 /uart +: com2 " com2" ; + +\needs md5init fload ${BP}/ofw/ppp/md5.fth \ MD5 hash + +fload ${BP}/cpu/arm/olpc/smbus.fth \ Bit-banged SMBUS (I2C) using GPIOs + +fload ${BP}/dev/olpc/spiflash/flashif.fth \ Generic FLASH interface + +fload ${BP}/dev/olpc/spiflash/spiif.fth \ Generic low-level SPI bus access + +fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming + +fload ${BP}/cpu/arm/mmp2/sspspi.fth \ Synchronous Serial Port SPI interface + +\ Create the top-level device node to access the entire boot FLASH device +0 0 " d4035000" " /" begin-package + " flash" device-name + + h# 10.0000 value /device + my-address my-space h# 100 reg + fload ${BP}/dev/nonmmflash.fth +end-package + +\ Create a node below the top-level FLASH node to accessing the portion +\ containing the dropin modules +0 0 " 20000" " /flash" begin-package + " dropins" device-name + + h# e0000 constant /device + fload ${BP}/dev/subrange.fth +end-package + +devalias dropins /dropins + +fload ${BP}/dev/olpc/confirm.fth \ Selftest interaction modalities +fload ${BP}/cpu/arm/olpc/getmfgdata.fth \ Get manufacturing data +fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data +fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree + +fload ${BP}/dev/olpc/kb3700/eccmds.fth +: stand-power-off ( -- ) ec-power-off begin wfi again ; +' stand-power-off to power-off + +: olpc-reset-all ( -- ) + " screen" " dcon-off" ['] execute-device-method catch if + 2drop 2drop + then + ec-power-cycle + begin wfi again +; +' olpc-reset-all to reset-all +stand-init: + ['] reset-all to bye +; + +fload ${BP}/dev/olpc/kb3700/batstat.fth \ Battery status reports +fload ${BP}/cpu/arm/olpc/boardrev.fth \ Board revision decoding + +false constant tethered? \ We only support reprogramming our own FLASH + +: hdd-led-off ( -- ) d# 10 gpio-clr ; +: hdd-led-on ( -- ) d# 10 gpio-set ; +: hdd-led-toggle ( -- ) d# 10 gpio-pin@ if hdd-led-off else hdd-led-on then ; + +fload ${BP}/cpu/arm/olpc/bbedi.fth +fload ${BP}/cpu/arm/olpc/edi.fth + +load-base constant flash-buf + +fload ${BP}/cpu/arm/olpc/ecflash.fth + +: ec-spi-reprogrammed ( -- ) + edi-spi-start + set-ec-reboot + unreset-8051 +; + +: ignore-power-button ( -- ) + edi-spi-start + ['] reset-8051 catch if + ['] reset-8051 catch if ." Write Protected EC" cr then + then + use-ssp-spi + ['] ec-spi-reprogrammed to spi-reprogrammed +; +: flash-vulnerable( ( -- ) + ols-off + ignore-power-button + hdd-led-on + disable-interrupts +; +: )flash-vulnerable ( -- ) + enable-interrupts + hdd-led-off + d# 850 ms \ allow time for 8051 to finish reset and power us down +; +: fs-vulnerable( ( -- ) + ols-off + hdd-led-on +; +: )fs-vulnerable ( -- ) + hdd-led-off + ols-on +; + +fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming +\ fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery +: ofw-fw-filename$ " disk:\boot\olpc.rom" ; +' ofw-fw-filename$ to fw-filename$ + +0 0 " d420b000" " /" begin-package + " display" name +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/lcdcfg.fth + + fload ${BP}/cpu/arm/olpc/lcd.fth +\+ olpc-cl2 fload ${BP}/dev/olpc/dcon/mmp2dcon.fth \ DCON control + defer convert-color ' noop to convert-color + defer pixel* + defer pixel+ + defer pixel! + + : color! ( r g b index -- ) 4drop ; + : color@ ( index -- r g b ) drop 0 0 0 ; + + fload ${BP}/dev/video/common/rectangle16.fth \ Rectangular graphics + + depth d# 24 = [if] + code 3a+ ( adr n -- n' ) + pop r0,sp + inc tos,#3 + add tos,tos,r0 + c; + code rgb888! ( n adr -- ) + pop r0,sp + strb r0,[tos] + mov r0,r0,lsr #8 + strb r0,[tos,#1] + mov r0,r0,lsr #8 + strb r0,[tos,#2] + pop tos,sp + c; + ' 3* to pixel* + ' 3a+ to pixel+ + ' rgb888! to pixel! + ' noop to convert-color + [else] + ' /w* to pixel* + ' wa+ to pixel+ + ' w! to pixel! + ' argb>565-pixel to convert-color + [then] + + : display-on + init-xo-display \ Turns on DCON etc + frame-buffer-adr hdisp vdisp * >bytes h# ffffffff lfill + init-lcd + ; + : map-frame-buffer ( -- ) + \ We use fb-mem-va directly instead of calling map-in on the physical address + \ because the physical address changes with the total memory size. The early + \ assembly language startup code establishes the mapping. + fb-mem-va to frame-buffer-adr + ; + " display" device-type + " ISO8859-1" encode-string " character-set" property + 0 0 encode-bytes " iso6429-1983-colors" property + + \ Used as temporary storage for images by $get-image + : graphmem ( -- adr ) dimensions * pixel* fb-mem-va + ; + + : display-install ( -- ) + map-frame-buffer + display-on + default-font set-font + width height ( width height ) + over char-width / over char-height / ( width height rows cols ) + /scanline depth fb-install ( ) + ; + + : display-remove ( -- ) ; + : display-selftest ( -- failed? ) false ; + + ' display-install is-install + ' display-remove is-remove + ' display-selftest is-selftest +end-package + +devalias screen /display + +devalias keyboard /keyboard + +create 15x30pc " ${BP}/ofw/termemu/15x30pc.psf" $file, +' 15x30pc to romfont + +fload ${BP}/cpu/arm/olpc/sdhci.fth +\- cl2-a1 fload ${BP}/cpu/arm/olpc/emmc.fth + +devalias int /sd/disk@3 +devalias ext /sd/disk@1 +devalias net /wlan \ XXX should report-net in case of USB Ethernet + +fload ${BP}/dev/olpc/kb3700/spicmd.fth +fload ${BP}/cpu/arm/olpc/spcmd.fth + +: wlan-reset ( -- ) d# 58 gpio-clr d# 20 ms d# 58 gpio-set ; + +\ Create the alias unless it already exists +: $?devalias ( alias$ value$ -- ) + 2over not-alias? if $devalias exit then ( alias$ value$ alias$ ) + 2drop 4drop +; + +: ?report-device ( alias$ pathname$ -- ) + 2dup locate-device 0= if ( alias$ pathname$ phandle ) + drop ( alias$ pathname$ ) + 2over 2over $?devalias ( alias$ pathname$ ) + then ( alias$ pathname$ ) + 4drop ( ) +; + +: report-disk ( -- ) + " disk" " /usb/disk" ?report-device +; + +: report-keyboard ( -- ) + \ Prefer direct-attached + " usb-keyboard" " /usb/keyboard" ?report-device \ USB 2 (keyboard behind a hub) +; + +\ If there is a USB ethernet adapter, use it as the default net device. +\ We can't use ?report-device here because we already have net aliased +\ to /wlan, and ?report-device won't override an existing alias. +: report-net ( -- ) + " /usb/ethernet" 2dup locate-device 0= if ( name$ phandle ) + drop ( name$ ) + + \ Don't recreate the alias if it is already correct + " net" aliased? if ( name$ existing-name$ ) + 2over $= if ( name$ ) + 2drop exit ( -- ) + then ( name$ ) + then ( name$ ) + + " net" 2swap $devalias ( ) + else ( name$ ) + 2drop ( ) + then +; + +fload ${BP}/cpu/arm/marvell/utmiphy.fth + +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/usb.fth + +fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth + +fload ${BP}/cpu/arm/firfilter.fth + +fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding +d# 32 is playback-volume + +fload ${BP}/cpu/arm/olpc/sound.fth +fload ${BP}/cpu/arm/olpc/rtc.fth +stand-init: RTC + " /rtc" open-dev clock-node ! +; + +warning @ warning off +: stand-init + stand-init + root-device + model-name$ 2dup model ( name$ ) + " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property + board-revision " board-revision-int" integer-property +\+ olpc-cl2 " olpc,xo-1.75" " compatible" string-property +\+ olpc-cl3 " olpc,xo-3.0" " compatible" string-property + + \ The "1-" removes the null byte + " SN" find-tag if 1- else " Unknown" then " serial-number" string-property + + ec-api-ver@ " ec-version" integer-property + + ['] ec-name$ catch 0= if " ec-name" string-property then + ['] ec-date$ catch 0= if " ec-date" string-property then + ['] ec-user$ catch 0= if " ec-user" string-property then + dend + + " /openprom" find-device + flash-open pad d# 16 2dup h# fffc0 flash-read ( adr len ) + " model" string-property + + " sourceurl" find-drop-in if " source-url" string-property then + dend +; + +warning ! + +stand-init: More memory + extra-mem-va /extra-mem add-memory +; + +fload ${BP}/cpu/arm/mmp2/thermal.fth +fload ${BP}/cpu/arm/mmp2/fuse.fth + +[ifndef] virtual-mode +warning off +: stand-init-io + stand-init-io + go-fast \ From mmuon.fth +; +warning on +[then] + +fload ${BP}/cpu/arm/linux.fth + +\ The bottom of extra-mem is the top of DMA memory. +\ We give everything up to that address to Linux. +: olpc-memory-limit ( -- adr ) extra-mem-va >physical ; +' olpc-memory-limit to memory-limit + +: usb-quiet ( -- ) + [ ' linux-hook behavior compile, ] \ Chain to old behavior + unload-crypto + " /usb" " reset-usb" execute-device-method drop +; + +d# 9999 to arm-linux-machine-type \ Marvell Jasper + +\ Add a tag describing the linear frame buffer +: mmp-fb-tag, ( -- ) + 8 tag-l, + h# 54410008 tag-l, \ ATAG_VIDEOLFB + d# 1200 tag-w, \ Width + d# 900 tag-w, \ Height + d# 24 tag-w, \ Depth + d# 1200 3 * tag-w, \ Pitch + fb-mem-va tag-l, \ Base address + d# 1200 3 * d# 900 * tag-l, \ Total size - perhaps could be larger + 5 tag-b, \ Red size + d# 11 tag-b, \ Red position + 6 tag-b, \ Green size + d# 5 tag-b, \ Green position + 5 tag-b, \ Blue size + d# 0 tag-b, \ Blue position + 0 tag-b, \ Rsvd size + d# 16 tag-b, \ Rsvd position +; +' mmp-fb-tag, to fb-tag, + +\ Add a tag describing the OFW callback +3 constant MT_DEVICE_WC +9 constant MT_MEMORY +: (ofw-tag,) ( -- ) + 4 2 * 3 + tag-l, \ size + h# 41000502 tag-l, \ ATAG_MEM + cif-handler tag-l, \ Client interface handler callback address + + \ Each of these groups is a struct map_desc as defined in arch/arm/include/asm/mach/ + extra-mem-va dup tag-l, \ VA of OFW memory + >physical pageshift rshift tag-l, \ Page frame number of OFW memory + fw-mem-va /fw-mem + extra-mem-va - tag-l, \ Size of OFW memory + MT_MEMORY tag-l, \ Mapping type of OFW memory + + fb-mem-va dup tag-l, \ VA of OFW Frame Buffer + >physical pageshift rshift tag-l, \ PA of OFW Frame Buffer + /fb-mem tag-l, \ Size of OFW memory + MT_DEVICE_WC tag-l, \ Mapping type of OFW frame buffer +; +' (ofw-tag,) to ofw-tag, + +false to stand-init-debug? +\ true to stand-init-debug? + +: sec-trg ( -- ) d# 73 gpio-set ; \ rising edge latches SPI_WP# low +: sec-trg? ( -- bit ) d# 73 gpio-pin@ ; + +alias ec-indexed-io-off sec-trg +alias ec-indexed-io-off? sec-trg? +alias ec-ixio-reboot ec-power-cycle \ clears latch, brings SPI_WP# high + +false value secure? + +: protect-fw ( -- ) secure? if flash-protect sec-trg then ; + +hex +: i-key-wait ( ms -- pressed? ) + cr ." Type 'i' to interrupt stand-init sequence" cr ( ms ) + 0 do + ukey? if + ukey upc ascii I = if true unloop exit then + then + d# 1000 us \ 1000 us is more precise than 1 ms, which is often close to 2 ms + loop + false +; + +: rotate-button? ( -- flag ) d# 15 gpio-pin@ 0= ; +warning @ warning off +: init +\ initial-heap add-memory + init + + standalone? if + disable-interrupts +\ d# 1000 i-key-wait if + rotate-button? if + protect-fw + \ Make the frame buffer visible so CForth won't complain about OFW not starting + h# 8009.1100 h# 20.b190 io! + ." Interacting" cr hex interact + then + \ Turn on USB power here to overlap the time with other startup actions + usb-power-on + then +; +warning ! + +: (.firmware) ( -- ) + ." Open Firmware " .built cr + ." Copyright 2010 FirmWorks All Rights Reserved" cr +; +' (.firmware) to .firmware + +\ Uninstall the diag menu from the general user interface vector +\ so exiting from emacs doesn't invoke the diag menu. +' quit to user-interface +fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/testitems.fth +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/testitems.fth + +[ifdef] notyet +fload ${BP}/cpu/x86/pc/olpc/via/bootmenu.fth +[then] + +: screen-#lines ( -- n ) + screen-ih 0= if default-#lines exit then + screen-ih package( #lines )package +; +' screen-#lines to lines/page + +true value text-on? +: text-off ( -- ) + text-on? if + screen-ih remove-output + false to text-on? + then +; +: text-on ( -- ) + text-on? 0= if + screen-ih add-output + cursor-on + true to text-on? + then +; + +fload ${BP}/cpu/x86/pc/olpc/via/banner.fth + +devalias keyboard /ap-sp/keyboard +devalias mouse /ap-sp/mouse + +: console-start ( -- ) + install-mux-io + cursor-off + true to text-on? + + " //null" open-dev to null-ih \ For text-off state +; +: keyboard-off ( -- ) + keyboard-ih if + keyboard-ih remove-input + keyboard-ih close-dev + 0 to keyboard-ih + then +; + +: teardown-mux-io ( -- ) + install-uart-io + text-off + keyboard-off + fallback-out-ih remove-output + fallback-in-ih remove-input + stdin off + stdout off + in-mux-ih close-dev + out-mux-ih close-dev +; +: quiesce ( -- ) + teardown-mux-io + timers-off + usb-quiet + close-ec + \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) + d# 125 af@ h# 100 invert and d# 125 af! +; + +\ This must precede the loading of gui.fth, which chains from linux-hook's behavior +' quiesce to linux-hook + +\ This must be defined after spiui.fth, otherwise spiui will choose some wrong code +: rom-pa ( -- adr ) mfg-data-buf mfg-data-offset - ; \ Fake out setwp.fth +fload ${BP}/cpu/x86/pc/olpc/setwp.fth + +fload ${BP}/cpu/arm/olpc/help.fth +fload ${BP}/cpu/x86/pc/olpc/gui.fth +fload ${BP}/cpu/x86/pc/olpc/strokes.fth +fload ${BP}/cpu/x86/pc/olpc/plot.fth +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/testinstructions.fth +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth + +fload ${BP}/cpu/arm/mmp2/dramrecal.fth + +code halt ( -- ) wfi c; + +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/switches.fth \ Switches +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches +fload ${BP}/cpu/arm/mmp2/rtc.fth \ Internal RTC, used for wakeups +\+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/leds.fth \ LEDs +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/3.0/leds.fth \ LEDs +fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools + +fload ${BP}/cpu/arm/olpc/accelerometer.fth +\+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/compass.fth + +\ Suppress long memory test at final test stage +dev /memory +0 value old-diag-switch? +: not-final-test? ( -- flag ) + final-test? if false exit then + smt-test? if false exit then + old-diag-switch? +; +warning @ warning off +: selftest ( -- error? ) + diag-switch? to old-diag-switch? + not-final-test? to diag-switch? + selftest + old-diag-switch? to diag-switch? +; +warning ! +device-end + +\ When reprogramming this machine's SPI FLASH, rebooting the EC is unnecessary +: no-kbc-reboot ['] noop to spi-reprogrammed ; +: kbc-on ; + +\ Pseudo device that appears in the boot order before net booting +0 0 " " " /" begin-package + " prober" device-name + : open + visible + false + ; + : close ; +end-package + +\ it seems to be difficult to get SoC wakeups from the keypad controller, +\ so we set them up as gpio, instead. +[ifdef] use_mmp2_keypad_control +fload ${BP}/cpu/arm/mmp2/keypad.fth +[ifdef] notdef \ CForth turns on the keypad; resetting it makes it not work +stand-init: keypad + keypad-on + 8 keypad-direct-mode +; +[then] +: keypad-bit ( n keypad out-mask key-mask -- n' keypad ) + third invert and if ( n keypad out-mask ) + rot or swap ( n' keypad ) + else ( n keypad out-mask ) + drop ( n keypad ) + then ( n' keypad ) +; +[then] + +fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth + +: game-key@ ( -- n ) + 0 ( n ) +[ifdef] cl2-a1 + d# 16 gpio-pin@ 0= if h# 80 or then \ O + d# 17 gpio-pin@ 0= if h# 02 or then \ Check + d# 18 gpio-pin@ 0= if h# 100 or then \ X + d# 19 gpio-pin@ 0= if h# 01 or then \ Square + d# 20 gpio-pin@ 0= if h# 40 or then \ Rotate +[else] +[ifdef] use_mmp2_keypad_control + d# 15 gpio-pin@ 0= if button-rotate or then ( n ) + scan-keypad ( n keypad ) + button-o h# 01 keypad-bit ( n' keypad ) + button-check h# 02 keypad-bit ( n' keypad ) + button-x h# 04 keypad-bit ( n' keypad ) + button-square h# 08 keypad-bit ( n' keypad ) + rocker-up h# 10 keypad-bit ( n' keypad ) + rocker-right h# 20 keypad-bit ( n' keypad ) + rocker-down h# 40 keypad-bit ( n' keypad ) + rocker-left h# 80 keypad-bit ( n' keypad ) + drop ( n ) +[else] + d# 15 gpio-pin@ 0= if button-rotate or then + d# 16 gpio-pin@ 0= if button-o or then + d# 17 gpio-pin@ 0= if button-check or then + d# 18 gpio-pin@ 0= if button-x or then + d# 19 gpio-pin@ 0= if button-square or then + d# 20 gpio-pin@ 0= if rocker-up or then + d# 21 gpio-pin@ 0= if rocker-right or then + d# 22 gpio-pin@ 0= if rocker-down or then + d# 23 gpio-pin@ 0= if rocker-left or then +[then] +[then] +; + +fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth + +fload ${BP}/dev/logdev.fth +fload ${BP}/cpu/x86/pc/olpc/disptest.fth +dev /ap-sp/keyboard +fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic +device-end +stand-init: Keyboard + " /ap-sp/keyboard" " set-keyboard-type" execute-device-method drop +; +dev /ap-sp/mouse +fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic +device-end +fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools +fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth +\ fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic +fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth \ Touchscreen driver and diagnostic +fload ${BP}/cpu/arm/olpc/roller.fth \ Accelerometer test + +\ fload ${BP}/cpu/arm/olpc/pinch.fth \ Touchscreen gestures +\ : pinch " pinch" screen-ih $call-method ; + +: emacs ( -- ) + false to already-go? + boot-getline to boot-file " rom:emacs" $boot +; +defer rm-go-hook \ Not used, but makes security happy +: tsc@ ( -- d.ticks ) timer0@ u>d ; +d# 6500 constant ms-factor + +\ idt1338 rtc and ram address map +\ 00 -> 0f rtc +\ 10 -> 3f cmos + +: >rtc ( index -- rtc-address ) h# 3f and h# 10 + ; + +: cmos@ ( index -- data ) + >rtc " rtc@" clock-node @ ( index adr len ih ) + ['] $call-method catch if 4drop 0 then +; +: cmos! ( data index -- ) + >rtc " rtc!" clock-node @ ( data index adr len ih ) + ['] $call-method catch if 2drop 3drop then +; + +\ cmos address map +\ 80 audio volume +\ 81 audio volume +\ 82 alternate boot +\ 83 xid + +: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; +: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; + +fload ${BP}/cpu/x86/pc/olpc/sound.fth +fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth +fload ${BP}/cpu/x86/pc/olpc/security.fth +2 to bundle-suffix + +stand-init: xid + h# 83 cmos@ dup 1+ h# 83 cmos! ( n ) + d# 24 lshift ( new-xid ) + " dev /obp-tftp to rpc-xid dend" evaluate +; + +: pre-setup-for-linux ( -- ) + [ ' linux-pre-hook behavior compile, ] \ Chain to old behavior + sound-end +; +' pre-setup-for-linux to linux-pre-hook + +: show-temperature ( -- ) space cpu-temperature .d ; +fload ${BP}/cpu/arm/bootascall.fth +create use-thinmac +fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth +fload ${BP}/cpu/x86/pc/olpc/via/nbtx.fth +fload ${BP}/cpu/x86/pc/olpc/via/nbrx.fth +fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth + +alias fast-hash crypto-hash \ fast-hash uses acceleration when available +fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth +fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth +devalias fsdisk int:0 + +\ create pong-use-touchscreen +fload ${BP}/ofw/gui/ofpong.fth +fload ${BP}/cpu/x86/pc/olpc/life.fth + +" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /usb/wlan" + ' boot-device set-config-string-default + +\needs ramdisk " " d# 128 config-string ramdisk +" " ' boot-file set-config-string-default \ Let the boot script set the cmdline + +2 config-int auto-boot-countdown + +\ Eliminate 4 second delay in install console for the case where +\ there is no keyboard. The delay is unnecessary because the screen +\ does not go blank when the device is closed. +patch drop ms install-console + +alias reboot bye + +alias crcgen drop ( crc byte -- crc' ) + +\ Dictionary growth size for the ARM Image Format header +\ 1 section before origin section table +h# 10.0000 h# 8000 - h# 4000 - dictionary-size ! + +fload ${BP}/cpu/arm/saverom.fth \ Save the dictionary for standalone startup + +fload ${BP}/ofw/core/countdwn.fth \ Startup countdown + +fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package + +\ Because visible doesn't work sometimes when calling back from Linux +dev /client-services patch noop visible enter dend + +: interpreter-init ( -- ) + hex + warning on + only forth also definitions + + install-alarm + + page-mode + #line off + +\ .built cr +; + + +: factory-test? ( -- flag ) + \ TS is the "test station" tag, whose value is set to "SHIP" at the + \ end of manufacturing test. + " TS" find-tag if ( adr len ) + ?-null " SHIP" $= 0= ( in-factory? ) + else ( ) + \ Missing TS tag is treated as not in factory test + false + then ( in-factory? ) +; + +: ?sound ( -- ) + \ Suppress the jingle if a game key is pressed, because we don't want + \ the jingle to interfere with diags and stuff + -1 game-key? if exit then + ['] sound catch drop +; + +: ?games ( -- ) + rocker-right game-key? if + protect-fw + time&date 5drop 1 and if + ['] pong guarded + else + ['] life-demo guarded + then + power-off + then +; +: ?diags ( -- ) + rocker-left game-key? if + protect-fw + text-on ['] gamekey-auto-menu guarded + ." Tests complete - powering off" cr d# 5000 ms power-off + then +; + +: ?fs-update ( -- ) + button-check button-x or button-o or button-square or ( mask ) + game-key-mask = if protect-fw try-fs-update then +; + +fload ${BP}/cpu/arm/mmp2/clocks.fth + +: startup ( -- ) + standalone? 0= if exit then + + block-exceptions + no-page + + ?factory-mode + + disable-user-aborts + console-start + + read-game-keys + + factory-test? 0= if text-off then + + " probe-" do-drop-in + + show-child + + update-ec-flash? if + ['] ?enough-power catch ?dup if ( error ) + show-no-power + .error + ." Skipping EC reflash, not enough power" cr + d# 1000 ms + else + show-reflash + ['] show-reflash-dot to edi-progress + update-ec-flash + then + then + + install-alarm + ?sound + + ?games + + ['] false to interrupt-auto-boot? +[ifdef] probe-usb + factory-test? if d# 1000 ms then \ Extra USB probe delay in the factory + probe-usb + report-disk + report-keyboard +[then] + " probe+" do-drop-in + + interpreter-init + + ?diags + ?fs-update + + factory-test? 0= if secure-startup then + unblock-exceptions + ['] (interrupt-auto-boot?) to interrupt-auto-boot? + + ?usb-keyboard + + auto-banner? if banner then + + auto-boot + + frozen? text-on? 0= and ( no-banner? ) + unfreeze visible cursor-on ( no-banner? ) + if banner then \ Reissue banner if it was suppressed + + blue-letters ." Type 'help' for more information." black-letters cancel + cr cr + + enable-user-aborts + stop-sound + quit +; + +: newrom + " flash! http:\\192.168.200.200\new.rom" eval +; +: newec + " flash-ec http:\\192.168.200.200\ecimage.bin" eval +; +: qz + " qz" $essid " http:\\qz\" included \ qa test bed scripting, james cameron +; +: urom " flash! u:\new.rom" eval ; +: uec " flash-ec! u:\ecimage.bin" eval ; +: erom " flash! ext:\new.rom" eval ; +: no-usb-delay " dev /usb false to delay? dend" evaluate ; +: null-fsdisk + " dev /null : write-blocks-start 3drop ; : write-blocks-finish ; dend" evaluate + " devalias fsdisk //null" evaluate +; + +tag-file @ fclose tag-file off + +.( --- Saving fw.dic ...) +" fw.dic" $save-forth cr + +fload ${BP}/cpu/arm/mmp2/rawboot.fth + +.( --- Saving fw.img --- ) cr " fw.img" $save-rom + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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 Copied and modified: cpu/arm/olpc/build-mcnand.fth (from r2725, cpu/arm/olpc/1.75/mcastnand.bth) ============================================================================== --- cpu/arm/olpc/1.75/mcastnand.bth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/build-mcnand.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,9 +1,6 @@ -purpose: Fetch and compile the multicast NAND reflash program +purpose: Common code for fetching and building the NANDblaster support code -command: &builder &this -build-now - -fload ${BP}/cpu/arm/olpc/1.75/mcnand-version.fth +\ The macro MCNAND_VERSION must be set externally " ${MCNAND_VERSION}" expand$ " test" $= [if] " multicast-nand/Makefile" $file-exists? 0= [if] Copied and modified: cpu/arm/olpc/build-wlan.fth (from r2725, cpu/arm/olpc/1.75/sd8686.bth) ============================================================================== --- cpu/arm/olpc/1.75/sd8686.bth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/build-wlan.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,13 +1,10 @@ -purpose: Fetch the firmware for the Marvell 8686 wireless LAN module +purpose: Common code for fetching and building the WLAN microcode -command: &builder &this -build-now +\ The macro WLAN_VERSION, and optionally GET_WLAN, must be defined externally \needs to-file fload ${BP}/forth/lib/tofile.fth \needs $md5sum-file fload ${BP}/forth/lib/md5file.fth -fload ${BP}/cpu/arm/olpc/1.75/wlan-version.fth - " macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" expand$ eval " ${GET_WLAN}" expand$ nip [if] Copied and modified: cpu/arm/olpc/ecflash.fth (from r2725, cpu/arm/olpc/1.75/ecflash.fth) ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/ecflash.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -7,7 +7,8 @@ char 3 value expected-ec-version [else] h# 8000 value /ec-flash -char 4 value expected-ec-version +\+ olpc-cl2 char 4 value expected-ec-version +\+ olpc-cl3 char 5 value expected-ec-version [then] : check-signature ( adr -- ) Copied and modified: cpu/arm/olpc/edi.fth (from r2725, cpu/arm/olpc/1.75/edi.fth) ============================================================================== Copied and modified: cpu/arm/olpc/emmc.fth (from r2725, cpu/arm/olpc/1.75/emmc.fth) ============================================================================== Copied and modified: cpu/arm/olpc/exc7200-touchscreen.fth (from r2725, cpu/arm/olpc/1.75/exc7200-touchscreen.fth) ============================================================================== Copied and modified: cpu/arm/olpc/fetch-ec.fth (from r2725, cpu/arm/olpc/1.75/ec.bth) ============================================================================== --- cpu/arm/olpc/1.75/ec.bth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/fetch-ec.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,15 +1,12 @@ -purpose: Fetch the EC (Embedded Controller, i.e. KB3700) microcode +purpose: Common code for fetching the EC microcode -command: &builder &this -build-now - -fload ${BP}/cpu/arm/olpc/1.75/ec-version.fth +\ The macros EC_PLATFORM, EC_VERSION, and optionally GET_EC, must be defined externally \ If there is a GET_EC macro, use it instead of fetching the released version. " ${GET_EC}" expand$ nip [if] " ${GET_EC}" expand$ $sh [else] - " wget -q http://dev.laptop.org/pub/ec/cl2-${EC_VERSION}.img -O ec.img" expand$ $sh + " wget -q http://dev.laptop.org/pub/ec/${EC_PLATFORM}-${EC_VERSION}.img -O ec.img" expand$ $sh [then] \ This forces the creation of an ec.log file, so we don't re-fetch ec.img Copied and modified: cpu/arm/olpc/getmfgdata.fth (from r2725, cpu/arm/olpc/1.75/getmfgdata.fth) ============================================================================== Copied and modified: cpu/arm/olpc/help.fth (from r2725, cpu/arm/olpc/1.75/help.fth) ============================================================================== Copied and modified: cpu/arm/olpc/lcd.fth (from r2725, cpu/arm/olpc/1.75/lcd.fth) ============================================================================== Copied and modified: cpu/arm/olpc/pinch.fth (from r2725, cpu/arm/olpc/1.75/pinch.fth) ============================================================================== Copied and modified: cpu/arm/olpc/prefw.fth (from r2725, cpu/arm/olpc/1.75/prefw.bth) ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/prefw.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -1,18 +1,9 @@ -purpose: Build OFW Forth dictionary for OLPC XO-1.75 -\ See license at end of file - -dictionary: ${BP}/cpu/arm/build/basefw.dic -command: &armforth &dictionary &this -build-now - -" prefw.tag" r/w create-file drop tag-file ! +purpose: Common code for building the "prefw.dic" intermediate dictionary hex \ ' $report-name is include-hook ' noop is include-hook -fload ${BP}/cpu/arm/olpc/1.75/config.fth - : headerless ; : headers ; : headerless0 ; ' (quit) to quit @@ -67,7 +58,7 @@ [ifndef] virtual-mode fload ${BP}/cpu/arm/mmp2/mmuon.fth [then] -fload ${BP}/cpu/arm/olpc/1.75/probemem.fth \ Memory probing +fload ${BP}/cpu/arm/olpc/probemem.fth \ Memory probing stand-init: Probing memory " probe" memory-node @ $call-method @@ -183,10 +174,6 @@ : op " select smb:\\test:testxxx@10.20.0.14\XTest\hello.txt" eval ; : dsmb " dir smb:\\test:testxxx@10.20.0.14\XTest\" eval ; -[ifdef] notyet -fload ${BP}/cpu/arm/olpc/1.75/memtest.fth -[then] - fload ${BP}/ofw/wifi/wifi-cfg.fth support-package: supplicant fload ${BP}/ofw/wifi/loadpkg.fth Copied and modified: cpu/arm/olpc/probemem.fth (from r2725, cpu/arm/olpc/1.75/probemem.fth) ============================================================================== Copied and modified: cpu/arm/olpc/rm3150-touchscreen.fth (from r2725, cpu/arm/olpc/1.75/rm3150-touchscreen.fth) ============================================================================== Copied and modified: cpu/arm/olpc/roller.fth (from r2725, cpu/arm/olpc/1.75/roller.fth) ============================================================================== Copied and modified: cpu/arm/olpc/rtc.fth (from r2725, cpu/arm/olpc/1.75/rtc.fth) ============================================================================== Copied and modified: cpu/arm/olpc/sdhci.fth (from r2725, cpu/arm/olpc/1.75/sdhci.fth) ============================================================================== --- cpu/arm/olpc/1.75/sdhci.fth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/sdhci.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -2,7 +2,7 @@ 0 0 " d4280000" " /" begin-package - fload ${BP}/cpu/arm/olpc/1.75/sdregs.fth + fload ${BP}/cpu/arm/olpc/sdregs.fth fload ${BP}/dev/mmc/sdhci/sdhci.fth d# 1 to power-off-time \ A2 and A3 have turn-off clamps @@ -21,12 +21,12 @@ : gpio-power-off ( -- ) d# 36 slot - gpio-clr sdhci-card-power-off ; ' gpio-power-off to card-power-off - new-device - 1 encode-int " reg" property - fload ${BP}/dev/mmc/sdhci/sdmmc.fth - fload ${BP}/dev/mmc/sdhci/selftest.fth - " external" " slot-name" string-property - finish-device +\+ olpc-cl2 new-device +\+ olpc-cl2 1 encode-int " reg" property +\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/sdmmc.fth +\+ olpc-cl2 fload ${BP}/dev/mmc/sdhci/selftest.fth +\+ olpc-cl2 " external" " slot-name" string-property +\+ olpc-cl2 finish-device new-device 2 encode-int " reg" property Copied and modified: cpu/arm/olpc/sdregs.fth (from r2725, cpu/arm/olpc/1.75/sdregs.fth) ============================================================================== Copied and modified: cpu/arm/olpc/smbus.fth (from r2725, cpu/arm/olpc/1.75/smbus.fth) ============================================================================== Copied and modified: cpu/arm/olpc/sound.fth (from r2725, cpu/arm/olpc/1.75/sound.fth) ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Fri Dec 2 23:14:43 2011 (r2725, copy source) +++ cpu/arm/olpc/sound.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -241,7 +241,7 @@ ; [ifdef] cl2-a1 -fload ${BP}/cpu/arm/olpc/1.75/alc5624.fth \ Realtek ALC5624 CODEC +fload ${BP}/cpu/arm/olpc/alc5624.fth \ Realtek ALC5624 CODEC [else] d# 97 constant headphone-jack d# 96 constant external-mic @@ -249,7 +249,7 @@ : headphones-inserted? ( -- flag ) headphone-jack pin-sense? ; : microphone-inserted? ( -- flag ) external-mic pin-sense? ; -fload ${BP}/cpu/arm/olpc/1.75/alc5631.fth \ Realtek ALC5631Q CODEC +fload ${BP}/cpu/arm/olpc/alc5631.fth \ Realtek ALC5631Q CODEC [then] d# 48000 value sample-rate @@ -583,7 +583,7 @@ fload ${BP}/forth/lib/tones.fth fload ${BP}/dev/geode/ac97/selftest.fth -false value force-internal-mic? \ Can't be implemented on XO-1.75 +false value force-internal-mic? \ Can't be implemented on OLPC boards 2 value #channels : input-test-settings ( -- ) ; Copied and modified: cpu/arm/olpc/sourceurl.fth (from r2725, cpu/arm/olpc/1.75/sourceurl.fth) ============================================================================== Copied and modified: cpu/arm/olpc/testicons.bth (from r2725, cpu/arm/olpc/1.75/testicons.bth) ============================================================================== Copied and modified: cpu/arm/olpc/viaedi.fth (from r2725, cpu/arm/olpc/1.75/viaedi.fth) ============================================================================== Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Fri Dec 2 23:14:43 2011 (r2725) +++ dev/olpc/dcon/mmp2dcon.fth Sat Dec 3 01:44:58 2011 (r2726) @@ -222,8 +222,8 @@ : init-xo-display ( -- ) smb-init - dcon-load - dcon-enable ( maybe-set-cmos ) +\ Unnecessary because CForth has already done it +\ dcon-load dcon-enable ( maybe-set-cmos ) \ dcon-enable leaves mode set to 69 - 40:antialias, 20:swizzle, 8:backlight on, 1:passthru off ; : dcon-power-on ( -- ) 1 h# 26 ec-cmd-b! ;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware December 2011