September 2012 - openfirmware - mail.coreboot.org

[commit] r3295 - cpu/arm/olpc/cl4
by repository service Sept. 6, 2012

Sept. 6, 2012

Author: quozl Date: Thu Sep 6 02:30:17 2012 New Revision: 3295 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3295 Log: Q7A13 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Thu Sep 6 02:28:28 2012 (r3294) +++ cpu/arm/olpc/cl4/fw-version.fth Thu Sep 6 02:30:17 2012 (r3295) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 12 +macro: FW_MINOR 13 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0

[commit] r3294 - cpu/arm/olpc
by repository service Sept. 6, 2012

Sept. 6, 2012

Author: quozl Date: Thu Sep 6 02:28:28 2012 New Revision: 3294 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3294 Log: OLPC XO-4 - Neonode, graphical absolute signal strength tool, watch-fss Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Thu Sep 6 01:10:40 2012 (r3293) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Sep 6 02:28:28 2012 (r3294) @@ -18,7 +18,7 @@ create nn-os \ open short test create nn-fll \ forced LED levels test create nn-version \ version display -create nn-watch-fll \ forced LED levels test, graphical variant +create nn-watch \ graphical signal tests \ create nn-fss \ optional fixed signal strength test \ create nn-ls \ optional low signals test @@ -523,7 +523,7 @@ -[ifdef] nn-watch-fll \ forced LED levels test, graphical variant +[ifdef] nn-watch \ graphical signal tests d# 30 value r \ size of blocks @@ -535,7 +535,7 @@ fill-rectangle-noff ( ) ; -: signal>colour ( signal-value -- colour ) +: level>colour ( signal-value -- colour ) d# 3 rshift dup d# 5 lshift over d# 11 lshift or or ; @@ -558,17 +558,19 @@ ; 0 value axis# -: watch-fll-signal ( signal# signal-value led-level -- ) - >r ( signal# signal-value r: led-level ) - signal>colour pixcolor ! ( signal# r: led-level ) - axis# if ( signal# r: led-level ) \ y + +: draw-signal ( signal# level -- x y ) + level>colour pixcolor ! ( signal# ) + axis# if ( signal# ) \ y ys>xy - else ( signal# r: led-level ) \ x + else ( signal# ) \ x xs>xy - then ( x y r: led-level ) - 2dup bigdot ( x y r: led-level ) - r> ( x y led-level ) - h# c > if ( x y ) + then ( x y ) + 2dup bigdot ( x y ) +; + +: ?draw-fail ( x y flag? -- ) + if ( x y ) white pixcolor ! ( x y ) big>little ( x' y' ) dot ( ) @@ -577,6 +579,14 @@ then ( ) ; + +: watch-fll-signal ( signal# signal-value led-level -- ) + >r ( signal# signal-value r: led-level ) + draw-signal ( x y r: led-level ) + r> ( x y led-level ) + h# c > ?draw-fail ( ) +; + : watch-fll-axis ( axis# -- ) dup to axis# ( axis# ) (fll) @@ -588,8 +598,12 @@ loop ; -: watch-fll +: empty black 0 0 screen-w screen-h fill-rectangle-noff +; + +: watch-fll + empty begin 0 watch-fll-axis 1 watch-fll-axis key? @@ -599,6 +613,37 @@ ; + +: watch-fss-signal ( signal# level -- ) + dup >r ( signal# level r: level ) + draw-signal ( x y r: level ) + r> ( x y level ) + 1 < ?draw-fail ( ) +; + +d# 64 value fs \ fixed signal strength + +: watch-fss-axis ( axis# -- ) + dup to axis# ( axis# ) + fs swap h# 0f h# 03 h# ee 5 bytes-out + h# 0f d# 20 anticipate + + pbuf 4 + c@ 0 do ( ) + i pbuf 5 + over + c@ ( signal# level ) + watch-fss-signal ( ) + loop +; + +: watch-fss + empty + begin + 0 watch-fss-axis + 1 watch-fss-axis key? + until + key drop + page +; + [then]

1 0

