[openfirmware] r1424 - in cpu/x86/pc/olpc: . via
svn at openfirmware.info
svn at openfirmware.info
Mon Oct 19 20:27:59 CEST 2009
Author: wmb
Date: 2009-10-19 20:27:59 +0200 (Mon, 19 Oct 2009)
New Revision: 1424
Modified:
cpu/x86/pc/olpc/devices.fth
cpu/x86/pc/olpc/security.fth
cpu/x86/pc/olpc/via/fsupdate.fth
Log:
OLPC trac 9396 - Adjusted secure boot and fs-update devices lists
to work on both XO-1 and XO-1.5, adding "int" and "ext" aliases for XO-1.
Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth 2009-10-15 23:43:00 UTC (rev 1423)
+++ cpu/x86/pc/olpc/devices.fth 2009-10-19 18:27:59 UTC (rev 1424)
@@ -136,6 +136,8 @@
devalias d disk
devalias n nand
devalias sd /sd/disk
+devalias int nand
+devalias ext sd
dev /8042
patch false ctlr-selftest open
Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth 2009-10-15 23:43:00 UTC (rev 1423)
+++ cpu/x86/pc/olpc/security.fth 2009-10-19 18:27:59 UTC (rev 1424)
@@ -1062,7 +1062,7 @@
" dk" find-tag dup if nip nip then
;
-: all-devices$ ( -- list$ ) " disk: sd: nand:" ;
+: all-devices$ ( -- list$ ) " disk: ext: int:" ;
: secure-startup ( -- )
in-factory? if
Modified: cpu/x86/pc/olpc/via/fsupdate.fth
===================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth 2009-10-15 23:43:00 UTC (rev 1423)
+++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-10-19 18:27:59 UTC (rev 1424)
@@ -309,10 +309,10 @@
repeat ( rem$ )
2drop
;
-: update-devices " disk: sd: http:\\172.18.0.1" ;
+: update-devices " disk: ext: http:\\172.18.0.1" ;
: try-fs-update ( -- )
." Searching for a NAND file system update image." cr
- " disk: sd:" fs-update-from-list
+ " disk: ext:" fs-update-from-list
[ifdef] Later
." Trying NANDblaster" cr
['] nandblaster catch 0= if exit then
More information about the openfirmware
mailing list