[openfirmware] [commit] r2739 - cpu/arm/olpc

[repository service]

Author: wmb
Date: Tue Dec  6 08:11:13 2011
New Revision: 2739
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2739

Log:
OLPC XO-3 - Tweaks to the shared (between 1.75 and 3.0) build-fw.fth file for XO-3.

Modified:
   cpu/arm/olpc/build-fw.fth

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Tue Dec  6 08:11:02 2011	(r2738)
+++ cpu/arm/olpc/build-fw.fth	Tue Dec  6 08:11:13 2011	(r2739)
@@ -361,6 +361,7 @@
 fload ${BP}/cpu/arm/marvell/utmiphy.fth
 
 \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/usb.fth
+\+ olpc-cl3 fload ${BP}/cpu/arm/mmp2/ulpiphy.fth
 \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/usb.fth
 
 fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth
@@ -505,7 +506,8 @@
    false
 ;
 
-: rotate-button?  ( -- flag )  d# 15 gpio-pin@ 0=  ;
+\+ olpc-cl2 : rotate-button?  ( -- flag )  d# 15 gpio-pin@ 0=  ;
+\+ olpc-cl3 false value rotate-button?
 warning @  warning off 
 : init
 \ initial-heap add-memory
@@ -807,7 +809,7 @@
 fload ${BP}/ofw/gui/ofpong.fth
 fload ${BP}/cpu/x86/pc/olpc/life.fth
 
-" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /usb/wlan"
+" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /wlan"
    ' boot-device  set-config-string-default
 
 \needs ramdisk  " " d# 128 config-string ramdisk
@@ -906,7 +908,7 @@
    disable-user-aborts
    console-start
 
-   read-game-keys
+\- olpc-cl3  read-game-keys
 
    factory-test? 0=  if  text-off  then