Author: wmb
Date: 2007-05-24 04:26:08 +0200 (Thu, 24 May 2007)
New Revision: 420
Modified:
cpu/x86/pc/olpc/usb.fth
dev/usb2/hcd/control.fth
dev/usb2/hcd/ehci/probe.fth
Log:
USB - added a configurable delay to the probe process as a workaround for OLPC trac 1473:
ok setenv usb-delay 3000 \ 3000 milliseconds, i.e. 3 seconds
ok probe-usb
Modified: cpu/x86/pc/olpc/usb.fth
===================================================================
--- cpu/x86/pc/olpc/usb.fth 2007-05-24 02:19:40 UTC (rev 419)
+++ cpu/x86/pc/olpc/usb.fth 2007-05-24 02:26:08 UTC (rev 420)
@@ -1,6 +1,8 @@
purpose: USB elaborations for the OLPC platform
\ See license at end of file
+0 config-int usb-delay \ Milliseconds to wait before set-address
+
devalias usb1 /usb@f,4
devalias usb2 /usb@f,5
devalias u /usb/disk
Modified: dev/usb2/hcd/control.fth
===================================================================
--- dev/usb2/hcd/control.fth 2007-05-24 02:19:40 UTC (rev 419)
+++ dev/usb2/hcd/control.fth 2007-05-24 02:26:08 UTC (rev 420)
@@ -46,6 +46,8 @@
headers
: set-address ( dev -- usberr )
+ " usb-delay" ['] eval catch if 2drop else ms then
+
\ To get the right characteristics for dev in control-set, then normal
\ set-my-dev is nooped. We set my-dev and my-real-dev here instead.
['] set-my-dev behavior swap ( xt dev ) \ Save set-my-dev
Modified: dev/usb2/hcd/ehci/probe.fth
===================================================================
--- dev/usb2/hcd/ehci/probe.fth 2007-05-24 02:19:40 UTC (rev 419)
+++ dev/usb2/hcd/ehci/probe.fth 2007-05-24 02:26:08 UTC (rev 420)
@@ -4,15 +4,6 @@
hex
headers
-: retry-set-address ( dev -- error? )
- d# 200 ms
- d# 5 0 do
- dup set-address 0= if drop false unloop exit then
- d# 1000
- loop
- drop true
-;
-
: make-root-hub-node ( port -- )
ok-to-add-device? 0= if drop exit then \ Can't add another device
@@ -21,9 +12,7 @@
0 set-target ( port dev ) \ Address it as device 0
- dup retry-set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev
-\ d# 4000 ms
-\ dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev
+ dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev
dup set-target ( port dev ) \ Address it as device dev
make-device-node ( )
Author: wmb
Date: 2007-05-23 22:56:34 +0200 (Wed, 23 May 2007)
New Revision: 417
Modified:
dev/olpc/cafenand/selftest.fth
Log:
CaFe NAND selftest - Reinstate fix for selftest failure on ST and Samsung parts,
which was undone by svn 355.
Modified: dev/olpc/cafenand/selftest.fth
===================================================================
--- dev/olpc/cafenand/selftest.fth 2007-05-23 00:13:56 UTC (rev 416)
+++ dev/olpc/cafenand/selftest.fth 2007-05-23 20:56:34 UTC (rev 417)
@@ -182,7 +182,6 @@
: selftest ( -- error? )
open 0= if true exit then
get-msecs rn !
- read-id 1+ c@ h# dc <> if close true exit then
show-bbt cr
(selftest)
close
Author: wmb
Date: 2007-05-23 02:13:56 +0200 (Wed, 23 May 2007)
New Revision: 416
Modified:
cpu/x86/pc/olpc/resume.bth
Log:
Fixed OLPC trac #1554 by clearing the positive and negative edge event status
bits for GPIO pins that are not powered during suspend.
Modified: cpu/x86/pc/olpc/resume.bth
===================================================================
--- cpu/x86/pc/olpc/resume.bth 2007-05-23 00:07:01 UTC (rev 415)
+++ cpu/x86/pc/olpc/resume.bth 2007-05-23 00:13:56 UTC (rev 416)
@@ -325,8 +325,8 @@
si bx cmp
= until
- h# 1840 # di mov \ PM1_STS/EN I/O port number
- di ax in ax di out \ Preserve EN bits and cleare STS bits
+ h# 1840 # dx mov \ PM1_STS/EN I/O port number
+ dx ax in ax dx out \ Preserve EN bits and clear STS bits
h# 38 [bp] si lea \ Save area
@@ -344,6 +344,12 @@
ax dx out \ Write to GPIO control register
4 # dx sub \ Next port address
loopa
+
+ \ Clear edge detects for GPIO pins that are not powered during suspend
+ h# ffff # ax mov
+ h# 1048 # dx mov ax dx out \ Pos edge status
+ h# 104c # dx mov ax dx out \ Neg edge status
+
ax lods h# 1040 # dx mov ax dx out \ Pos edge enable
ax lods h# 1044 # dx mov ax dx out \ Neg edge enable
ax lods h# 103c # dx mov ax dx out \ Low bank lock
@@ -355,6 +361,13 @@
ax dx out \ Write to GPIO control register
4 # dx sub \ Next port address
loopa
+
+ \ Clear edge detects for GPIO pins that are not powered during suspend
+ \ GPIOs 28:24 are in the suspend power well. GPIOs 31:29 don't exist.
+ h# e0ff # ax mov
+ h# 10c8 # dx mov ax dx out \ Pos edge status
+ h# 10cc # dx mov ax dx out \ Neg edge status
+
ax lods h# 10c0 # dx mov ax dx out \ Pos edge enable
ax lods h# 10c4 # dx mov ax dx out \ Neg edge enable
ax lods h# 10bc # dx mov ax dx out \ High bank lock
Author: wmb
Date: 2007-05-23 00:50:22 +0200 (Wed, 23 May 2007)
New Revision: 413
Modified:
cpu/x86/pc/olpc/devices.fth
dev/olpc/spiflash/recover.fth
dev/olpc/spiflash/spiui.fth
Log:
Added "recover <device_specifier>" and "clone" commands, for rewriting another
machine's SPI FLASH.
Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth 2007-05-22 01:52:08 UTC (rev 412)
+++ cpu/x86/pc/olpc/devices.fth 2007-05-22 22:50:22 UTC (rev 413)
@@ -285,6 +285,7 @@
fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming
fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming
+fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery
: ofw-fw-filename$ " disk:\boot\olpc.rom" ;
' ofw-fw-filename$ to fw-filename$
Modified: dev/olpc/spiflash/recover.fth
===================================================================
--- dev/olpc/spiflash/recover.fth 2007-05-22 01:52:08 UTC (rev 412)
+++ dev/olpc/spiflash/recover.fth 2007-05-22 22:50:22 UTC (rev 413)
@@ -30,7 +30,6 @@
." Getting a copy of this machine's FLASH" cr
h# fff0.0000 flash-buf /flash move
true to file-loaded?
- flash-buf ec-buf /ec move \ Save a copy for merging
(serial-flash)
;
Modified: dev/olpc/spiflash/spiui.fth
===================================================================
--- dev/olpc/spiflash/spiui.fth 2007-05-22 01:52:08 UTC (rev 412)
+++ dev/olpc/spiflash/spiui.fth 2007-05-22 22:50:22 UTC (rev 413)
@@ -153,6 +153,24 @@
: ?move-mfg-data ( -- )
." Merging existing manufacturing data" cr
+ flash-base -1 = if
+ \ Read the manufacturing data from the other FLASH
+ \ First try the new location in the e.0000 block
+ flash-buf mfg-data-offset + /flash-block mfg-data-offset read-spi-flash
+
+ \ If there is no mfg data in the e.000 block, get whatever is in the
+ \ last 2K of the 0 block, where the mfg data used to live.
+ flash-buf mfg-data-end-offset + invalid-tag? if
+ flash-buf mfg-data-offset + /flash-block h# ff erase
+
+ flash-buf mfg-data-end-offset + h# 800 - h# 800 ( adr len )
+ mfg-data-end-offset h# 800 - ( adr len offset )
+ read-spi-flash ( )
+ then
+ exit
+ then
+
+
\ If the system has mfg data in the old place, move it to the new place
mfg-data-top flash-base h# 1.0000 + = if
\ Copy just the manufacturing data into the memory buffer; don't
