March 2009 - openfirmware - mail.coreboot.org

r1128 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 31, 2009

March 31, 2009

Author: wmb Date: 2009-03-31 02:58:15 +0200 (Tue, 31 Mar 2009) New Revision: 1128 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E37 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-31 00:44:18 UTC (rev 1127) +++ cpu/x86/pc/olpc/versions.fth 2009-03-31 00:58:15 UTC (rev 1128) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 36 +macro: FW_MINOR 37 \ The EC microcode macro: EC_VERSION e34

1 0

r1127 - in cpu/x86/pc: . olpc
by svn＠openfirmware.info March 31, 2009

March 31, 2009

Author: wmb Date: 2009-03-31 02:44:18 +0200 (Tue, 31 Mar 2009) New Revision: 1127 Modified: cpu/x86/pc/biosints.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/gamekeys.fth Log: OLPC - In manufacturing, change the boot order so that SD is after NAND. Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2009-03-24 17:54:51 UTC (rev 1126) +++ cpu/x86/pc/biosints.fth 2009-03-31 00:44:18 UTC (rev 1127) @@ -1165,6 +1165,7 @@ 0 0 " " " /" begin-package " xp" device-name : open + bypass-bios-boot? if false exit then " sd:1" ntfs? if " sd:0" set-hd-boot true exit Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-03-24 17:54:51 UTC (rev 1126) +++ cpu/x86/pc/olpc/fw.bth 2009-03-31 00:44:18 UTC (rev 1127) @@ -515,6 +515,18 @@ \ .built cr ; +: ?factory-boot-sequence ( -- flag ) + \ TS is the "test station" tag. Its value is set to "DL" at the + \ end of manufacturing test. + " TS" find-tag if ( adr len ) + ?-null " DL" $= 0= if + " disk:\boot\olpc.fth nand:\boot\olpc.fth /xp sd:\boot\olpc.fth /prober /usb/wlan" + to boot-device + then + then +; + + : console-start ( -- ) [ifdef] rom-loaded video-map cr @@ -589,6 +601,7 @@ no-page ?factory-mode + ?factory-boot-sequence console-start Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2009-03-24 17:54:51 UTC (rev 1126) +++ cpu/x86/pc/olpc/gamekeys.fth 2009-03-31 00:44:18 UTC (rev 1127) @@ -60,3 +60,5 @@ drop (cr kill-line ; ' (hold-message) to hold-message + +: bypass-bios-boot? ( -- flag ) button-square game-key? ;

1 0

r1126 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 24, 2009

March 24, 2009

Author: wmb Date: 2009-03-24 18:54:51 +0100 (Tue, 24 Mar 2009) New Revision: 1126 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E36 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-24 03:54:11 UTC (rev 1125) +++ cpu/x86/pc/olpc/versions.fth 2009-03-24 17:54:51 UTC (rev 1126) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 35 +macro: FW_MINOR 36 \ The EC microcode macro: EC_VERSION e34

1 0

r1125 - cpu/x86/pc
by svn＠openfirmware.info March 24, 2009

March 24, 2009

Author: wmb Date: 2009-03-24 04:54:11 +0100 (Tue, 24 Mar 2009) New Revision: 1125 Modified: cpu/x86/pc/biosints.fth Log: OLPC - fixed problem with Windows full-screen text mode. Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2009-03-23 23:11:56 UTC (rev 1124) +++ cpu/x86/pc/biosints.fth 2009-03-24 03:54:11 UTC (rev 1125) @@ -126,10 +126,8 @@ ; : set-mode3 ( -- ) - stdout @ if - " text-mode3" stdout @ $call-method - stdout off - then + stdout off \ Stop using OFW driver + " text-mode3" screen-ih $call-method ; \ VBE status: AL = 4f -> function supported else not supported \ AH = 0: success 1: fail 2: not supported in this config 3: invalid in this mode

1 0

r1124 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-24 00:11:56 +0100 (Tue, 24 Mar 2009) New Revision: 1124 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E35 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-23 22:55:21 UTC (rev 1123) +++ cpu/x86/pc/olpc/versions.fth 2009-03-23 23:11:56 UTC (rev 1124) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 34 +macro: FW_MINOR 35 \ The EC microcode macro: EC_VERSION e34

1 0

r1123 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-23 23:55:21 +0100 (Mon, 23 Mar 2009) New Revision: 1123 Added: cpu/x86/pc/olpc/HOWTO-keyjector Log: Added HOWTO-keyjector instructions. Added: cpu/x86/pc/olpc/HOWTO-keyjector =================================================================== --- cpu/x86/pc/olpc/HOWTO-keyjector (rev 0) +++ cpu/x86/pc/olpc/HOWTO-keyjector 2009-03-23 22:55:21 UTC (rev 1123) @@ -0,0 +1,52 @@ +A keyjector is an intermediate firmware release that installs +additional customer-specific security keys in manufacturing data. +OLPC signs is so it can be auto-reflashed. When it starts, it inserts +the new keys, then replaces itself with a higher-rev firmware version +so it doesn't run again. + +The version number for the keyjector is between two "real" releases. +It has to be higher than any version number that might already exist +on the customer's target machines. For example, if the customer has +only q2e34 and earlier, the keyjector version might be q2e34x, and the +successor firmware might be q2e35. In the worst case, this means that +you would have to make a new real firmware release so there is a +successor (q2e35 in this example). + +The keyjector itself is built with an abbreviated release procedure, +within the existing build tree for the release right before the +successor. In the example, the keyjector would be build in the +existing tree for q2e34. + +The steps are: + +* Unpack the tar file containing the new keys into, for example, /home/wmb/Uruguay + +* Note the list of key names, e.g. d0 a1 o1 s1 t1 w1 + +$ cd /home/firmware/q2e34/openfirmware/cpu/x86/pc/olpc/build + +* Edit ../keyjector.bth : + +** Change the "macro: FW_MINOR " line to the keyjector's intermediate version number, e.g. 34x +** Changing lines like below to the right file and key names. + " /space/bios-crypto/build/k2.public" " s1" $add-dropin + +* Edit ../keyjector.fth : + +** In wrong-sku?, set the list of SKUs. This guards against "hijacking" of other country's laptops. +** In keyject-expired?, set an appropriate expiration date for the keyjector. +** In new-key-list$, set the key list. + +$ ./build keyject + +It should build really quickly, because it is using nearly all the same modules as the base build. + +* Verify the version number in the new file: + +** $ xxd q2e34x.rom | tail -4 + +* If you have to make a new "real" release so the keyjector has a successor, do so now. + +* Sign the keyjector, naming the .zip file "bootfw.zip". + +* Sign the successor firmware, name the .zip file "bootfw2.zip"

1 0

r1122 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-23 23:44:45 +0100 (Mon, 23 Mar 2009) New Revision: 1122 Modified: cpu/x86/pc/olpc/keyject.bth Log: Minor streamlining of keyjector build script. Modified: cpu/x86/pc/olpc/keyject.bth =================================================================== --- cpu/x86/pc/olpc/keyject.bth 2009-03-10 09:11:37 UTC (rev 1121) +++ cpu/x86/pc/olpc/keyject.bth 2009-03-23 22:44:45 UTC (rev 1122) @@ -31,7 +31,8 @@ build-now -fload ${BP}/cpu/x86/pc/olpc/kjversions.fth +fload ${BP}/cpu/x86/pc/olpc/versions.fth +macro: FW_MINOR 34x " macro: FW_VERSION Q2${FW_MAJOR}${FW_MINOR}" expand$ eval

1 0

r1121 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 10, 2009

March 10, 2009

Author: rsmith Date: 2009-03-10 10:11:37 +0100 (Tue, 10 Mar 2009) New Revision: 1121 Modified: cpu/x86/pc/olpc/mcastnand.bth Log: OLPC: Fix build system to work with the new cgit web interface Modified: cpu/x86/pc/olpc/mcastnand.bth =================================================================== --- cpu/x86/pc/olpc/mcastnand.bth 2009-03-10 08:45:08 UTC (rev 1120) +++ cpu/x86/pc/olpc/mcastnand.bth 2009-03-10 09:11:37 UTC (rev 1121) @@ -11,11 +11,9 @@ [then] [else] " rm -rf multicast-nand" $sh - -" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git?p=users/wmb/multicast-nand\;a=snapshot;h=${MCNAND…" expand$ $sh +" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git/users/wmb/multicast-nand/snapshot/multicast-nand-…" expand$ $sh " tar xfz multicast-nand.tar.gz" $sh -" mv users/wmb/multicast-nand ." $sh -" rm -rf users/wmb" $sh +" mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh " rm multicast-nand.tar.gz" $sh [then]

1 0

r1120 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 10, 2009

March 10, 2009

Author: rsmith Date: 2009-03-10 09:45:08 +0100 (Tue, 10 Mar 2009) New Revision: 1120 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: q2e34 - Change version back to e series and use ec code pq2e34 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-10 08:10:29 UTC (rev 1119) +++ cpu/x86/pc/olpc/versions.fth 2009-03-10 08:45:08 UTC (rev 1120) @@ -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 34 \ The EC microcode -macro: EC_VERSION 1_1_2 +macro: EC_VERSION e34 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r1119 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 10, 2009

March 10, 2009

Author: wmb Date: 2009-03-10 09:10:29 +0100 (Tue, 10 Mar 2009) New Revision: 1119 Modified: cpu/x86/pc/olpc/setwp.fth Log: OLPC - added -null to enable-security to fix confirmation by serial number. Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2009-03-03 23:55:28 UTC (rev 1118) +++ cpu/x86/pc/olpc/setwp.fth 2009-03-10 08:10:29 UTC (rev 1119) @@ -11,6 +11,7 @@ board-revision h# b48 < abort" Only supported on B4 and later" h# fffefffe 2 " wp" $= if ." wp is already set" cr exit then " SN" find-tag 0= abort" No serial number (SN tag); enabling security would brick me." ( sn$ ) + -null ( sn$' ) safe-parse-word ( sn$ confirmation$ ) $= 0= abort" Confirmation code mismatch"

1 0