openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2693 - cpu/arm/olpc/1.75
by repository service 20 Nov '11

20 Nov '11

Author: quozl Date: Sun Nov 20 23:23:51 2011 New Revision: 2693 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2693 Log: OLPC XO-1.75 - community testers did not know how to use the accelerometer test, so add a test environment directive. Modified: cpu/arm/olpc/1.75/accelerometer.fth Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Thu Nov 17 00:11:05 2011 (r2692) +++ cpu/arm/olpc/1.75/accelerometer.fth Sun Nov 20 23:23:51 2011 (r2693) @@ -12,7 +12,7 @@ : ctl1! ( b -- ) h# 20 acc-reg! ; : ctl4! ( b -- ) h# 23 acc-reg! ; : accelerometer-on ( -- ) h# 47 ctl1! ; -: accelerometer-off ( -- ) h# 07 ctl1! ; +: accelerometer-off ( -- ) h# 07 ctl1! ; \ should this be 00? : wext ( b -- n ) dup h# 8000 and if h# ffff0000 or then ; : acceleration@ ( -- x y z ) begin h# 27 acc-reg@ h# 08 and until \ wait for data available @@ -136,6 +136,7 @@ final-test? if accelerometer-off false exit then + ." Don't move!" cr lis-selftest ;

1 0

[commit] r2692 - cpu/arm/olpc/1.75
by repository service 17 Nov '11

17 Nov '11

Author: wmb Date: Thu Nov 17 00:11:05 2011 New Revision: 2692 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2692 Log: OLPC XO-1.75 - svn 2676 introduced a problem with EC communication by loading some code at the wrong time. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Nov 15 05:25:45 2011 (r2691) +++ cpu/arm/olpc/1.75/fw.bth Thu Nov 17 00:11:05 2011 (r2692) @@ -128,7 +128,6 @@ then ; warning ! -[then] : (.firmware) ( -- ) ." Open Firmware " .built cr @@ -169,6 +168,47 @@ 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 @@ -394,45 +434,6 @@ fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package -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! -; - -' quiesce to linux-hook \ Because visible doesn't work sometimes when calling back from Linux dev /client-services patch noop visible enter dend

1 0

[commit] r2691 - cpu/x86/pc/olpc
by repository service 15 Nov '11

15 Nov '11

Author: quozl Date: Tue Nov 15 05:25:45 2011 New Revision: 2691 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2691 Log: OLPC trac 11427 - stack effect comment fix Modified: cpu/x86/pc/olpc/gamekeys.fth Modified: cpu/x86/pc/olpc/gamekeys.fth ============================================================================== --- cpu/x86/pc/olpc/gamekeys.fth Tue Nov 15 05:21:53 2011 (r2690) +++ cpu/x86/pc/olpc/gamekeys.fth Tue Nov 15 05:25:45 2011 (r2691) @@ -44,7 +44,7 @@ ; ' gamekey-pause-message to pause-message -: olpc-hold-message +: olpc-hold-message ( ms -- ) [ifdef] test-station test-station 1 5 between if drop false exit then [then]

1 0

[commit] r2690 - ofw/core
by repository service 15 Nov '11

15 Nov '11

