Changeset 3064


Ignore:
Timestamp:
Jul 13, 2012, 3:33:40 AM (3 years ago)
Author:
wmb
Message:

OLPC - parameterize the location of the signature string in the FLASH, now that we must deal with different FLASH sizes.

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/olpc/1.75/config.fth

    r3057 r3064  
    1818h#  f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH
    1919h#  f.ffd8 constant crc-offset
     20h#  f.ffc0 constant signature-offset
    2021
    2122h# 10.0000 constant /rom           \ Total size of SPI FLASH
  • cpu/arm/olpc/1.75/keyject.bth

    r3053 r3064  
    168168
    169169\ Insert the revision signature
    170 /rom h# 40 - ofd @ fseek
    171170h# 10 buffer: signature
    172171signature h# 10 blank
     
    174173" ${FW_VERSION}" expand$  signature     6 + swap move
    175174" ${FW_PREFIX}${FW_MAJOR}" expand$  signature d# 13 + swap move
     175signature-offset ofd @ fseek
    176176signature h# 10  ofd @ fputs
    177177
  • cpu/arm/olpc/1.75/olpc.bth

    r3049 r3064  
    160160
    161161\ Insert the revision signature
    162 /rom h# 40 - ofd @ fseek
    163162h# 10 buffer: signature
    164163signature h# 10 blank
     
    166165" ${FW_VERSION}" expand$  signature     6 + swap move
    167166" ${FW_PREFIX}${FW_MAJOR}" expand$  signature d# 13 + swap move
     167signature-offset ofd @ fseek
    168168signature h# 10  ofd @ fputs
    169169
  • cpu/arm/olpc/3.0/config.fth

    r3057 r3064  
    1717h#  f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH
    1818h#  f.ffd8 constant crc-offset
     19h#  f.ffc0 constant signature-offset
    1920
    2021h# 10.0000 constant /rom           \ Total size of SPI FLASH
  • cpu/arm/olpc/3.0/olpc.bth

    r3049 r3064  
    163163
    164164\ Insert the revision signature
    165 /rom h# 40 - ofd @ fseek
    166165h# 10 buffer: signature
    167166signature h# 10 blank
     
    169168" ${FW_VERSION}" expand$  signature     6 + swap move
    170169" ${FW_PREFIX}${FW_MAJOR}" expand$  signature d# 13 + swap move
     170signature-offset ofd @ fseek
    171171signature h# 10  ofd @ fputs
    172172
  • cpu/arm/olpc/build-fw.fth

    r3060 r3064  
    328328
    329329   " /openprom" find-device
    330       flash-open  pad d# 16  2dup  h# fffc0  flash-read  ( adr len )
     330      flash-open  pad d# 16  2dup  signature-offset  flash-read  ( adr len )
    331331      " model" string-property
    332332
  • cpu/arm/olpc/cl4/config.fth

    r3057 r3064  
    1212
    1313h# 1f.0000 constant mfg-data-offset     \ Offset to manufacturing data area in SPI FLASH
    14 h# 10.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH
    15 h# 1e.ffd8 constant crc-offset
     14h# 20.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH
     15h# 1e.ffd0 constant crc-offset
     16h# 1e.ffc0 constant signature-offset
    1617
    1718h# 20.0000 constant /rom           \ Total size of SPI FLASH
  • cpu/arm/olpc/cl4/olpc.bth

    r3055 r3064  
    164164
    165165\ Insert the revision signature
    166 /rom h# 40 - ofd @ fseek
    167166h# 10 buffer: signature
    168167signature h# 10 blank
     
    170169" ${FW_VERSION}" expand$  signature     6 + swap move
    171170" ${FW_PREFIX}${FW_MAJOR}" expand$  signature d# 13 + swap move
     171signature-offset ofd @ fseek
    172172signature h# 10  ofd @ fputs
    173173
     
    175175/rom buffer: filebuf
    176176
    177 \ Read the entire image, compute the CRC, and store it h# 28 from the end
     177\ Read the entire image, compute the CRC, and store it in the CRC location
    1781780 ofd @ fseek
    179179filebuf /rom ofd @ fgets /rom <> abort" Can't read back image"
  • cpu/x86/pc/olpc/addrs.fth

    r2015 r3064  
    7979h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH
    8080h# f.ffd0 constant crc-offset
     81h# f.ffc0 constant signature-offset
    8182
    8283fload ${BP}/cpu/x86/pc/virtaddr.fth
  • cpu/x86/pc/olpc/keyject.bth

    r3058 r3064  
    116116
    117117\ Insert the revision signature
    118 /rom h# 40 - ofd @ fseek
    119118h# 10 buffer: signature
    120119signature h# 10 blank
     
    122121" ${FW_VERSION}" expand$  signature     6 + swap move
    123122" Q2${FW_MAJOR}" expand$  signature d# 13 + swap move
     123signature-offset ofd @ fseek
    124124signature h# 10  ofd @ fputs
    125125
  • cpu/x86/pc/olpc/olpc.bth

    r2866 r3064  
    108108
    109109\ Insert the revision signature
    110 /rom h# 40 - ofd @ fseek
    111110h# 10 buffer: signature
    112111signature h# 10 blank
     
    114113" ${FW_VERSION}" expand$  signature     6 + swap move
    115114" Q2${FW_MAJOR}" expand$  signature d# 13 + swap move
     115signature-offset ofd @ fseek
    116116signature h# 10  ofd @ fputs
    117117
  • cpu/x86/pc/olpc/via/addrs.fth

    r2015 r3064  
    112112h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH
    113113h# f.ffd4 constant crc-offset
     114h# f.ffc0 constant signature-offset
    114115
    115116fload ${BP}/cpu/x86/pc/virtaddr.fth
  • cpu/x86/pc/olpc/via/keyject.bth

    r3058 r3064  
    213213
    214214\ Insert the revision signature
    215 /rom h# 40 - ofd @ fseek
    216215h# 10 buffer: signature
    217216signature h# 10 blank
     
    219218" ${FW_VERSION}" expand$  signature     6 + swap move
    220219" Q3${FW_MAJOR}" expand$  signature d# 13 + swap move
     220signature-offset ofd @ fseek
    221221signature h# 10  ofd @ fputs
    222222
  • cpu/x86/pc/olpc/via/olpc.bth

    r2709 r3064  
    205205
    206206\ Insert the revision signature
    207 /rom h# 40 - ofd @ fseek
    208207h# 10 buffer: signature
    209208signature h# 10 blank
     
    211210" ${FW_VERSION}" expand$  signature     6 + swap move
    212211" Q3${FW_MAJOR}" expand$  signature d# 13 + swap move
     212signature-offset ofd @ fseek
    213213signature h# 10  ofd @ fputs
    214214
  • dev/olpc/spiflash/spiui.fth

    r3049 r3064  
    7474
    7575   ." Got firmware version: "
    76    flash-buf h# f.ffc0 +  dup  h# 10  type cr  ( adr )
     76   flash-buf signature-offset +  dup  h# 10  type cr  ( adr )
    7777   signature$ comp  abort" Wrong machine signature"
    7878
Note: See TracChangeset for help on using the changeset viewer.