Author: quozl Date: Fri Jan 28 04:00:03 2011 New Revision: 2158 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2158
Log: Reinstate machine signature check using prefix of model property as used by the device tree. Tested by attempting to flash Q4A12 on XO-1.5. #10616.
Modified: dev/olpc/spiflash/spiui.fth
Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Thu Jan 27 20:05:17 2011 (r2157) +++ dev/olpc/spiflash/spiui.fth Fri Jan 28 04:00:03 2011 (r2158) @@ -68,7 +68,8 @@ /flash <> abort" Image file is the wrong length"
." Got firmware version: " - flash-buf h# f.ffc0 + h# 10 type cr + flash-buf h# f.ffc0 + dup h# 10 type cr ( adr ) + h# ffff.ffc0 3 comp abort" Wrong machine signature"
?crc
@@ -276,7 +277,8 @@ : check-firmware-image ( adr len -- adr len ) dup /flash <> abort" Wrong image length" ( adr len ) 2dup + h# 40 - ( adr len signature-adr ) - dup " CL1" comp abort" No firmware signature" ( adr len signature-adr ) + h# ffff.ffc0 3 comp abort" Wrong machine signature" + ( adr len signature-adr ) ." Firmware: " h# 10 type ( adr len ) \ XXX add some more sanity checks ;