Author: quozl Date: Tue Nov 15 05:21:53 2011 New Revision: 2690 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2690 Log: OLPC trac 11427 - test-all stopped working at the first device that had no reg property, caused by stack imbalance in most-tests premature exit paths Modified: ofw/core/ofwcore.fth Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Tue Nov 15 02:14:16 2011 (r2689) +++ ofw/core/ofwcore.fth Tue Nov 15 05:21:53 2011 (r2690) @@ -3278,18 +3278,18 @@ ' (hold-message) to hold-message : most-tests ( -- exit? ) - " selftest" current-device (search-wordlist) if ( xt ) + " selftest" current-device (search-wordlist) if ( xt ) - drop ( ) + drop ( ) \ We only want to execute the selftest routine if the device has \ a "reg" property. This eliminates the execution of selftest \ routines for "wildcard" devices like st and sd. - " reg" get-property if exit then 2drop ( ) + " reg" get-property if false exit then 2drop ( ) \ We sometimes want to skip the testing of certain devices. - current-device skip-test? if exit then ( ) + current-device skip-test? if false exit then ( ) ??cr ." Testing " pwd " selftest" current-device ( method-adr,len phandle ) @@ -3317,16 +3317,10 @@ then ( exit? ) ; -\ "action-acf" is executed for each device node in the subtree -\ rooted at dev-addr,len , with current-device set to the -\ node in question. "action-acf" can perform arbitrary tests -\ on the node to determine if that node is appropriate for -\ the action that it wished to undertake. - : test-subtree ( dev-addr,len -- ) current-device >r ( dev-addr,len r: phandle ) - find-device ( r: phandle xt ) - ['] most-tests ['] (search-preorder) catch 2drop ( r: phandle xt ) + find-device ( r: phandle ) + ['] most-tests ['] (search-preorder) catch 2drop ( r: phandle ) r> push-device ( ) ;

1 0

[commit] r2689 - cpu/x86/pc/olpc/via/build
by repository service 15 Nov '11

15 Nov '11

Author: wmb Date: Tue Nov 15 02:14:16 2011 New Revision: 2689 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2689 Log: .gitignore Modified: .gitignore cpu/x86/pc/olpc/via/build/.gitignore Modified: .gitignore ============================================================================== --- .gitignore Tue Nov 15 02:14:11 2011 (r2688) +++ .gitignore Tue Nov 15 02:14:16 2011 (r2689) @@ -19,3 +19,4 @@ *.md5 *.public *.lo +TAGS Modified: cpu/x86/pc/olpc/via/build/.gitignore ============================================================================== --- cpu/x86/pc/olpc/via/build/.gitignore Tue Nov 15 02:14:11 2011 (r2688) +++ cpu/x86/pc/olpc/via/build/.gitignore Tue Nov 15 02:14:16 2011 (r2689) @@ -3,3 +3,5 @@ build dsdt.stamp sourceurl +testicons/ +memtest

1 0

[commit] r2688 - cpu/x86/pc/olpc ofw/core
by repository service 15 Nov '11

15 Nov '11

Author: wmb Date: Tue Nov 15 02:14:11 2011 New Revision: 2688 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2688 Log: OLPC trac 11427 - selftests can now be interrupted by typing ESC during the inter-test delay. Modified: cpu/x86/pc/olpc/gamekeys.fth ofw/core/ofwcore.fth Modified: cpu/x86/pc/olpc/gamekeys.fth ============================================================================== --- cpu/x86/pc/olpc/gamekeys.fth Tue Nov 15 02:14:07 2011 (r2687) +++ cpu/x86/pc/olpc/gamekeys.fth Tue Nov 15 02:14:11 2011 (r2688) @@ -34,25 +34,24 @@ ; : game-key? ( mask -- flag ) game-key-mask and 0<> ; -: (hold-message) ( ms -- ) +: gamekey-pause-message ( decisecs -- decisecs' ) + button-rotate game-key@ and if ( decisecs ) + (cr ." Release the game button to continue" ( decisecs ) + begin button-rotate game-key@ and while d# 100 ms repeat + (cr kill-line ( decisecs ) + drop 0 ( decisecs' ) + then ( decisecs ) +; +' gamekey-pause-message to pause-message + +: olpc-hold-message [ifdef] test-station - test-station 1 5 between if drop exit then + test-station 1 5 between if drop false exit then [then] - d# 100 / ( decisecs ) - begin dup while ( decisecs ) - dup d# 10 /mod swap if drop else (cr .d then ( decisecs ) - d# 100 ms ( decisecs ) - 1- ( decisecs ) - button-rotate game-key@ and if ( decisecs ) - (cr ." Release the game button to continue" - begin button-rotate game-key@ and while d# 100 ms repeat - (cr kill-line - drop exit - then - repeat - drop (cr kill-line + (hold-message) + (cr kill-line ; -' (hold-message) to hold-message +' olpc-hold-message to hold-message : bypass-bios-boot? ( -- flag ) button-square game-key? ; Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Tue Nov 15 02:14:07 2011 (r2687) +++ ofw/core/ofwcore.fth Tue Nov 15 02:14:11 2011 (r2688) @@ -3256,11 +3256,29 @@ ['] do-method? scan-subtree ; +: flush-keyboard ( -- ) begin key? while key drop repeat ; +defer pause-message ( decisecs -- decisecs' ) ' noop to pause-message defer hold-message -' ms to hold-message +: (hold-message) ( ms -- exit? ) + flush-keyboard + d# 100 / ( decisecs ) + begin dup while ( decisecs ) + dup d# 10 /mod swap if drop else (cr .d then ( decisecs ) + d# 100 ms 1- ( decisecs' ) + pause-message ( decisecs ) + key? if ( decisecs ) + key h# 1b = if ( decisecs ) + cr ." Selftest stopped from keyboard" cr ( decisecs ) + drop true exit ( -- true ) + then ( decisecs ) + then ( decisecs ) + repeat ( decisecs ) + drop false ( false ) +; +' (hold-message) to hold-message -: most-tests ( -- ) - method-name 2@ current-device (search-wordlist) if ( xt ) +: most-tests ( -- exit? ) + " selftest" current-device (search-wordlist) if ( xt ) drop ( ) @@ -3274,32 +3292,47 @@ current-device skip-test? if exit then ( ) ??cr ." Testing " pwd - method-name 2@ current-device ( method-adr,len phandle ) + " selftest" current-device ( method-adr,len phandle ) execute-phandle-method if ( result ) ?dup if red-letters ??cr ." Selftest failed. Return code = " .d cr black-letters - d# 10000 hold-message + d# 10000 ( delay-ms ) else green-letters ." Okay" cr black-letters - d# 2000 hold-message - then + d# 2000 ( delay-ms ) + then ( delay-ms ) else red-letters ." Selftest failed due to abort" cr black-letters - d# 10000 hold-message - then - then ( ) + d# 10000 ( delay-ms ) + then ( delay-ms ) + hold-message ( exit? ) + else + false ( exit? ) + then ( exit? ) +; + +\ "action-acf" is executed for each device node in the subtree +\ rooted at dev-addr,len , with current-device set to the +\ node in question. "action-acf" can perform arbitrary tests +\ on the node to determine if that node is appropriate for +\ the action that it wished to undertake. + +: test-subtree ( dev-addr,len -- ) + current-device >r ( dev-addr,len r: phandle ) + find-device ( r: phandle xt ) + ['] most-tests ['] (search-preorder) catch 2drop ( r: phandle xt ) + r> push-device ( ) ; : test-all ( -- ) optional-arg-or-/$ - " selftest" method-name 2! - ['] most-tests scan-subtree + test-subtree ; \ From siftdevs.fth

