Changeset 2159


Ignore:
Timestamp:
Jan 31, 2011 1:36:17 AM (2 years ago)
Author:
quozl
Message:

Change machine signature check to use a value stored in dictionary
instead of SPI FLASH. #10616. Not tested on XO-1.75 A2. Tested on
XO-1.5. (Build broken on XO-1 as of 2152, reset-port undefined).

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • cpu/arm/olpc/1.75/config.fth

    r2092 r2159  
    77fload ${BP}/cpu/arm/olpc/1.75/addrs.fth 
    88fload ${BP}/cpu/arm/mmp2/hwaddrs.fth 
     9 
     10create machine-signature ," CL2" 

  • cpu/arm/olpc/1.75/olpc.bth

    r2148 r2159  
    183183h# 10 buffer: signature 
    184184signature h# 10 blank 
    185 " CL2"                    signature         swap move 
     185machine-signature count   signature         swap move 
    186186" ${FW_VERSION}" expand$  signature     6 + swap move 
    187187" Q4${FW_MAJOR}" expand$  signature d# 13 + swap move 

  • cpu/x86/pc/biosload/config-olpc.fth

    r1074 r2159  
    2929create no-floppy-node 
    3030 
     31create machine-signature ," CL1" 
     32 
    3133fload ${BP}/cpu/x86/pc/biosload/addrs.fth 
    3234 

  • cpu/x86/pc/olpc/config.fth

    r1488 r2159  
    3838\ create use-flash-nvram  \ Store configuration variables in firmware FLASH 
    3939 
     40create machine-signature ," CL1" 
     41 
    4042fload ${BP}/cpu/x86/pc/olpc/addrs.fth 
    4143 

  • cpu/x86/pc/olpc/olpc.bth

    r1191 r2159  
    8989h# 10 buffer: signature 
    9090signature h# 10 blank 
    91 " CL1"                    signature         swap move 
     91machine-signature count   signature         swap move 
    9292" ${FW_VERSION}" expand$  signature     6 + swap move 
    9393" Q2${FW_MAJOR}" expand$  signature d# 13 + swap move 

  • cpu/x86/pc/olpc/via/config.fth

    r1510 r2159  
    5050\ create use-flash-nvram  \ Store configuration variables in firmware FLASH 
    5151 
     52create machine-signature ," CL1" 
     53 
    5254fload ${BP}/cpu/x86/pc/olpc/via/addrs.fth 
    5355 

  • cpu/x86/pc/olpc/via/olpc.bth

    r2001 r2159  
    205205h# 10 buffer: signature 
    206206signature h# 10 blank 
    207 " CL1"                    signature         swap move 
     207machine-signature count   signature         swap move 
    208208" ${FW_VERSION}" expand$  signature     6 + swap move 
    209209" Q3${FW_MAJOR}" expand$  signature d# 13 + swap move 

  • dev/olpc/spiflash/spiui.fth

    r2158 r2159  
    7070   ." Got firmware version: " 
    7171   flash-buf h# f.ffc0 +  dup  h# 10  type cr  ( adr ) 
    72    h# ffff.ffc0 3 comp  abort" Wrong machine signature" 
     72   machine-signature count comp  abort" Wrong machine signature" 
    7373 
    7474   ?crc 
    … …  
    278278   dup /flash <>  abort" Wrong image length"      ( adr len ) 
    279279   2dup +  h# 40 -                                ( adr len signature-adr ) 
    280    h# ffff.ffc0 3 comp  abort" Wrong machine signature" 
     280   machine-signature count comp  abort" Wrong machine signature" 
    281281                                                  ( adr len signature-adr ) 
    282282   ." Firmware: " h# 10 type                      ( adr len ) 
Note: See TracChangeset for help on using the changeset viewer.