[openfirmware] [commit] r2105 - cpu/arm/olpc/1.75

[repository service]

Author: wmb
Date: Sat Jan  8 11:15:54 2011
New Revision: 2105
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2105

Log:
OLPC XO-1.75 A2 - Added support for switching between internal MicroSD and eMMC.

Added:
   cpu/arm/olpc/1.75/emmc.fth
Modified:
   cpu/arm/olpc/1.75/devices.fth

Modified: cpu/arm/olpc/1.75/devices.fth
==============================================================================
--- cpu/arm/olpc/1.75/devices.fth	Sat Jan  8 11:12:51 2011	(r2104)
+++ cpu/arm/olpc/1.75/devices.fth	Sat Jan  8 11:15:54 2011	(r2105)
@@ -223,6 +223,9 @@
 ' 15x30pc to romfont
 
 fload ${BP}/cpu/arm/olpc/1.75/sdhci.fth
+[ifndef] cl2-a1
+fload ${BP}/cpu/arm/olpc/1.75/emmc.fth
+[then]
 
 devalias int /sd/disk at 3
 devalias ext /sd/disk at 1
@@ -319,9 +322,11 @@
       ec-api-ver@ " ec-version" integer-property
 [then]
 
+[ifndef] cl2-a2  \ XXX remove this ifndef when the new EC code is ready
       ['] ec-name$  catch  0=  if  " ec-name" string-property  then
       ['] ec-date$  catch  0=  if  " ec-date" string-property  then
       ['] ec-user$  catch  0=  if  " ec-user" string-property  then
+[then]
    dend
 
    " /openprom" find-device

Added: cpu/arm/olpc/1.75/emmc.fth
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ cpu/arm/olpc/1.75/emmc.fth	Sat Jan  8 11:15:54 2011	(r2105)
@@ -0,0 +1,55 @@
+\ XXX do we need to set the internal SD for fast drive in boardgpio.fth ?
+: select-internal-sd  ( -- )
+   ." Using internal SD" cr
+   h# d8c3 d# 113 af!  \ SD_CMD
+   h# d8c3 d# 126 af!  \ SD_DATA2
+   h# d8c3 d# 127 af!  \ SD_DATA0
+   h# d8c3 d# 130 af!  \ SD_DATA3
+   h# d8c3 d# 135 af!  \ SD_DATA1
+   h# d8c3 d# 138 af!  \ SD_CLK
+   h# c1   d# 111 af!  \ eMMC_D0 as GPIO
+   h# c1   d# 112 af!  \ eMMC_CMD as GPIO
+   h# c1   d# 151 af!  \ eMMC_CLK as GPIO
+   h# c1   d# 162 af!  \ eMMC_D6 as GPIO
+   h# c1   d# 163 af!  \ eMMC_D4 as GPIO
+   h# c1   d# 164 af!  \ eMMC_D2 as GPIO
+   h# c1   d# 165 af!  \ eMMC_D7 as GPIO
+   h# c1   d# 166 af!  \ eMMC_D5 as GPIO
+   h# c1   d# 167 af!  \ eMMC_D3 as GPIO
+   h# c1   d# 168 af!  \ eMMC_D1 as GPIO
+;
+: select-emmc  ( -- )
+   ." Using eMMC" cr
+   h# c1 d# 113 af!  \ SD_CMD as GPIO
+   h# c1 d# 126 af!  \ SD_DATA2 as GPIO
+   h# c0 d# 127 af!  \ SD_DATA0 as GPIO
+   h# c0 d# 130 af!  \ SD_DATA3 as GPIO
+   h# c0 d# 135 af!  \ SD_DATA1 as GPIO
+   h# c0 d# 138 af!  \ SD_CLK as GPIO
+
+   \ XXX perhaps 18c2 for fast?
+   h# c2   d# 111 af!  \ eMMC_D0
+   h# c2   d# 112 af!  \ eMMC_CMD
+   h# c2   d# 151 af!  \ eMMC_CLK
+   h# c2   d# 162 af!  \ eMMC_D6
+   h# c2   d# 163 af!  \ eMMC_D4
+   h# c2   d# 164 af!  \ eMMC_D2
+   h# c2   d# 165 af!  \ eMMC_D7
+   h# c2   d# 166 af!  \ eMMC_D5
+   h# c2   d# 167 af!  \ eMMC_D3
+   h# c2   d# 168 af!  \ eMMC_D1
+
+   d# 149 gpio-set     \ Release eMMC_RST#
+
+   d# 34 gpio-set  \ This is for the case where the eMMC power is rewired to the WLAN
+;
+\ Says COMM - is RST#
+\ Says RESET - is CMD
+
+stand-init:
+   d# 56 gpio-pin@  if
+      select-emmc
+   else
+      select-internal-sd
+   then
+;