1 0

[commit] r2687 - cpu/x86/pc/olpc/via/build
by repository service 15 Nov '11

15 Nov '11

Author: wmb Date: Tue Nov 15 02:14:07 2011 New Revision: 2687 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2687 Log: .gitignore Added: cpu/x86/pc/olpc/via/build/.gitignore Added: cpu/x86/pc/olpc/via/build/.gitignore ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/build/.gitignore Tue Nov 15 02:14:07 2011 (r2687) @@ -0,0 +1,5 @@ +*.public +multicast-nand/ +build +dsdt.stamp +sourceurl

1 0

[commit] r2686 - in cpu: arm/olpc/1.75 x86/pc/alex x86/pc/olpc/via
by repository service 15 Nov '11

15 Nov '11

Author: wmb Date: Tue Nov 15 02:14:02 2011 New Revision: 2686 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2686 Log: OLPC trac 11423 - Manufacturing tests - merged common code for manufacturing tests into one file and split the differences out into platform-specific "testitems.fth" files. Also implemented an autorun facility for use in secure mode, per OLPC trac 11423. Added: cpu/arm/olpc/1.75/testitems.fth cpu/x86/pc/alex/testitems.fth cpu/x86/pc/olpc/via/testitems.fth Deleted: cpu/arm/olpc/1.75/mfgtest.fth cpu/x86/pc/alex/mfgtest.fth Modified: cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/alex/fw.bth cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/mfgtest.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Nov 15 02:13:49 2011 (r2685) +++ cpu/arm/olpc/1.75/fw.bth Tue Nov 15 02:14:02 2011 (r2686) @@ -139,7 +139,8 @@ \ 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/arm/olpc/1.75/mfgtest.fth +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 @@ -481,7 +482,7 @@ : ?diags ( -- ) rocker-left game-key? if protect-fw - text-on " test-all" ['] eval guarded + text-on ['] gamekey-auto-menu guarded ." Tests complete - powering off" cr d# 5000 ms power-off then ; Added: cpu/arm/olpc/1.75/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/testitems.fth Tue Nov 15 02:14:02 2011 (r2686) @@ -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 Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Tue Nov 15 02:13:49 2011 (r2685) +++ cpu/x86/pc/alex/fw.bth Tue Nov 15 02:14:02 2011 (r2686) @@ -213,7 +213,7 @@ patch noop set-menu-colors setup-graphics patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 -fload ${BP}/cpu/x86/pc/alex/mfgtest.fth +fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth fload ${BP}/dev/olpc/confirm.fth : bright! ( level -- ) drop ; : backlight-on ( -- ) ; Added: cpu/x86/pc/alex/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/alex/testitems.fth Tue Nov 15 02:14:02 2011 (r2686) @@ -0,0 +1,128 @@ +purpose: Platform-specific layout of diagnostic GUI menu items + +d# 6 to #mfgcols +d# 4 to #mfgrows + +: dummy-test-dev ( $ -- ) + clear-n-restore-scroller + ??cr ." Testing " type ." - to be implemented" cr + mfg-color-green sq-border! + d# 2000 hold-message drop + cursor-off gui-alerts refresh + flush-keyboard +; + +: mfg-test-disk ( name$ -- ) + clear-n-restore-scroller + ??cr ." Testing " 2dup type cr + + ['] $.partitions catch if + 2drop false + else + 0 true + then + + d# 2000 ms \ More time to inspect + + mfg-test-result +; + +icon: play.icon rom:play.565 +icon: quit.icon rom:quit.565 +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 + +: cpu-item ( -- ) " /cpu" mfg-test-dev ; +: battery-item ( -- ) " /battery" dummy-test-dev ; +: spiflash-item ( -- ) " /flash" mfg-test-dev ; +: memory-item ( -- ) " /memory" mfg-test-dev ; +: usb-item ( -- ) " /usb" mfg-test-dev ; +: int-sd-item ( -- ) " disk" mfg-test-disk ; +\ : ext-sd-item ( -- ) " ext:0" mfg-test-dev ; +: rtc-item ( -- ) " /rtc" mfg-test-dev ; +: display-item ( -- ) " screen" mfg-test-dev ; +: audio-item ( -- ) " /audio" dummy-test-dev ; +: camera-item ( -- ) " /camera" mfg-test-dev ; +: wlan-item ( -- ) " /wlan" dummy-test-dev ; +: timer-item ( -- ) " /timer" mfg-test-dev ; +: touchpad-item ( -- ) " /mouse" mfg-test-dev ; +: keyboard-item ( -- ) " /keyboard" mfg-test-dev ; +: switch-item ( -- ) " /switches" mfg-test-dev ; +: leds-item ( -- ) " /leds" mfg-test-dev ; + +: alex-test-menu-items ( -- ) + silent-probe-usb + + 0 to #mfgtests + 0 1 set-col-row + + " CPU" + ['] cpu-item cpu.icon add-icon + + " SPI Flash: Contains EC code, firmware, manufacturing data." + ['] spiflash-item spi.icon add-icon + + " RAM chips" + ['] memory-item ram.icon add-icon + + " Internal mass storage" + ['] int-sd-item sdcard.icon add-icon + +\ " Plug-in SD card" +\ ['] ext-sd-item sdcard.icon add-icon + + " Timer" + ['] timer-item timer.icon add-icon + + " RTC (Real-Time Clock)" + ['] rtc-item clock.icon add-icon + + " Keyboard" + ['] keyboard-item keyboard.icon add-icon + + " Touchpad" + ['] touchpad-item touchpad.icon add-icon + + " Display" + ['] display-item display.icon add-icon + + " Camera" + ['] camera-item camera.icon add-icon + + " Audio: Speaker and microphone" + ['] audio-item audio.icon add-icon + + " Wireless LAN" + ['] wlan-item wifi.icon add-icon + + " USB ports" + ['] usb-item usb.icon add-icon + + " Battery" + ['] battery-item battery.icon add-icon + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + +\ " LEDs" +\ ['] leds-item leds.icon add-icon + +\ " Switches" +\ ['] switch-item ebook.icon add-icon +; + +' alex-test-menu-items to test-menu-items Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Tue Nov 15 02:13:49 2011 (r2685) +++ cpu/x86/pc/olpc/via/fw.bth Tue Nov 15 02:14:02 2011 (r2686) @@ -326,6 +326,7 @@ \ 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/x86/pc/olpc/via/testitems.fth fload ${BP}/cpu/x86/pc/olpc/via/bootmenu.fth : screen-#lines ( -- n ) Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Tue Nov 15 02:13:49 2011 (r2685) +++ cpu/x86/pc/olpc/via/mfgtest.fth Tue Nov 15 02:14:02 2011 (r2686) @@ -4,7 +4,17 @@ h# f800 constant mfg-color-red h# 07e0 constant mfg-color-green -: flush-keyboard ( -- ) begin key? while key drop repeat ; +: blank-screen ( -- ) + h# ffff ( color ) + 0 0 ( color x y ) + screen-wh ( color x y w y ) + fill-rectangle-noff ( ) +; + +: clear-n-restore-scroller ( -- ) + blank-screen + restore-scroller +; : sq-border! ( bg -- ) current-sq sq >border ! ; @@ -24,7 +34,7 @@ begin key? if key drop refresh exit then mouse-ih if - 10 get-event if + mouse-event? if \ Ignore movement, act only on a button down event nip nip if wait-buttons-up refresh exit then then @@ -32,15 +42,8 @@ again ; -: mfg-test-dev ( $ -- ) - restore-scroller - ??cr ." Testing " 2dup type cr ( $ ) - 2dup locate-device if ( $ ) - 2drop ." Can't find device node" cr exit ( -- ) - else - drop ( $ ) - then ( $ phandle ) - " selftest" execute-device-method if ( return-code ) +: mfg-test-result ( error? -- ) +if ( return-code ) ?dup if ( return-code ) ??cr ." Selftest failed. Return code = " .d cr mfg-color-red sq-border! @@ -50,14 +53,14 @@ mfg-wait-return else ( ) green-letters - ." Okay" cr + ??cr ." Okay" cr black-letters mfg-color-green sq-border! true to pass? - d# 2000 hold-message + d# 2000 hold-message drop then else - ." Selftest failed due to abort" cr + ??cr ." Selftest failed due to abort" cr mfg-color-red sq-border! false to pass? red-screen @@ -67,30 +70,18 @@ cursor-off gui-alerts refresh flush-keyboard ; - -: draw-error-border ( -- ) - mfg-color-red d# 20 d# 20 d# 1160 d# 820 d# 20 box +: mfg-test-dev ( $ -- ) + clear-n-restore-scroller ( $ ) + ??cr ." Testing " 2dup type cr ( $ ) + 2dup locate-device if ( $ ) + ." Can't find device node " type cr exit ( -- ) + else ( $ phandle ) + drop ( $ ) + then ( $ ) + " selftest" execute-device-method ( error? ) + mfg-test-result ; -icon: play.icon rom:play.565 -icon: quit.icon rom:quit.565 -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 - : all-tests-passed ( -- ) restore-scroller clear-screen @@ -101,8 +92,25 @@ flush-keyboard ; -d# 15 value #mfgtests -d# 5 value #mfgcols +0 value #mfgtests +0 value #mfgcols +0 value #mfgrows + +: #mfgtests++ ( -- ) #mfgtests 1+ to #mfgtests ; + +0 value cur-col +0 value cur-row +: cur-col++ ( -- ) cur-col 1+ to cur-col ; +: cur-row++ ( -- ) cur-row 1+ to cur-row ; +: set-col-row ( row col -- ) to cur-col to cur-row ; +: add-icon ( -- ) + cur-col #mfgcols = if + cur-row++ cur-row #mfgcols >= if abort" Too many icons" then + 0 to cur-col + then + cur-row cur-col install-icon + cur-col++ +; : mfg-test-autorunner ( -- ) \ Unattended autorun of all tests #mfgcols #mfgtests + #mfgcols ?do @@ -114,6 +122,9 @@ loop ; +icon: play.icon rom:play.565 +icon: quit.icon rom:quit.565 + : play-item ( -- ) \ Interactive autorun of all tests #mfgcols #mfgtests + #mfgcols ?do i set-current-sq @@ -128,81 +139,10 @@ ; : quit-item ( -- ) menu-done ; -: 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" 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 ( -- ) " /8042/mouse" mfg-test-dev ; -: keyboard-item ( -- ) " /8042/keyboard" mfg-test-dev ; -: switch-item ( -- ) " /switches" mfg-test-dev ; -: leds-item ( -- ) " /leds" mfg-test-dev ; - -: olpc-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" - ['] switch-item ebook.icon 3 4 install-icon -; : init-menu ( -- ) - d# 4 to rows + ?open-screen ?open-mouse + #mfgrows to rows #mfgcols to cols d# 180 to sq-size d# 128 to image-size @@ -210,9 +150,12 @@ cursor-off ; +defer test-menu-items + : full-menu ( -- ) init-menu - olpc-menu-items + clear-menu + test-menu-items " Run all non-interactive tests. (Press a key between tests to stop.)" ['] play-item play.icon 0 1 selected install-icon @@ -229,12 +172,33 @@ ['] run-menu behavior >r ['] mfg-test-autorunner to run-menu \ Run menu automatically true to diag-switch? - ['] olpc-menu-items ['] nest-menu catch drop + ['] test-menu-items ['] nest-menu catch drop r> to run-menu false to diag-switch? restore-scroller ; +: autorun-from-gamekey ( -- ) + default-selection set-current-sq refresh + (cr kill-line + 0 d# 30 do + i d# 10 mod 0= if (cr i d# 10 / .d then + mouse-event? dup if nip nip nip then ( moused? ) + key? or if ( ) + drop ( ) + menu-interact ( ) + unloop exit ( -- ) + then ( ) + d# 100 ms ( ) + -1 +loop + play-item +; +: gamekey-auto-menu ( -- ) + ['] run-menu behavior >r + ['] autorun-from-gamekey to run-menu \ Run menu automatically after a timeout + (menu) + r> to run-menu +; \ LICENSE_BEGIN \ Copyright (c) 2009 Luke Gorrie Added: cpu/x86/pc/olpc/via/testitems.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/testitems.fth Tue Nov 15 02:14:02 2011 (r2686) @@ -0,0 +1,96 @@ +purpose: Platform-specific layout of diagnostic GUI menu items + +d# 5 to #mfgcols +d# 4 to #mfgrows + +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 + +: 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" 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 ( -- ) " /8042/mouse" mfg-test-dev ; +: keyboard-item ( -- ) " /8042/keyboard" mfg-test-dev ; +: switch-item ( -- ) " /switches" mfg-test-dev ; +: leds-item ( -- ) " /leds" mfg-test-dev ; + +: olpc-test-menu-items ( -- ) + 0 to #mfgtests + 0 1 set-col-row + +\ " CPU" +\ ['] cpu-item cpu.icon add-icon + + " SPI Flash: Contains EC code, firmware, manufacturing data." + ['] spiflash-item spi.icon add-icon + + " RAM chips" + ['] memory-item ram.icon add-icon + + " Internal mass storage" + ['] int-sd-item sdcard.icon add-icon + + " Plug-in SD card" + ['] ext-sd-item sdcard.icon add-icon + + " Wireless LAN" + ['] wlan-item wifi.icon add-icon + + " Display" + ['] display-item display.icon add-icon + + " Camera" + ['] camera-item camera.icon add-icon + + " Audio: Speaker and microphone" + ['] audio-item audio.icon add-icon + + " Battery" + ['] battery-item battery.icon add-icon + + " RTC (Real-Time Clock)" + ['] rtc-item clock.icon add-icon + + " USB ports" + ['] usb-item usb.icon add-icon + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + + " Keyboard" + ['] keyboard-item keyboard.icon add-icon + + " Touchpad" + ['] touchpad-item touchpad.icon add-icon + + " LEDs" + ['] leds-item leds.icon add-icon + + " Switches" + ['] switch-item ebook.icon add-icon +; +' olpc-test-menu-items to test-menu-items

