[openfirmware] [commit] r2120 - cpu/arm/olpc/1.75 dev/usb2/hcd/ehci

[repository service]

Author: quozl
Date: Wed Jan 19 23:42:31 2011
New Revision: 2120
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2120

Log:
OLPC XO-1.75 A2 - use new machine signature CL2 for release after next

Modified:
   cpu/arm/olpc/1.75/spiui.fth
   dev/usb2/hcd/ehci/intr.fth

Modified: cpu/arm/olpc/1.75/spiui.fth
==============================================================================
--- cpu/arm/olpc/1.75/spiui.fth	Wed Jan 19 08:05:12 2011	(r2119)
+++ cpu/arm/olpc/1.75/spiui.fth	Wed Jan 19 23:42:31 2011	(r2120)
@@ -41,13 +41,16 @@
    cr  drop           ( )
 ;
 
+create machine-signature ," CL2"
+: downgrade  [char] 1 machine-signature count drop 2+ c! ;
 
 \ Perform a series of sanity checks on the new firmware image.
 
 : 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 )
+   dup machine-signature count comp  abort" No machine signature"
+                                                  ( adr len signature-adr )
    ." Firmware: " h# 10 type                      ( adr len )
    \ XXX add some more sanity checks
 ;
@@ -80,7 +83,7 @@
 
    ." Got firmware version: "
    flash-buf h# f.ffc0 +  dup  h# 10  type cr  ( adr )
-   " CL1" comp  abort" Wrong machine type"
+   machine-signature count comp  abort" Wrong machine signature"
 
    ?crc
 

Modified: dev/usb2/hcd/ehci/intr.fth
==============================================================================
--- dev/usb2/hcd/ehci/intr.fth	Wed Jan 19 08:05:12 2011	(r2119)
+++ dev/usb2/hcd/ehci/intr.fth	Wed Jan 19 23:42:31 2011	(r2120)
@@ -118,8 +118,10 @@
 
 headers
 
+warning @ warning off
 : (end-extra)  ( -- )  (end-extra) end-intr-in  ;
 ' (end-extra) to end-extra
+warning !
 
 
 \ LICENSE_BEGIN