r844 - cpu/x86/pc/olpc forth/lib

Author: wmb
Date: 2008-07-03 22:40:29 +0200 (Thu, 03 Jul 2008)
New Revision: 844

Modified:
   cpu/x86/pc/olpc/acpi.fth
   cpu/x86/pc/olpc/fwsmall.bth
   cpu/x86/pc/olpc/olpc.bth
   forth/lib/builder.fth
Log:
OLPC - Build-process fixups for last omnibus checkin

Modified: cpu/x86/pc/olpc/acpi.fth
===================================================================
--- cpu/x86/pc/olpc/acpi.fth	2008-07-03 20:25:27 UTC (rev 843)
+++ cpu/x86/pc/olpc/acpi.fth	2008-07-03 20:40:29 UTC (rev 844)
@@ -108,8 +108,8 @@

create rsdt
 ( 00 4 )  " RSDT"     $,  \ Signature
-( 04 4 )  h#   34     l,  \ Length
-\ ( 04 4 )  h#   30     l,  \ Length
+\ ( 04 4 )  h#   34     l,  \ Length
+( 04 4 )  h#   30     l,  \ Length
 ( 08 1 )        1     c,  \ Revision
 ( 09 1 )       00     c,  \ Checksum
 ( 0a 6 )  " OLPC  "   $,  \ Oem Id
@@ -120,7 +120,7 @@
 ( 24 4 )  fadt-adr    l,  \ FADT Address
 ( 28 4 )  dsdt-adr    l,  \ DSDT Address
 ( 2c 4 )  dbgp-adr    l,  \ DBGP Address
-( 30 4 )  ssdt-adr    l,  \ SSDT Address
+\ ( 30 4 )  ssdt-adr    l,  \ SSDT Address
 \ ( 30 4 )  prtn-adr    l,  \ PRTN Address
 here rsdt - constant /rsdt

@@ -189,11 +189,13 @@
    " dsdt" find-drop-in  0= abort" No DSDT "  ( adr len )
    2dup dsdt-adr swap  move  free-mem

+[ifdef] notdef
    \ Copy in the SSDT
    \ I suppose we could point to it in FLASH - if so don't compress it,
    \ and fixup the address in the fadt and rechecksum the fadt
    " ssdt" find-drop-in  0= abort" No SSDT "  ( adr len )
    2dup ssdt-adr swap  move  free-mem
+[then]

1 8 acpi-w!  \ Set SCI_EN bit
    h# ffffffff  h# 18 acpi-l!  \ Ack all leftover events

Modified: cpu/x86/pc/olpc/fwsmall.bth
===================================================================
--- cpu/x86/pc/olpc/fwsmall.bth	2008-07-03 20:25:27 UTC (rev 843)
+++ cpu/x86/pc/olpc/fwsmall.bth	2008-07-03 20:40:29 UTC (rev 844)
@@ -139,7 +139,7 @@
       h# 3aa   \ USB4:PWR1  USB3:PWR1  USB2:PWR1  USB1:PWR1
    then
 ;
-fload ${BP}/cpu/x86/pc/olpc/usb.fth
+fload ${BP}/dev/geode/usb.fth
 [then]

\ false to stand-init-debug?

Modified: cpu/x86/pc/olpc/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/olpc.bth	2008-07-03 20:25:27 UTC (rev 843)
+++ cpu/x86/pc/olpc/olpc.bth	2008-07-03 20:40:29 UTC (rev 844)
@@ -25,6 +25,7 @@
 in: ${BP}/cpu/x86/pc/olpc/build/verify.img
 in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin
 in: ${BP}/dev/pci/build/pcibridg.fc
+in: ${BP}/cpu/x86/pc/olpc/build/dsdt.aml

build-now

@@ -80,7 +81,7 @@
    " ${BP}/dev/pci/build/pcibridg.fc"           " class060400"     $add-deflated-dropin
 [then]
    " ${BP}/cpu/x86/pc/olpc/build/dsdt.aml"      " dsdt"            $add-deflated-dropin
-   " ${BP}/cpu/x86/pc/olpc/build/ssdt.aml"      " ssdt"            $add-deflated-dropin
+\  " ${BP}/cpu/x86/pc/olpc/build/ssdt.aml"      " ssdt"            $add-deflated-dropin

/rom h# 400 - pad-file	\ rmstart image must start 0x400 from end
    " rmstart.img"    $add-file

Modified: forth/lib/builder.fth
===================================================================
--- forth/lib/builder.fth	2008-07-03 20:25:27 UTC (rev 843)
+++ forth/lib/builder.fth	2008-07-03 20:40:29 UTC (rev 844)
@@ -435,6 +435,7 @@
 : hex  ( adr len -- )  intermediate-file  ;
 : sr   ( adr len -- )  intermediate-file  ;
 : out  ( adr len -- )  intermediate-file  ;
+: aml  ( adr len -- )  intermediate-file  ;

previous definitions