[openfirmware] [commit] r3130 - in cpu/arm/olpc: 1.75 3.0 cl4
repository service
svn at openfirmware.info
Sat Aug 4 09:37:33 CEST 2012
Author: wmb
Date: Sat Aug 4 09:37:33 2012
New Revision: 3130
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3130
Log:
OLPC ARM - factored UART and SDHCI stuff out of platform versions of fw.bth into separate files, added device node for internal SD on CL4.
Added:
cpu/arm/olpc/1.75/sdhci.fth
cpu/arm/olpc/1.75/uart.fth
cpu/arm/olpc/3.0/sdhci.fth
cpu/arm/olpc/3.0/uart.fth
cpu/arm/olpc/cl4/sdhci.fth
cpu/arm/olpc/cl4/uart.fth
Modified:
cpu/arm/olpc/1.75/fw.bth
cpu/arm/olpc/3.0/fw.bth
cpu/arm/olpc/cl4/fw.bth
Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth Fri Aug 3 23:23:39 2012 (r3129)
+++ cpu/arm/olpc/1.75/fw.bth Sat Aug 4 09:37:33 2012 (r3130)
@@ -21,41 +21,8 @@
: clx-touch? ( -- ) board-revision h# 3a18 >= ;
: boot-dev-sel-gpio# ( -- n ) clx-touch? if 2 else d# 56 then ;
-fload ${BP}/cpu/arm/olpc/emmc.fth
-
-\ Setup UART configuration
-h# d4018000 to uart-base \ UART3
-devalias com1 /uart at d4018000
-
-dev /uart at d4030000 \ UART1
- 0 " linux,unit#" integer-property
-device-end
-
-dev /uart at d4017000 \ UART2
- " disabled" " status" string-property
-device-end
-
-dev /uart at d4018000 \ UART3
- 1 " linux,unit#" integer-property
-device-end
-
-dev /uart at d4016000 \ UART4
- " disabled" " status" string-property
-device-end
-
-\ Device node for internal microSD
-dev /sd
- new-device
- 1 encode-int " reg" property
- fload ${BP}/dev/mmc/sdhci/sdmmc.fth
- fload ${BP}/dev/mmc/sdhci/selftest.fth
- " external" " slot-name" string-property
- finish-device
-device-end
-
-devalias int /sd/disk at 3
-devalias ext /sd/disk at 1
-
+fload ${BP}/cpu/arm/olpc/1.75/uart.fth
+fload ${BP}/cpu/arm/olpc/1.75/sdhci.fth
fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth
fload ${BP}/cpu/arm/olpc/1.75/usb.fth
fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth
Added: cpu/arm/olpc/1.75/sdhci.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/olpc/1.75/sdhci.fth Sat Aug 4 09:37:33 2012 (r3130)
@@ -0,0 +1,14 @@
+fload ${BP}/cpu/arm/olpc/emmc.fth
+
+\ Device node for internal microSD
+dev /sd
+ new-device
+ 1 encode-int " reg" property
+ fload ${BP}/dev/mmc/sdhci/sdmmc.fth
+ fload ${BP}/dev/mmc/sdhci/selftest.fth
+ " external" " slot-name" string-property
+ finish-device
+device-end
+
+devalias int /sd/disk at 3
+devalias ext /sd/disk at 1
Added: cpu/arm/olpc/1.75/uart.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/olpc/1.75/uart.fth Sat Aug 4 09:37:33 2012 (r3130)
@@ -0,0 +1,19 @@
+\ Setup UART configuration
+h# d4018000 to uart-base \ UART3
+devalias com1 /uart at d4018000
+
+dev /uart at d4030000 \ UART1
+ 0 " linux,unit#" integer-property
+device-end
+
+dev /uart at d4017000 \ UART2
+ " disabled" " status" string-property
+device-end
+
+dev /uart at d4018000 \ UART3
+ 1 " linux,unit#" integer-property
+device-end
+
+dev /uart at d4016000 \ UART4
+ " disabled" " status" string-property
+device-end
Modified: cpu/arm/olpc/3.0/fw.bth
==============================================================================
--- cpu/arm/olpc/3.0/fw.bth Fri Aug 3 23:23:39 2012 (r3129)
+++ cpu/arm/olpc/3.0/fw.bth Sat Aug 4 09:37:33 2012 (r3130)
@@ -9,29 +9,8 @@
fload ${BP}/cpu/arm/olpc/build-fw.fth
-\ Setup UART configuration
-h# d4018000 to uart-base \ UART3
-devalias com1 /uart at d4018000
-
-dev /uart at d4030000 \ UART1
- 0 " linux,unit#" integer-property
-device-end
-
-dev /uart at d4017000 \ UART2
- " disabled" " status" string-property
-device-end
-
-dev /uart at d4018000 \ UART3
- 1 " linux,unit#" integer-property
-device-end
-
-dev /uart at d4016000 \ UART4
- " disabled" " status" string-property
-device-end
-
-fload ${BP}/cpu/arm/olpc/emmc.fth
-devalias int /sd/disk at 3
-
+fload ${BP}/cpu/arm/olpc/3.0/uart.fth
+fload ${BP}/cpu/arm/olpc/3.0/sdhci.fth
fload ${BP}/cpu/arm/olpc/3.0/lcdcfg.fth
fload ${BP}/cpu/arm/olpc/3.0/usb.fth
fload ${BP}/cpu/arm/olpc/exc7200-touchscreen.fth
Added: cpu/arm/olpc/3.0/sdhci.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/olpc/3.0/sdhci.fth Sat Aug 4 09:37:33 2012 (r3130)
@@ -0,0 +1,2 @@
+fload ${BP}/cpu/arm/olpc/emmc.fth
+devalias int /sd/disk at 3
Added: cpu/arm/olpc/3.0/uart.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/olpc/3.0/uart.fth Sat Aug 4 09:37:33 2012 (r3130)
@@ -0,0 +1,20 @@
+
+\ Setup UART configuration
+h# d4018000 to uart-base \ UART3
+devalias com1 /uart at d4018000
+
+dev /uart at d4030000 \ UART1
+ 0 " linux,unit#" integer-property
+device-end
+
+dev /uart at d4017000 \ UART2
+ " disabled" " status" string-property
+device-end
+
+dev /uart at d4018000 \ UART3
+ 1 " linux,unit#" integer-property
+device-end
+
+dev /uart at d4016000 \ UART4
+ " disabled" " status" string-property
+device-end
Modified: cpu/arm/olpc/cl4/fw.bth
==============================================================================
--- cpu/arm/olpc/cl4/fw.bth Fri Aug 3 23:23:39 2012 (r3129)
+++ cpu/arm/olpc/cl4/fw.bth Sat Aug 4 09:37:33 2012 (r3130)
@@ -14,48 +14,8 @@
\ true to stand-init-debug?
-\ Setup UART configuration
-h# d4017000 to uart-base \ UART2
-devalias com1 /uart at d4017000
-
-dev /uart at d4030000 \ UART1
- 0 " linux,unit#" integer-property
-device-end
-
-dev /uart at d4017000 \ UART2
- 1 " linux,unit#" integer-property
-device-end
-
-dev /uart at d4018000 \ UART3
- " disabled" " status" string-property
-device-end
-
-dev /uart at d4016000 \ UART4
- " disabled" " status" string-property \ Used for touchscreen BSL
-device-end
-
-dev /sd
- new-device
- 1 encode-int " reg" property
- fload ${BP}/dev/mmc/sdhci/sdmmc.fth
- fload ${BP}/dev/mmc/sdhci/selftest.fth
- " external" " slot-name" string-property
- finish-device
-device-end
-
-devalias ext /sd/disk at 1
-\ 2 is WLAN
-devalias int /sd/disk at 3
-devalias emmc /sd/disk at 3
-\ Nothing on channel 4
-devalias int-sd /sd/disk at 5
-
-stand-init:
- boot-dev-sel-gpio# gpio-pin@ 0= if
- " int" " /sd/disk at 5" $devalias
- then
-;
-
+fload ${BP}/cpu/arm/olpc/cl4/uart.fth
+fload ${BP}/cpu/arm/olpc/cl4/sdhci.fth
fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth
fload ${BP}/cpu/arm/olpc/1.75/usb.fth
\ fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth
Added: cpu/arm/olpc/cl4/sdhci.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/olpc/cl4/sdhci.fth Sat Aug 4 09:37:33 2012 (r3130)
@@ -0,0 +1,30 @@
+dev /sd
+ new-device
+ 1 encode-int " reg" property
+ fload ${BP}/dev/mmc/sdhci/sdmmc.fth
+ fload ${BP}/dev/mmc/sdhci/selftest.fth
+ " external" " slot-name" string-property
+ finish-device
+device-end
+
+dev /sd
+ new-device
+ 5 encode-int " reg" property
+ fload ${BP}/dev/mmc/sdhci/sdmmc.fth
+ fload ${BP}/dev/mmc/sdhci/selftest.fth
+ " internal" " slot-name" string-property
+ finish-device
+device-end
+
+devalias ext /sd/disk at 1
+\ 2 is WLAN
+devalias int /sd/disk at 3
+devalias emmc /sd/disk at 3
+\ Nothing on channel 4
+devalias int-sd /sd/disk at 5
+
+stand-init:
+ boot-dev-sel-gpio# gpio-pin@ 0= if
+ " int" " /sd/disk at 5" $devalias
+ then
+;
Added: cpu/arm/olpc/cl4/uart.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/olpc/cl4/uart.fth Sat Aug 4 09:37:33 2012 (r3130)
@@ -0,0 +1,19 @@
+\ Setup UART configuration
+h# d4017000 to uart-base \ UART2
+devalias com1 /uart at d4017000
+
+dev /uart at d4030000 \ UART1
+ 0 " linux,unit#" integer-property
+device-end
+
+dev /uart at d4017000 \ UART2
+ 1 " linux,unit#" integer-property
+device-end
+
+dev /uart at d4018000 \ UART3
+ " disabled" " status" string-property
+device-end
+
+dev /uart at d4016000 \ UART4
+ " disabled" " status" string-property \ Used for touchscreen BSL
+device-end
More information about the openfirmware
mailing list