Author: wmb Date: Fri Jun 25 01:01:24 2010 New Revision: 1831 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1831
Log: OLPC XO-1.5 - eliminated spurious compilation warnings.
Modified: cpu/x86/pc/olpc/via/banner.fth cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/mfgtest.fth cpu/x86/pc/olpc/via/pcinode.fth cpu/x86/pc/olpc/via/temptest.fth dev/via/unichrome/unichrome.fth
Modified: cpu/x86/pc/olpc/via/banner.fth ============================================================================== --- cpu/x86/pc/olpc/via/banner.fth Mon Jun 21 07:54:29 2010 (r1830) +++ cpu/x86/pc/olpc/via/banner.fth Fri Jun 25 01:01:24 2010 (r1831) @@ -3,7 +3,7 @@
headerless
- +[ifdef] get-partition-from-driver : partition-end ( name$ -- false | d.end true ) open-dev ?dup if ( ihandle ) >r ( r: ihandle ) @@ -28,6 +28,7 @@ then ( ) ." internal storage" ( ) ; +[then]
h# 40 buffer: partition-map : partition-end ( offset -- sector# )
Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Mon Jun 21 07:54:29 2010 (r1830) +++ cpu/x86/pc/olpc/via/devices.fth Fri Jun 25 01:01:24 2010 (r1831) @@ -127,7 +127,6 @@ dev /serial warning @ warning off : selftest false ; warning ! device-end
[ifndef] demo-board -.( Removing ctlr-selftest from 8042 open !!!) cr dev /8042 patch false ctlr-selftest open device-end @@ -158,7 +157,6 @@ fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc.
fload ${BP}/cpu/x86/pc/olpc/via/cmos.fth \ CMOS RAM indices are 1f..ff , above RTC -.( XXX Not clearing CMOS) cr patch noop init-bios-cmos stand-init
[ifdef] use-null-nvram
Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Mon Jun 21 07:54:29 2010 (r1830) +++ cpu/x86/pc/olpc/via/mfgtest.fth Fri Jun 25 01:01:24 2010 (r1831) @@ -1,15 +1,19 @@ \ See license at end of file purpose: Menu for manufacturing tests
-h# f800 constant color-red -h# 07e0 constant color-green +h# f800 constant mfg-color-red +h# 07e0 constant mfg-color-green
: flush-keyboard ( -- ) begin key? while key drop repeat ;
: sq-border! ( bg -- ) current-sq sq >border ! ;
-: red-screen ( -- ) h# ffff color-red " replace-color" $call-screen ; -: green-screen ( -- ) h# ffff color-green " replace-color" $call-screen ; +warning off +\ Intentional redefinitions. It would be better to change the name, but +\ Quanta could be using these words directly in manufacturing test scripts. +: red-screen ( -- ) h# ffff mfg-color-red " replace-color" $call-screen ; +: green-screen ( -- ) h# ffff mfg-color-green " replace-color" $call-screen ; +warning on
0 value pass?
@@ -36,7 +40,7 @@ if ?dup if ??cr ." Selftest failed. Return code = " .d cr - color-red sq-border! + mfg-color-red sq-border! false to pass? red-screen flush-keyboard @@ -45,13 +49,13 @@ green-letters ." Okay" cr black-letters - color-green sq-border! + mfg-color-green sq-border! true to pass? d# 2000 hold-message then else ." Selftest failed due to abort" cr - color-red sq-border! + mfg-color-red sq-border! false to pass? red-screen flush-keyboard @@ -62,7 +66,7 @@ ;
: draw-error-border ( -- ) - color-red d# 20 d# 20 d# 1160 d# 820 d# 20 box + mfg-color-red d# 20 d# 20 d# 1160 d# 820 d# 20 box ;
icon: play.icon rom:play.565 @@ -121,7 +125,7 @@ : quit-item ( -- ) menu-done ; : cpu-item ( -- ) " /cpu" mfg-test-dev ; : battery-item ( -- ) " /battery" mfg-test-dev ; -: flash-item ( -- ) " /flash" 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 ; @@ -144,7 +148,7 @@ \ ['] cpu-item cpu.icon 1 0 install-icon
" SPI Flash: Contains EC code, firmware, manufacturing data." - ['] flash-item spi.icon 1 0 install-icon + ['] spiflash-item spi.icon 1 0 install-icon
" RAM chips" ['] memory-item ram.icon 1 1 install-icon
Modified: cpu/x86/pc/olpc/via/pcinode.fth ============================================================================== --- cpu/x86/pc/olpc/via/pcinode.fth Mon Jun 21 07:54:29 2010 (r1830) +++ cpu/x86/pc/olpc/via/pcinode.fth Fri Jun 25 01:01:24 2010 (r1831) @@ -109,7 +109,6 @@ \ parlance) from the child's "interrupt pin" and the child's address, \ returning "int-line true" if the child's interrupt line register should \ be set or "false" otherwise. -.( XXX make assign-int-line depend on PIC vs. APIC mode) cr : assign-int-line ( phys.hi.func INTx -- irq true ) \ Get the value from the platform-specific mapping registers \ XXX PIC version is below - need APIC version too
Modified: cpu/x86/pc/olpc/via/temptest.fth ============================================================================== --- cpu/x86/pc/olpc/via/temptest.fth Mon Jun 21 07:54:29 2010 (r1830) +++ cpu/x86/pc/olpc/via/temptest.fth Fri Jun 25 01:01:24 2010 (r1831) @@ -22,6 +22,7 @@ then ( fail? ) black-letters ; +warning off : selftest ( -- error? ) selftest if true exit then
@@ -30,7 +31,8 @@ \ runin test has already tested the heat spreader smt-test? final-test? or if false else .temp-rise then ; -dend +warning on +device-end
\ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks
Modified: dev/via/unichrome/unichrome.fth ============================================================================== --- dev/via/unichrome/unichrome.fth Mon Jun 21 07:54:29 2010 (r1830) +++ dev/via/unichrome/unichrome.fth Fri Jun 25 01:01:24 2010 (r1831) @@ -1260,6 +1260,7 @@ \ The previous value of "open" is created automatically by the execution \ of "is-install". We need this override to prevent auto-clearing the \ screen when the display node is re-opened during the camera selftest. +warning off : open ( -- okay? ) open-count 0= if open else true then dup if open-count 1+ to open-count then @@ -1268,6 +1269,7 @@ open-count 1 = if close then open-count 1- 0 max to open-count ; +warning on
" display" device-type " ISO8859-1" encode-string " character-set" property