[commit] r3293 - cpu/x86/pc/olpc
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Thu Sep 6 01:10:40 2012 New Revision: 3293 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3293 Log: OLPC XO-4 - security, revert r3285 as it breaks booting of our hybrid builds, to be reapplied later once builds are fixed, #12091 Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Thu Sep 6 01:09:19 2012 (r3292) +++ cpu/x86/pc/olpc/security.fth Thu Sep 6 01:10:40 2012 (r3293) @@ -892,7 +892,7 @@ pop-base ; : (fw-version) ( base-adr -- n ) - signature-offset + 7 + ((fw-version)) + h# f.ffc7 + ((fw-version)) ; \ Returns an integer that is derived from a base-36 decoding @@ -904,7 +904,7 @@ : firmware-up-to-date? ( img$ -- flag ) /flash <> if show-x " Invalid Firmware image" .security-failure then ( adr ) - (fw-version) ( file-version# ) + h# f.ffc7 + ((fw-version)) ( file-version# ) ofw-version-int ( file-version# rom-version# ) u<= ;

1 0

[commit] r3292 - cpu/x86/pc/olpc
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Thu Sep 6 01:09:19 2012 New Revision: 3292 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3292 Log: OLPC XO-4 - security, skip signed firmware update for A2 boards due to pending size change, #12091 Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Thu Sep 6 01:08:36 2012 (r3291) +++ cpu/x86/pc/olpc/security.fth Thu Sep 6 01:09:19 2012 (r3292) @@ -1161,6 +1161,10 @@ [then] : ?fw-update ( -- ) +[ifdef] olpc-cl4 + \ skip check for OLPC A2 boards + board-revision h# 4a28 <= if exit then +[then] null$ cn-buf place " bootfw" bundle-present? if " FW found - " ?lease-debug

1 0

[commit] r3291 - cpu/x86/pc/olpc
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Thu Sep 6 01:08:36 2012 New Revision: 3291 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3291 Log: OLPC XO-4 - security, deprecate unadorned bundle names from XO-4 onwards, #12091 Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Thu Sep 6 01:04:16 2012 (r3290) +++ cpu/x86/pc/olpc/security.fth Thu Sep 6 01:08:36 2012 (r3291) @@ -443,12 +443,15 @@ ; 0 value bundle-suffix : bundle-present? ( fn$ -- flag ) - \ Try the unadorned name first - fn-buf place + \ unadorned names not supported from XO-4 onwards + bundle-suffix 4 < if + \ Try the unadorned name first + fn-buf place - bundle-name$ .trying - ['] (boot-read) catch 0= if true exit then ( x x ) - 2drop ( ) + bundle-name$ .trying + ['] (boot-read) catch 0= if true exit then ( x x ) + 2drop ( ) + then \ Unadorned name not present; try again with architecture-dependent numeric suffix bundle-suffix push-decimal (.) pop-base ( adr len )

1 0

[commit] r3290 - cpu/arm/olpc
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Thu Sep 6 01:04:16 2012 New Revision: 3290 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3290 Log: OLPC XO-4 - security, change bundle suffix to a unique value for XO-4, #12091 Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Wed Sep 5 22:56:51 2012 (r3289) +++ cpu/arm/olpc/build-fw.fth Thu Sep 6 01:04:16 2012 (r3290) @@ -666,7 +666,7 @@ 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 +[ifdef] olpc-cl4 4 [else] 2 [then] to bundle-suffix stand-init: xid h# 83 cmos@ dup 1+ h# 83 cmos! ( n )

1 0