1 0

[commit] r2685 - cpu/arm
by repository service 15 Nov '11

15 Nov '11

Author: wmb Date: Tue Nov 15 02:13:49 2011 New Revision: 2685 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2685 Log: ARM - removed duplicate definition in cpu/arm/scc.fth - no functional change. Modified: cpu/arm/scc.fth Modified: cpu/arm/scc.fth ============================================================================== --- cpu/arm/scc.fth Mon Nov 14 05:26:21 2011 (r2684) +++ cpu/arm/scc.fth Tue Nov 15 02:13:49 2011 (r2685) @@ -99,7 +99,6 @@ code drain-write-buffer ( -- ) mcr p15,0,r0,cr7,cr10,4 c; alias data-sync-barrier drain-write-buffer -code drain-write-buffer ( -- ) mcr p15,0,r0,cr7,cr10,4 c; code data-memory-barrier ( -- ) mcr p15,0,r0,cr7,cr10,5 c; code flush-i&d-tlb ( -- ) mcr p15,0,r0,cr8,cr7,0 c;

1 0

[commit] r2684 - cpu/arm/olpc/1.75
by repository service 14 Nov '11

14 Nov '11

Author: quozl Date: Mon Nov 14 05:26:21 2011 New Revision: 2684 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2684 Log: OLPC XO-1.75 - report write protected EC and flash correctly, was "EDI byte in timeout", allow time for EC to finish reset Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Mon Nov 14 04:24:06 2011 (r2683) +++ cpu/arm/olpc/1.75/devices.fth Mon Nov 14 05:26:21 2011 (r2684) @@ -177,7 +177,9 @@ : ignore-power-button ( -- ) edi-spi-start - ['] reset-8051 catch if reset-8051 then + ['] reset-8051 catch if + ['] reset-8051 catch if ." Write Protected EC" cr then + then use-ssp-spi ['] ec-spi-reprogrammed to spi-reprogrammed ; @@ -188,6 +190,7 @@ ; : )flash-vulnerable ( -- ) hdd-led-off + d# 850 ms \ allow time for 8051 to finish reset and power us down ; : fs-vulnerable( ( -- ) ols-off

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware