by svn＠openfirmware.info
Author: wmb
Date: 2009-01-29 18:03:19 +0100 (Thu, 29 Jan 2009)
New Revision: 1095
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2E30
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2009-01-29 17:03:01 UTC (rev 1094)
+++ cpu/x86/pc/olpc/versions.fth 2009-01-29 17:03:19 UTC (rev 1095)
@@ -1,11 +1,11 @@
\ Version numbers of items included in the OLPC firmware image
\ The overall firmware revision
-macro: FW_MAJOR F
-macro: FW_MINOR 02
+macro: FW_MAJOR E
+macro: FW_MINOR 30
\ The EC microcode
-macro: EC_VERSION 1_1_1
+macro: EC_VERSION e21
\ Alternate command for getting EC microcode, for testing new versions.
\ Temporarily uncomment the line and modify the path as necessary
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-29 18:03:01 +0100 (Thu, 29 Jan 2009)
New Revision: 1094
Modified:
cpu/x86/pc/olpc/gui.fth
Log:
OLPC GUI - fixed a minor icon layout problem
Modified: cpu/x86/pc/olpc/gui.fth
===================================================================
--- cpu/x86/pc/olpc/gui.fth 2009-01-28 23:24:58 UTC (rev 1093)
+++ cpu/x86/pc/olpc/gui.fth 2009-01-29 17:03:01 UTC (rev 1094)
@@ -442,9 +442,9 @@
: show-dev-icon ( devname$ -- )
next-icon-xy ( devname$ x y )
2dup to icon-xy ( devname$ x y )
- 2dup image-width 0 d+ to next-icon-xy ( devname$ x y )
d# 5 d# 77 d+ to next-dot-xy ( devname$ )
show-icon ( )
+ next-icon-xy image-width 0 d+ to next-icon-xy ( devname$ x y )
;
: linux-hook-unfreeze
by svn＠openfirmware.info
Author: rsmith
Date: 2009-01-29 00:24:58 +0100 (Thu, 29 Jan 2009)
New Revision: 1093
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
OLPC: q2f02
- New EC Ver 1_1 series
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2009-01-28 22:57:38 UTC (rev 1092)
+++ cpu/x86/pc/olpc/versions.fth 2009-01-28 23:24:58 UTC (rev 1093)
@@ -1,11 +1,11 @@
\ Version numbers of items included in the OLPC firmware image
\ The overall firmware revision
-macro: FW_MAJOR E
-macro: FW_MINOR 29
+macro: FW_MAJOR F
+macro: FW_MINOR 02
\ The EC microcode
-macro: EC_VERSION e21
+macro: EC_VERSION 1_1_1
\ Alternate command for getting EC microcode, for testing new versions.
\ Temporarily uncomment the line and modify the path as necessary
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-28 23:57:38 +0100 (Wed, 28 Jan 2009)
New Revision: 1092
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2E29
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2009-01-28 22:55:52 UTC (rev 1091)
+++ cpu/x86/pc/olpc/versions.fth 2009-01-28 22:57:38 UTC (rev 1092)
@@ -2,7 +2,7 @@
\ The overall firmware revision
macro: FW_MAJOR E
-macro: FW_MINOR 28
+macro: FW_MINOR 29
\ The EC microcode
macro: EC_VERSION e21
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-28 23:55:52 +0100 (Wed, 28 Jan 2009)
New Revision: 1091
Modified:
cpu/x86/pc/olpc/fw.bth
cpu/x86/pc/olpc/gui.fth
cpu/x86/pc/olpc/security.fth
Log:
OLPC - fixed bugs in new pretty boot default.
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2009-01-28 19:06:46 UTC (rev 1090)
+++ cpu/x86/pc/olpc/fw.bth 2009-01-28 22:55:52 UTC (rev 1091)
@@ -619,7 +619,9 @@
?usb-keyboard
auto-boot
- unfreeze visible
+ frozen? ( frozen? )
+ unfreeze visible ( frozen? )
+ if banner then \ Reissue banner if it was suppressed
blue-letters ." Type 'help' for more information." black-letters
cr cr
Modified: cpu/x86/pc/olpc/gui.fth
===================================================================
--- cpu/x86/pc/olpc/gui.fth 2009-01-28 19:06:46 UTC (rev 1090)
+++ cpu/x86/pc/olpc/gui.fth 2009-01-28 22:55:52 UTC (rev 1091)
@@ -390,6 +390,7 @@
;
' (?show-device) to ?show-device
+: frozen? ( -- flag ) " vga?" $call-screen 0= ;
: dcon-freeze ( -- ) 0 " set-source" $call-screen d# 30 ms ;
: dcon-unfreeze ( -- ) 1 " set-source" $call-screen d# 30 ms ;
@@ -439,10 +440,10 @@
;
: show-dev-icon ( devname$ -- )
- next-icon-xy ( devname$ )
- 2dup to icon-xy ( devname$ )
- 2dup image-width 0 d+ to next-icon-xy ( devname$ )
- 2dup d# 5 d# 77 d+ to next-dot-xy ( devname$ )
+ next-icon-xy ( devname$ x y )
+ 2dup to icon-xy ( devname$ x y )
+ 2dup image-width 0 d+ to next-icon-xy ( devname$ x y )
+ d# 5 d# 77 d+ to next-dot-xy ( devname$ )
show-icon ( )
;
Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth 2009-01-28 19:06:46 UTC (rev 1090)
+++ cpu/x86/pc/olpc/security.fth 2009-01-28 22:55:52 UTC (rev 1091)
@@ -4,7 +4,9 @@
\ Specs at http://wiki.laptop.org/go/Firmware_Security
: ?unfreeze ( -- )
- game-key@ button-check and if visible banner unfreeze then
+ game-key@ button-check and if
+ frozen? if unfreeze visible banner then
+ then
;
true value debug-security?
@@ -37,8 +39,8 @@
." Use power button to power off" cr
begin halt again
else
- ." Powering off in 10 seconds" cr
- d# 10000 ms power-off
+ ." Powering off in 30 seconds" cr
+ d# 30000 ms power-off
then
;
@@ -873,7 +875,6 @@
has-developer-key? if ( list$ )
2drop ( )
true to security-off?
- visible unfreeze
show-unlock
true exit
then ( list$ )
by svn＠openfirmware.info
Author: rsmith
Date: 2009-01-28 20:06:46 +0100 (Wed, 28 Jan 2009)
New Revision: 1090
Modified:
dev/olpc/kb3700/ecio.fth
Log:
OLPC: Add a bunch of extra EC interaction words that were kicking around in my tree
Modified: dev/olpc/kb3700/ecio.fth
===================================================================
--- dev/olpc/kb3700/ecio.fth 2009-01-28 17:20:38 UTC (rev 1089)
+++ dev/olpc/kb3700/ecio.fth 2009-01-28 19:06:46 UTC (rev 1090)
@@ -8,6 +8,13 @@
: ec@ ( index -- b ) wbsplit iobase 1+ pc! iobase 2+ pc! iobase 3 + pc@ ;
: ec! ( b index -- ) wbsplit iobase 1+ pc! iobase 2+ pc! iobase 3 + pc! ;
+: autowak! ( value -- ) f64f ec! ;
+: autowak-on ( -- ) 1 autowak! ;
+: autowak-off ( -- ) 0 autowak! ;
+: autowak-delay ( delay -- ) wbsplit f650 ec! f651 ec! ;
+: kbc-debug-on ( -- ) 1 fbfe ec! ;
+: kbc-debug-off ( -- ) 0 fbfe ec! ;
+
: ec-dump ( offset len -- )
." Addr 0 1 2 3 4 5 6 7 8 9 a b c d e f" cr cr
push-hex
@@ -156,9 +163,11 @@
: ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ;
: wlan-freeze ( -- ) h# 35 ec-cmd ;
: sci-queue@ ( -- b ) h# 84 ec-cmd-b@ ;
+: ec-api-ver@ ( -- b ) h# 08 ec-cmd-b@ ;
: sci-inhibit ( -- ) h# 32 ec-cmd ;
: sci-uninhibit ( -- ) h# 34 ec-cmd ;
+: sci-inhibit-delay ( delay -- ) wbsplit f64d ec! f64e ec! ;
: ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ;
0 [if]
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-28 18:20:38 +0100 (Wed, 28 Jan 2009)
New Revision: 1089
Modified:
dev/mmc/sdhci/sdhci.fth
Log:
sdhci.fth - corrected a misleading comment. No functional change.
Modified: dev/mmc/sdhci/sdhci.fth
===================================================================
--- dev/mmc/sdhci/sdhci.fth 2009-01-28 17:20:10 UTC (rev 1088)
+++ dev/mmc/sdhci/sdhci.fth 2009-01-28 17:20:38 UTC (rev 1089)
@@ -184,8 +184,7 @@
: intstat-on ( -- )
h# 00cb h# 34 cw! \ normal interrupt status en reg
\ Enable: Remove, Insert, DMA Interrupt, Transfer Complete, CMD Complete
- \ Disable: Card Interrupt, Remove, Insert, Read Ready,
- \ Write Ready, Block Gap
+ \ Disable: Card Interrupt, Read Ready, Write Ready, Block Gap
h# f1ff h# 36 cw! \ error interrupt status en reg
;
: intstat-off ( -- ) h# c0 h# 34 cl! ; \ Remove, Insert on, others off
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-28 18:20:10 +0100 (Wed, 28 Jan 2009)
New Revision: 1088
Modified:
cpu/x86/pc/olpc/iflash.fth
Log:
OLPC - Added some code to iflash.fth to clear out junk in the
manufacturing data area after Inysde BIOS has polluted it.
Not part of the main OLPC build.
Modified: cpu/x86/pc/olpc/iflash.fth
===================================================================
--- cpu/x86/pc/olpc/iflash.fth 2009-01-28 17:09:50 UTC (rev 1087)
+++ cpu/x86/pc/olpc/iflash.fth 2009-01-28 17:20:10 UTC (rev 1088)
@@ -22,6 +22,15 @@
/mfg-data-merge move
;
+\ unpollute-mfg-data clears the Insyde BIOS residue from the beginning
+\ of the manufacturing data area, restoring it to erased state
+: unpollute-mfg-data ( -- )
+ rom-pa mfg-data-offset + l@ -1 <> abort" Mfg data area is not polluted"
+ get-mfg-data
+ mfg-data-buf mfg-data-merge-offset h# ff fill
+ put-mfg-data
+;
+
: get-insyde ( ["filename"] -- )
parse-word ( adr len )
dup 0= if 2drop " u:\insyde.rom" then ( adr len )
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-28 18:09:50 +0100 (Wed, 28 Jan 2009)
New Revision: 1087
Modified:
cpu/x86/pc/biosints.fth
cpu/x86/pc/olpc/fw.bth
cpu/x86/pc/olpc/gui.fth
cpu/x86/pc/olpc/security.fth
Log:
OLPC - default to pretty boot even when not secure.
Modified: cpu/x86/pc/biosints.fth
===================================================================
--- cpu/x86/pc/biosints.fth 2009-01-28 17:08:08 UTC (rev 1086)
+++ cpu/x86/pc/biosints.fth 2009-01-28 17:09:50 UTC (rev 1087)
@@ -1102,7 +1102,11 @@
0 0 " " " /" begin-package
" xp" device-name
: open
- " sd:1" ntfs? if " sd:0" set-hd-boot true exit then
+ " sd:1" ntfs? if
+ " sd:0" set-hd-boot
+ dcon-unfreeze unfreeze
+ true exit
+ then
false
;
: close ;
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2009-01-28 17:08:08 UTC (rev 1086)
+++ cpu/x86/pc/olpc/fw.bth 2009-01-28 17:09:50 UTC (rev 1087)
@@ -616,11 +616,11 @@
secure-startup
unblock-exceptions
['] (interrupt-auto-boot?) to interrupt-auto-boot?
- text-on
- banner
?usb-keyboard
auto-boot
+ unfreeze visible
+
blue-letters ." Type 'help' for more information." black-letters
cr cr
Modified: cpu/x86/pc/olpc/gui.fth
===================================================================
--- cpu/x86/pc/olpc/gui.fth 2009-01-28 17:08:08 UTC (rev 1086)
+++ cpu/x86/pc/olpc/gui.fth 2009-01-28 17:09:50 UTC (rev 1087)
@@ -393,16 +393,70 @@
: dcon-freeze ( -- ) 0 " set-source" $call-screen d# 30 ms ;
: dcon-unfreeze ( -- ) 1 " set-source" $call-screen d# 30 ms ;
+\ === Stuff moved from security.fth ===
+
+: text-on screen-ih stdout ! ;
+
+: visible dcon-unfreeze text-on ;
+
+0 0 2value next-icon-xy
+0 0 2value next-dot-xy
+d# 463 d# 540 2constant progress-xy
+
+: show-going ( -- )
+ background-rgb rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen
+ d# 588 d# 638 to icon-xy " bigdot" show-icon
+ " vga?" $call-screen 0= if dcon-unfreeze dcon-freeze then
+;
+: show-x ( -- ) " x" show-icon ;
+: show-sad ( -- )
+ icon-xy
+ d# 552 d# 283 to icon-xy " sad" show-icon
+ to icon-xy
+;
+: show-lock ( -- ) " lock" show-icon ;
+: show-unlock ( -- ) " unlock" show-icon ;
+: show-plus ( -- ) " plus" show-icon ;
+: show-minus ( -- ) " minus" show-icon ;
+: show-child ( -- )
+ " erase-screen" $call-screen
+ d# 552 d# 384 to icon-xy " rom:xogray.565" $show-opaque
+ progress-xy to next-icon-xy \ For boot progress reports
+;
+
+0 [if]
+: show-warnings ( -- )
+ " erase-screen" $call-screen
+ d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque
+ dcon-freeze
+;
+[then]
+
+0 value alternate?
+: show-dot ( -- )
+ next-dot-xy to icon-xy next-dot-xy d# 16 0 d+ to next-dot-xy ( )
+ alternate? if " yellowdot" else " lightdot" then show-icon
+;
+
+: show-dev-icon ( devname$ -- )
+ next-icon-xy ( devname$ )
+ 2dup to icon-xy ( devname$ )
+ 2dup image-width 0 d+ to next-icon-xy ( devname$ )
+ 2dup d# 5 d# 77 d+ to next-dot-xy ( devname$ )
+ show-icon ( )
+;
+
: linux-hook-unfreeze
[ ' linux-hook behavior compile, ]
;
: linux-hook-freeze
[ ' linux-hook behavior compile, ]
- dcon-freeze
+ show-going
;
: freeze ( -- ) ['] linux-hook-freeze to linux-hook ;
: unfreeze ( -- ) ['] linux-hook-unfreeze to linux-hook ;
+
\ LICENSE_BEGIN
\ Copyright (c) 2006 FirmWorks
\
Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth 2009-01-28 17:08:08 UTC (rev 1086)
+++ cpu/x86/pc/olpc/security.fth 2009-01-28 17:09:50 UTC (rev 1087)
@@ -3,19 +3,10 @@
\ Specs at http://wiki.laptop.org/go/Firmware_Security
-: text-on screen-ih stdout ! ;
-
-: visible dcon-unfreeze text-on ;
-
: ?unfreeze ( -- )
game-key@ button-check and if visible banner unfreeze then
;
-0 0 2value base-xy
-0 0 2value next-xy
-d# 463 d# 540 2constant progress-xy
-d# 552 d# 283 2constant sad-xy
-
true value debug-security?
: ?lease-debug ( msg$ -- )
debug-security? if type else 2drop then
@@ -51,42 +42,12 @@
then
;
-: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ;
-
-: show-going ( -- )
- background-rgb rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen
- d# 588 d# 638 to icon-xy " bigdot" show-icon
- " vga?" $call-screen 0= if dcon-unfreeze dcon-freeze then
-;
-: show-x ( -- ) " x" show-icon ;
-: show-sad ( -- )
- icon-xy
- sad-xy to icon-xy " sad" show-icon
- to icon-xy
-;
: .security-failure ( error$ -- )
visible red-letters type black-letters cr
show-sad
security-failure
;
-: show-lock ( -- ) " lock" show-icon ;
-: show-unlock ( -- ) " unlock" show-icon ;
-: show-child ( -- )
- " erase-screen" $call-screen
- d# 552 d# 384 to icon-xy " rom:xogray.565" $show-opaque
- progress-xy to icon-xy \ For boot progress reports
-;
-
-0 [if]
-: show-warnings ( -- )
- " erase-screen" $call-screen
- d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque
- dcon-freeze
-;
-[then]
-
-
h# 20 buffer: cn-buf \ filename prefix - either "act" or "run"
h# 20 buffer: fn-buf \ filename tail - either "os" or "rd"
h# 100 buffer: pn-buf \ pathname - either "\boot" or "\boot-alt"
@@ -617,8 +578,8 @@
then ( actual -eof? )
while ( actual )
sec-line-buf swap check-lease case ( -1|0|1 )
- 1 of r> close-file drop " unlock" show-icon true exit endof
- -1 of r> close-file drop " lock" show-icon false exit endof
+ 1 of r> close-file drop show-unlock true exit endof
+ -1 of r> close-file drop show-lock false exit endof
endcase
repeat ( actual )
drop ( )
@@ -641,11 +602,6 @@
cn-buf place
;
-0 value alternate?
-: show-dot ( -- )
- alternate? if " yellowdot" else " lightdot" then show-icon
-;
-
: set-alternate ( -- )
button-o game-key? if true to alternate? exit then
h# 82 cmos@ [char] A = if
@@ -677,7 +633,7 @@
['] load-path behavior >r ( r: xt )
['] ramdisk-buf to load-path ( r: xt )
- d# 16 0 +icon-xy show-dot
+ show-dot
\ cn-buf is already set as a result of the ?leased that
\ happened before loading the OS file
" rd" bundle-present? if
@@ -856,16 +812,16 @@
: load-from-device ( devname$ -- done? )
- d# 16 0 +icon-xy show-dot
+ show-dot
null$ cn-buf place
" bootfw" bundle-present? if
" FW found - " ?lease-debug
img$ firmware-up-to-date? if
- " plus" show-icon
+ show-plus
" current FW is up-to-date" ?lease-debug-cr
else
- " minus" show-icon
+ show-minus
" new - " ?lease-debug
fwkey$ to pubkey$
img$ sig$ fw-valid? if
@@ -875,10 +831,10 @@
then
then
- d# 16 0 +icon-xy show-dot
+ show-dot
?leased \ Sets cn-buf
- d# 16 0 +icon-xy show-dot
+ show-dot
" os" bundle-present? if
" OS found - " ?lease-debug
oskey$ to pubkey$
@@ -904,20 +860,16 @@
;
: load-from-list ( list$ -- devkey? )
- " dev /jffs2-file-system ' ?unfreeze to scan-callout dend" eval
-
begin dup while ( list$ )
?unfreeze
bl left-parse-string ( list$ devname$ )
2dup dn-buf place ( list$ devname$ )
- show-icon ( list$ xy )
- icon-xy to base-xy
- icon-xy image-width 0 d+ to next-xy ( list$ )
+ show-dev-icon ( list$ )
filesystem-present? if ( list$ )
- d# 5 d# 77 +icon-xy show-dot ( list$ )
+ show-dot ( list$ )
has-developer-key? if ( list$ )
2drop ( )
true to security-off?
@@ -933,14 +885,12 @@
" init-program" $find if
set-cmdline
execute
- show-going go
+ go
then
show-x
security-failure
then
then ( list$ )
-
- next-xy to icon-xy ( list$ )
repeat ( list$ )
2drop false ( )
;
@@ -967,18 +917,23 @@
\ button-rotate game-key? if show-warnings then
show-child
- ?force-secure
-
- secure? 0= if visible unfreeze exit then
-
button-check game-key? if
unfreeze visible banner
else
freeze dcon-freeze
+
+ \ The following is a hack to let the user unfreeze the screen during
+ \ the several-second period while JFFS2 is scanning the NAND
+ " dev /jffs2-file-system ' ?unfreeze to scan-callout dend" eval
then
- persistent-devkey? if true to security-off? visible unfreeze exit then
+ \ The screen may be frozen when we exit, because we want pretty
+ \ boot even when not secure.
+ ?force-secure
+ persistent-devkey? if true to security-off? exit then
+ secure? 0= if exit then
+
get-my-sn if " No serial number" .security-failure then
date-bad? if
by svn＠openfirmware.info
Author: wmb
Date: 2009-01-28 18:08:08 +0100 (Wed, 28 Jan 2009)
New Revision: 1086
Modified:
cpu/x86/pc/olpc/fsupdate.fth
Log:
OLPC multiple key security - allow augmenting 0-suffix keys (this
checkin goes with the last one).
Modified: cpu/x86/pc/olpc/fsupdate.fth
===================================================================
--- cpu/x86/pc/olpc/fsupdate.fth 2009-01-28 16:08:32 UTC (rev 1085)
+++ cpu/x86/pc/olpc/fsupdate.fth 2009-01-28 17:08:08 UTC (rev 1086)
@@ -169,7 +169,7 @@
null$ cn-buf place ( rem$ )
" fs" bundle-present? if ( rem$ )
" Filesystem image found - " ?lease-debug
- fskey$ to pubkeylist$ ( rem$ )
+ fskey$ to pubkey$ ( rem$ )
img$ sig$ sha-valid? if ( rem$ )
2drop ( )
show-unlock ( )