[commit] r3289 - cpu/arm/mmp2 dev/olpc/mmp2camera
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: wmb Date: Wed Sep 5 22:56:51 2012 New Revision: 3289 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3289 Log: OLPC XO-4 - Corrected the interrupt routing for the CCIC (camera controller). OLPC trac #12090. Modified: cpu/arm/mmp2/irq.fth dev/olpc/mmp2camera/loadpkg.fth Modified: cpu/arm/mmp2/irq.fth ============================================================================== --- cpu/arm/mmp2/irq.fth Wed Sep 5 13:13:15 2012 (r3288) +++ cpu/arm/mmp2/irq.fth Wed Sep 5 22:56:51 2012 (r3289) @@ -80,8 +80,8 @@ h# 158 h# 170 d# 17 5 make-mux-node \ intcmux17 - TWSI2,3,4,5,6 h# 1c4 h# 1ac d# 18 3 make-mux-node \ intcmux18 - Res, HSI_INT_2, MOLTRES_NGIC_1 h# 1c8 h# 1b0 d# 30 2 make-mux-node \ intcmux30 - ISP_DMA, DXO_ISP - h# 15c h# 174 d# 35 d# 31 make-mux-node \ intcmux35 - MOLTRES_(various) (differens from MMP2) - h# 1cc h# 1bf d# 42 2 make-mux-node \ intcmux42 - CCIC2, CCIC1 + h# 15c h# 174 d# 35 d# 31 make-mux-node \ intcmux35 - MOLTRES_(various) (different from MMP2) + h# 1cc h# 1b4 d# 42 2 make-mux-node \ intcmux42 - CCIC2, CCIC1 h# 160 h# 178 d# 51 2 make-mux-node \ intcmux51 - SSP1_SRDY, SSP3_SRDY h# 184 h# 17c d# 55 4 make-mux-node \ intcmux55 - MMC5, res, res, HSI_INT_1 h# 188 h# 188 d# 55 d# 20 make-mux-node \ intcmux57 - (various) Modified: dev/olpc/mmp2camera/loadpkg.fth ============================================================================== --- dev/olpc/mmp2camera/loadpkg.fth Wed Sep 5 13:13:15 2012 (r3288) +++ dev/olpc/mmp2camera/loadpkg.fth Wed Sep 5 22:56:51 2012 (r3289) @@ -6,7 +6,7 @@ [ifdef] mmp3 \ The CCIC interrupt is shared between CCIC1 and CCIC2 on MMP3 " /interrupt-controller/interrupt-controller@1cc" encode-phandle " interrupt-parent" property - 0 " interrupts" integer-property + 1 " interrupts" integer-property [else] d# 42 " interrupts" integer-property [then]

1 0

