Author: wmb
Date: Wed Sep 19 07:07:59 2012
New Revision: 3315
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3315
Log:
OLPC XO-4 - Fixed bug introduced by svn 3291. In order to use the bootfw.zip approach to upgrade from Q7B01 to another revision, the filename needs to be /boot/44.zip . This checkin fixes that, so Q7B02 will use the correct /boot/bootfw4.zip .
Modified:
cpu/x86/pc/olpc/security.fth
Modified: cpu/x86/pc/olpc/security.fth
==============================================================================
--- cpu/x86/pc/olpc/security.fth Wed Sep 19 04:58:34 2012 (r3314)
+++ cpu/x86/pc/olpc/security.fth Wed Sep 19 07:07:59 2012 (r3315)
@@ -443,11 +443,11 @@
;
0 value bundle-suffix
: bundle-present? ( fn$ -- flag )
+ 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 ( )
Author: wmb
Date: Sat Sep 15 09:32:29 2012
New Revision: 3307
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3307
Log:
OLPC XO-4 - Removed temporary upgrade-to-2m code, as it is now being done in a script in manufacturing.
Modified:
dev/olpc/spiflash/spiui.fth
Modified: dev/olpc/spiflash/spiui.fth
==============================================================================
--- dev/olpc/spiflash/spiui.fth Fri Sep 14 08:22:45 2012 (r3306)
+++ dev/olpc/spiflash/spiui.fth Sat Sep 15 09:32:29 2012 (r3307)
@@ -70,24 +70,9 @@
;
[ifndef] 2meg h# 20.0000 constant 2meg [then]
-: +1m ( offset -- offset' ) 1meg + ;
-
-\ This is for upgrading an XO-4 with a 2 MiB FLASH part from
-\ a 1 MiB installed OFW image to a 2 MiB OFW image.
-\ After flash-open, /flash is the size of the physical SPI FLASH device.
-\ On exit, /flash is the size of the image, i.e. the amount to program.
-\ /rom is the size of the image that is currently running.
-: ?upgrade-to-2mb ( len -- len )
- flash-open \ Sets /flash according to the device installed
- dup 2meg = /rom 1meg = and /flash 2meg = and if
- signature-offset +1m to signature-offset
- mfg-data-offset +1m to mfg-data-offset
- crc-offset +1m to crc-offset
- then
-;
: ?image-valid ( len -- )
- flash-open \ Sets /flash according to the device installed
+ flash-open \ Sets /flash to the size of the SPI FLASH device
/flash <> abort" Image file is the wrong length"
." Got firmware version: "