[openfirmware] [commit] r3096 - cpu/arm/olpc
repository service
svn at openfirmware.info
Mon Jul 30 09:34:54 CEST 2012
Author: wmb
Date: Mon Jul 30 09:34:51 2012
New Revision: 3096
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3096
Log:
OLPC CL4 - Skip some steps in the startup process that are not working yet. Ifdefs in common files need to be deleted as these steps are made to work.
Modified:
cpu/arm/olpc/banner.fth
cpu/arm/olpc/build-fw.fth
cpu/arm/olpc/usb.fth
Modified: cpu/arm/olpc/banner.fth
==============================================================================
--- cpu/arm/olpc/banner.fth Mon Jul 30 09:30:34 2012 (r3095)
+++ cpu/arm/olpc/banner.fth Mon Jul 30 09:34:51 2012 (r3096)
@@ -65,6 +65,9 @@
;
: .storage ( -- )
+[ifdef] olpc-cl4
+." olpc/banner.fth: Skipping .storage" cr exit
+[then]
internal-disk-present? 0= if ( )
get-internal-disk-info ( )
then
Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth Mon Jul 30 09:30:34 2012 (r3095)
+++ cpu/arm/olpc/build-fw.fth Mon Jul 30 09:34:51 2012 (r3096)
@@ -312,6 +312,9 @@
warning @ warning off
: stand-init
stand-init
+[ifdef] olpc-cl4
+." build-fw.fth: Skipping root node properties" cr exit
+[then]
root-device
model-version$ 2dup model ( name$ )
" OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property
@@ -837,7 +840,11 @@
\+ use-screen-kbd open-hotspot
install-alarm
+[ifdef] olpc-clr
+ ." build-fw.fth: not sounding" cr
+[else]
?sound
+[then]
?games
@@ -845,7 +852,11 @@
\+ use-screen-kbd ?text-on
[ifdef] probe-usb
factory-test? if d# 1000 ms then \ Extra USB probe delay in the factory
+[ifdef] olpc-cl4
+ ." build-fw.fth: not probing usb" cr
+[else]
probe-usb
+[then]
report-disk
report-keyboard
[then]
@@ -867,6 +878,9 @@
auto-banner? if banner then
\+ use-screen-kbd ?text-on
+[ifdef] olpc-cl4
+ ." Quitting before auto-boot" cr quit
+[then]
auto-boot
\+ use-screen-kbd close-hotspot
Modified: cpu/arm/olpc/usb.fth
==============================================================================
--- cpu/arm/olpc/usb.fth Mon Jul 30 09:30:34 2012 (r3095)
+++ cpu/arm/olpc/usb.fth Mon Jul 30 09:34:51 2012 (r3096)
@@ -29,6 +29,9 @@
: init-usb ( -- )
h# 9 h# 5c pmua! \ Enable clock to USB block
reset-usb-hub
+[ifdef] olpc-cl4
+ ." olpc/usb.fth: Skipping USB phy init!" cr exit
+[then]
init-usb-phy
;
More information about the openfirmware
mailing list