[commit] r3288 - cpu/arm/olpc
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Wed Sep 5 13:13:15 2012 New Revision: 3288 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3288 Log: OLPC XO-4 - Neonode, graphical Forced LED Levels tool, shows an indicator for each signal, shaded by level, bright for good, black for bad, tiny white dot for inadequate Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Sep 5 05:29:58 2012 (r3287) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Sep 5 13:13:15 2012 (r3288) @@ -16,8 +16,9 @@ : bytes-out ( byte .. #bytes -- ) " bytes-out" $call-parent ; create nn-os \ open short test -create nn-fll \ forced led levels test +create nn-fll \ forced LED levels test create nn-version \ version display +create nn-watch-fll \ forced LED levels test, graphical variant \ create nn-fss \ optional fixed signal strength test \ create nn-ls \ optional low signals test @@ -43,6 +44,8 @@ : 2u.x base @ >r hex 0 <# # # #> type r> base ! ; [then] +: x>x' ( x -- x' ) screen-w swap - ; \ reverse x coordinate + : set-gpios [ifdef] olpc-cl2 0 1e2bc io!@ \ TWSI4_SCL @@ -151,7 +154,7 @@ in? if \ FIXME: only handles one subpacket pbuf 2+ c@ h# 04 = if - screen-w pbuf 4 + w@ - ( x ) + pbuf 4 + w@ x>x' ( x ) pbuf 6 + w@ ( x y ) pbuf 8 + c@ 3 and 0= ( x y down? ) true ( x y buttons true ) @@ -496,9 +499,13 @@ [then] ; -: test-fll-axis ( axis -- ) +: (fll) ( axis# -- ) h# 20 h# 02 h# ee 4 bytes-out h# 1c d# 200 anticipate +; + +: test-fll-axis ( axis -- ) + (fll) pbuf 4 + c@ 2/ 0 do i pbuf 5 + over 3 * + >r ( i r:frag ) 2* dup r@ 1+ c@ r@ c@ 4 rshift h# f and test-fll-signal @@ -516,6 +523,86 @@ +[ifdef] nn-watch-fll \ forced LED levels test, graphical variant + + +d# 30 value r \ size of blocks +d# 1200 2/ r 2/ - value yx \ the y axis' stable x coordinate +d# 900 2/ r 2/ - value xy \ the x axis' stable y coordinate + +: bigdot ( x y -- ) + pixcolor @ -rot r r ( color x y w h ) + fill-rectangle-noff ( ) +; + +: signal>colour ( signal-value -- colour ) + d# 3 rshift dup d# 5 lshift over d# 11 lshift or or +; + +: ys>xy ( signal# -- x y ) + yx swap ( x signal# ) + screen-h yleds 2* / * ( x y ) + r 2/ + ( x y ) +; + +: xs>xy ( signal# -- x y ) + 2+ screen-w xleds 2* / * r - ( x ) + x>x' ( x' ) + r 2/ + + xy ( x y ) +; + +: big>little ( x y -- x' y' ) + r 2/ + 3 - swap + r 2/ + 2 - swap +; + +0 value axis# +: watch-fll-signal ( signal# signal-value led-level -- ) + >r ( signal# signal-value r: led-level ) + signal>colour pixcolor ! ( signal# r: led-level ) + axis# if ( signal# r: led-level ) \ y + ys>xy + else ( signal# r: led-level ) \ x + xs>xy + then ( x y r: led-level ) + 2dup bigdot ( x y r: led-level ) + r> ( x y led-level ) + h# c > if ( x y ) + white pixcolor ! ( x y ) + big>little ( x' y' ) + dot ( ) + else + 2drop + then ( ) +; + +: watch-fll-axis ( axis# -- ) + dup to axis# ( axis# ) + (fll) + pbuf 4 + c@ 2/ 0 do + i pbuf 5 + over 3 * + >r ( i r:frag ) + 2* dup r@ 1+ c@ r@ c@ 4 rshift h# f and watch-fll-signal + 1+ r@ 2+ c@ r@ c@ h# f and watch-fll-signal + r> drop ( ) + loop +; + +: watch-fll + black 0 0 screen-w screen-h fill-rectangle-noff + begin + 0 watch-fll-axis + 1 watch-fll-axis key? + until + key drop + page +; + + +[then] + + + : press ( line$ -- ) type ." , press a key" @@ -550,7 +637,7 @@ pbuf 2+ c@ h# 04 = if \ touch notification event pbuf 3 + c@ 0 do \ per subpacket loop pbuf 4 + i 9 * + >r ( r:addr ) - screen-w r@ w@ - ( x r:addr ) + r@ w@ x>x' ( x r:addr ) r@ wa1+ w@ ( x y r:addr ) r> 4 + c@ 2 rshift setcolor ( x y ) (ev) ( )

1 0

[commit] r3287 - in cpu: arm/olpc x86/pc/olpc/via
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Wed Sep 5 05:29:58 2012 New Revision: 3287 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3287 Log: OLPC - suppress image size smaller than disk size now that builds size themselves to available space Modified: cpu/arm/olpc/banner.fth cpu/x86/pc/olpc/via/banner.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Wed Sep 5 04:58:47 2012 (r3286) +++ cpu/arm/olpc/banner.fth Wed Sep 5 05:29:58 2012 (r3287) @@ -87,13 +87,6 @@ red-letters ." WARNING! OS image larger than internal storage device!" cr cancel - exit - then - - internal-partition-end d# 1,000,000,000. d+ internal-disk-size d< if - red-letters - ." WARNING! OS image much smaller than internal storage device" cr - cancel then ; Modified: cpu/x86/pc/olpc/via/banner.fth ============================================================================== --- cpu/x86/pc/olpc/via/banner.fth Wed Sep 5 04:58:47 2012 (r3286) +++ cpu/x86/pc/olpc/via/banner.fth Wed Sep 5 05:29:58 2012 (r3287) @@ -87,13 +87,6 @@ red-letters ." WARNING! OS image larger than internal storage device!" cr cancel - exit - then - - internal-partition-end d# 1,000,000,000. d+ internal-disk-size d< if - red-letters - ." WARNING! OS image much smaller than internal storage device" cr - cancel then ;

1 0

[commit] r3286 - cpu/arm/olpc/cl4
by repository service Sept. 5, 2012

Sept. 5, 2012

Author: quozl Date: Wed Sep 5 04:58:47 2012 New Revision: 3286 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3286 Log: Q7A12 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Wed Sep 5 03:38:05 2012 (r3285) +++ cpu/arm/olpc/cl4/fw-version.fth Wed Sep 5 04:58:47 2012 (r3286) @@ -1,7 +1,7 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 11 +macro: FW_MINOR 12 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if]

1 0