[commit] r2096 - dev/ide
by repository service
Author: wmb
Date: Thu Dec 23 21:34:52 2010
New Revision: 2096
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2096
Log:
IDE driver - fixed a longstanding stack problem in probing code.
Modified:
dev/ide/generic.fth
Modified: dev/ide/generic.fth
==============================================================================
--- dev/ide/generic.fth Wed Dec 22 07:05:26 2010 (r2095)
+++ dev/ide/generic.fth Thu Dec 23 21:34:52 2010 (r2096)
@@ -310,6 +310,8 @@
else
false ( found? )
then
+ else
+ false ( found? )
then
then
else
8 years, 6 months
[commit] r2095 - cpu/arm/olpc/1.75
by repository service
Author: quozl
Date: Wed Dec 22 07:05:26 2010
New Revision: 2095
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2095
Log:
OLPC XO-1.75 - add test instructions image for bottom face of A1 PCB, rework top face to use relative coordinates.
Modified:
cpu/arm/olpc/1.75/testinstructions.fth
Modified: cpu/arm/olpc/1.75/testinstructions.fth
==============================================================================
--- cpu/arm/olpc/1.75/testinstructions.fth Tue Dec 21 01:25:16 2010 (r2094)
+++ cpu/arm/olpc/1.75/testinstructions.fth Wed Dec 22 07:05:26 2010 (r2095)
@@ -64,37 +64,25 @@
;
: board-outline
- \ bottom left corner
- 2 370 moveto
-
- \ left side cutout
- 2 253 lineto 11 253 lineto 11 236 lineto 6 236 lineto
-
- \ top left corner
- 6 37 lineto
- \ wireless cutout
- 60 37 lineto 60 0 lineto 114 0 lineto 114 96 lineto
- 205 96 lineto 205 0 lineto 524 0 lineto 524 37 lineto
-
- \ top right corner
- 580 37 lineto
-
- \ right side cutout
- 580 164 lineto 569 164 lineto 569 207 lineto 576 207 lineto
- 576 242 lineto 569 242 lineto 569 259 lineto 580 259 lineto
-
- \ bottom right corner
- 580 370 lineto
-
- \ lower cutout
- 495 370 lineto 495 366 lineto 446 366 lineto
- 446 353 lineto 423 353 lineto 423 336 lineto
- 396 336 lineto 396 231 lineto 183 231 lineto 183 333 lineto
- 155 333 lineto 155 349 lineto 132 349 lineto 132 366 lineto
- 95 366 lineto 95 370 lineto
-
- \ bottom left corner
- 2 370 lineto
+ ( lower left corner ) 2 370 moveto
+ ( left side cutout ) 0 -117 rline 9 0 rline
+ 0 -17 rline -5 0 rline
+ ( upper left corner ) 0 -199 rline
+ ( wireless cutout ) 54 0 rline 0 -37 rline 54 0 rline
+ 0 96 rline 91 0 rline 0 -96 rline
+ 319 0 rline 0 37 rline
+ ( upper right corner ) 56 0 rline
+ ( right side cutout ) 0 127 rline -11 0 rline 0 43 rline
+ 7 0 rline 0 35 rline -7 0 rline
+ 0 17 rline 11 0 rline
+ ( lower right corner ) 0 111 rline
+ ( lower cutout ) -85 0 rline 0 -4 rline -49 0 rline
+ 0 -13 rline -23 0 rline 0 -17 rline
+ -27 0 rline 0 -105 rline -213 0 rline
+ 0 102 rline -28 0 rline 0 16 rline
+ -23 0 rline 0 17 rline -37 0 rline
+ 0 4 rline
+ ( lower left corner ) -93 0 rline
;
: mic-conn
@@ -229,13 +217,18 @@
2dup 18 18 boxat
swap 9 + swap 9 + 6 circleat
;
+
: top-outline
- 153 360 moveto
- 153 324 lineto 441 324 lineto 441 360 lineto 585 360 lineto
- 585 36 lineto 531 36 lineto 531 0 lineto 234 0 lineto
- 234 99 lineto 144 99 lineto 144 0 lineto 63 0 lineto
- 63 36 lineto 9 36 lineto 9 360 lineto 153 360 lineto
+ 584 370 moveto
+ 0 -117 rline -9 0 rline 0 -17 rline 5 0 rline 0 -199 rline -54 0 rline
+ 0 -37 rline -54 0 rline 0 96 rline -91 0 rline 0 -96 rline -319 0 rline
+ 0 37 rline -56 0 rline 0 127 rline 11 0 rline 0 43 rline -7 0 rline
+ 0 35 rline 7 0 rline 0 17 rline -11 0 rline 0 111 rline 85 0 rline
+ 0 -4 rline 49 0 rline 0 -13 rline 23 0 rline 0 -17 rline 27 0 rline
+ 0 -105 rline 213 0 rline 0 102 rline 28 0 rline 0 16 rline 23 0 rline
+ 0 17 rline 37 0 rline 0 4 rline 93 0 rline
;
+
: headphones-top
2 95 7 18 boxat
9 91 45 28 boxat
@@ -296,8 +289,8 @@
: led3-top 99 348 led-symbol ;
: mic-led 31 45 led-symbol ;
: camera-led 569 45 led-symbol ;
-: wlan-conn-top 144 82 90 27 boxat ;
-: wlan-card-top 152 7 75 75 boxat ;
+: wlan-conn-top 374 76 104 27 boxat ;
+: wlan-card-top 389 7 75 75 boxat ;
: ext-sd-slot-top 497 360 81 9 boxat ;
: ext-sd-card-top
504 369 moveto 0 -75 rline 11 -11 rline 56 0 rline 0 86 rline -67 0 rline
8 years, 7 months
[commit] r2094 - cpu/arm/olpc/1.75
by repository service
Author: wmb
Date: Tue Dec 21 01:25:16 2010
New Revision: 2094
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2094
Log:
Q4A10 fix (misspelling) - changed keypad-scan to scan-keypad.
Modified:
cpu/arm/olpc/1.75/fw.bth
Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth Mon Dec 20 23:23:21 2010 (r2093)
+++ cpu/arm/olpc/1.75/fw.bth Tue Dec 21 01:25:16 2010 (r2094)
@@ -190,7 +190,7 @@
d# 20 gpio-pin@ 0= if h# 40 or then \ Rotate
[else]
d# 15 gpio-pin@ 0= if button-rotate or then ( n )
- keypad-scan ( n keypad )
+ scan-keypad ( n keypad )
button-o h# 01 keypad-bit ( n' keypad )
button-check h# 02 keypad-bit ( n' keypad )
button-x h# 04 keypad-bit ( n' keypad )
8 years, 7 months
[commit] r2093 - cpu/arm/olpc/1.75
by repository service
Author: wmb
Date: Mon Dec 20 23:23:21 2010
New Revision: 2093
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2093
Log:
Q4A10 - for upcoming A2 build.
Modified:
cpu/arm/olpc/1.75/fw-version.fth
Modified: cpu/arm/olpc/1.75/fw-version.fth
==============================================================================
--- cpu/arm/olpc/1.75/fw-version.fth Mon Dec 20 23:22:24 2010 (r2092)
+++ cpu/arm/olpc/1.75/fw-version.fth Mon Dec 20 23:23:21 2010 (r2093)
@@ -1,3 +1,3 @@
\ The overall firmware revision
macro: FW_MAJOR A
-macro: FW_MINOR 07
+macro: FW_MINOR 10
8 years, 7 months
[commit] r2092 - cpu/arm/olpc/1.75
by repository service
Author: wmb
Date: Mon Dec 20 23:22:24 2010
New Revision: 2092
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2092
Log:
OLPC 1.75 - Configure for A2 build.
Modified:
cpu/arm/olpc/1.75/config.fth
Modified: cpu/arm/olpc/1.75/config.fth
==============================================================================
--- cpu/arm/olpc/1.75/config.fth Mon Dec 20 22:00:05 2010 (r2091)
+++ cpu/arm/olpc/1.75/config.fth Mon Dec 20 23:22:24 2010 (r2092)
@@ -1,3 +1,5 @@
+\ create cl2-a1
+create cl2-a2
create debug-startup
create olpc
create trust-ec-keyboard
8 years, 7 months
[commit] r2091 - cpu/arm/olpc/1.75 dev/olpc/dcon dev/olpc/mmp2camera
by repository service
Author: wmb
Date: Mon Dec 20 22:00:05 2010
New Revision: 2091
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2091
Log:
OLPC 1.75 - Pin assignment changes for A2, guarded by [ifdef] cl2-a1
Modified:
cpu/arm/olpc/1.75/fw.bth
cpu/arm/olpc/1.75/rtc.fth
dev/olpc/dcon/mmp2dcon.fth
dev/olpc/mmp2camera/platform.fth
Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth Mon Dec 20 21:58:26 2010 (r2090)
+++ cpu/arm/olpc/1.75/fw.bth Mon Dec 20 22:00:05 2010 (r2091)
@@ -163,13 +163,44 @@
fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools
fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth
+fload ${BP}/cpu/arm/mmp2/keypad.fth
+[ifndef] cl2-a1
+stand-init: keypad
+ keypad-on
+ 8 keypad-direct-mode
+;
+: keypad-bit ( n keypad out-mask key-mask -- n' keypad )
+ third invert and if ( n keypad out-mask )
+ rot or swap ( n' keypad )
+ else ( n keypad out-mask )
+ drop ( n keypad )
+ then ( n' keypad )
+;
+[then]
+
+fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth
+
: game-key@ ( -- n )
- 0
+ 0 ( n )
+[ifdef] cl2-a1
d# 16 gpio-pin@ 0= if h# 80 or then \ O
d# 17 gpio-pin@ 0= if h# 02 or then \ Check
d# 18 gpio-pin@ 0= if h# 100 or then \ X
d# 19 gpio-pin@ 0= if h# 01 or then \ Square
d# 20 gpio-pin@ 0= if h# 40 or then \ Rotate
+[else]
+ d# 15 gpio-pin@ 0= if button-rotate or then ( n )
+ keypad-scan ( n keypad )
+ button-o h# 01 keypad-bit ( n' keypad )
+ button-check h# 02 keypad-bit ( n' keypad )
+ button-x h# 04 keypad-bit ( n' keypad )
+ button-square h# 08 keypad-bit ( n' keypad )
+ rocker-up h# 10 keypad-bit ( n' keypad )
+ rocker-right h# 20 keypad-bit ( n' keypad )
+ rocker-down h# 40 keypad-bit ( n' keypad )
+ rocker-left h# 80 keypad-bit ( n' keypad )
+ drop ( n )
+[then]
;
fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth
Modified: cpu/arm/olpc/1.75/rtc.fth
==============================================================================
--- cpu/arm/olpc/1.75/rtc.fth Mon Dec 20 21:58:26 2010 (r2090)
+++ cpu/arm/olpc/1.75/rtc.fth Mon Dec 20 22:00:05 2010 (r2091)
@@ -2,8 +2,13 @@
" rtc" name
: set-address ( -- )
+[ifdef] cl2-a1
d# 97 to smb-clock-gpio#
d# 98 to smb-data-gpio#
+[else]
+ d# 53 to smb-clock-gpio#
+ d# 54 to smb-data-gpio#
+[then]
h# d0 to smb-slave
;
: rtc@ ( reg# -- byte ) set-address smb-byte@ ;
Modified: dev/olpc/dcon/mmp2dcon.fth
==============================================================================
--- dev/olpc/dcon/mmp2dcon.fth Mon Dec 20 21:58:26 2010 (r2090)
+++ dev/olpc/dcon/mmp2dcon.fth Mon Dec 20 22:00:05 2010 (r2091)
@@ -29,8 +29,13 @@
\ h# 8000 constant DM_SELFTEST
: set-dcon-slave ( -- )
+[ifdef] cl2-a1
d# 162 to smb-clock-gpio#
d# 163 to smb-data-gpio#
+[else]
+ d# 161 to smb-clock-gpio#
+ d# 110 to smb-data-gpio#
+[then]
h# 1a to smb-slave
;
@@ -39,8 +44,13 @@
: dcon@ ( reg# -- word ) set-dcon-slave smb-word@ ;
: dcon! ( word reg# -- ) set-dcon-slave smb-word! ;
+[ifdef] cl2-a1
: dcon-load ( -- ) d# 151 gpio-set ;
: dcon-unload ( -- ) d# 151 gpio-clr ;
+[else]
+: dcon-load ( -- ) d# 142 gpio-set ;
+: dcon-unload ( -- ) d# 142 gpio-clr ;
+[then]
\ : dcon-blnk? ( -- flag ) ; \ Not hooked up
: dcon-stat@ ( -- n ) h# d4019100 l@ 4 rshift 3 and ;
: dcon-irq? ( -- flag ) d# 124 gpio-pin@ 0= ;
Modified: dev/olpc/mmp2camera/platform.fth
==============================================================================
--- dev/olpc/mmp2camera/platform.fth Mon Dec 20 21:58:26 2010 (r2090)
+++ dev/olpc/mmp2camera/platform.fth Mon Dec 20 22:00:05 2010 (r2091)
@@ -15,8 +15,13 @@
: reset-sensor ( -- ) d# 73 gpio-clr 1 ms d# 73 gpio-set ;
+[ifdef] cl2-a1
: sensor-power-on ( -- ) d# 145 gpio-set ;
: sensor-power-off ( -- ) d# 145 gpio-clr ;
+[else]
+: sensor-power-on ( -- ) d# 150 gpio-set ;
+: sensor-power-off ( -- ) d# 150 gpio-clr ;
+[then]
\ CAM_HSYNC is on GPIO67, CAM_VSYNC is on GPIO68
\ PIXMCLK on GPIO69, PIXCLK on GPIO70, PIXDATA[7:0] on GPIO[59:66]
8 years, 7 months
[commit] r2090 - cpu/arm/olpc/1.75
by repository service
Author: wmb
Date: Mon Dec 20 21:58:26 2010
New Revision: 2090
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2090
Log:
OLPC 1.75 - No need to setup the MFPRs/GPIOs in OFW, since CForth already does it. It's better to do it in one place to avoid the possibility of conflicts/errors.
Modified:
cpu/arm/olpc/1.75/devices.fth
Modified: cpu/arm/olpc/1.75/devices.fth
==============================================================================
--- cpu/arm/olpc/1.75/devices.fth Mon Dec 20 21:57:12 2010 (r2089)
+++ cpu/arm/olpc/1.75/devices.fth Mon Dec 20 21:58:26 2010 (r2090)
@@ -59,12 +59,8 @@
fload ${BP}/cpu/arm/mmp2/mfpr.fth
fload ${BP}/cpu/arm/mmp2/gpio.fth
-\ fload ${BP}/cpu/arm/olpc/1.75/boardtwsi.fth
-fload ${BP}/cpu/arm/olpc/1.75/boardgpio.fth
: init-stuff
acgr-clocks-on
- init-mfprs
- set-gpio-directions
init-timers
init-twsi
;
8 years, 7 months
[commit] r2089 - cpu/arm/olpc/1.75
by repository service
Author: wmb
Date: Mon Dec 20 21:57:12 2010
New Revision: 2089
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2089
Log:
OLPC 1.75 - Pin assignment changes for A2 build - guarded by [ifdef] cl2-a1
Modified:
cpu/arm/olpc/1.75/boardgpio.fth
Modified: cpu/arm/olpc/1.75/boardgpio.fth
==============================================================================
--- cpu/arm/olpc/1.75/boardgpio.fth Mon Dec 20 21:55:23 2010 (r2088)
+++ cpu/arm/olpc/1.75/boardgpio.fth Mon Dec 20 21:57:12 2010 (r2089)
@@ -1,12 +1,5 @@
purpose: Board-specific setup details - pin assigments, etc.
-: set-camera-domain-voltage
- aib-unlock
- h# d401e80c l@ 4 or ( n ) \ Set 1.8V selector bit in AIB_GPIO2_IO
- aib-unlock
- h# d401e80c l!
-;
-
: set-gpio-directions ( -- )
3 h# 38 clock-unit-pa + l! \ Enable clocks in GPIO clock reset register
@@ -26,16 +19,44 @@
d# 97 gpio-dir-out \ RTC_SCK
d# 98 gpio-dir-out \ RTC_SDA
- d# 125 gpio-set
+[ifdef] cl2-a1
+[else]
+ d# 53 gpio-set \ RTC_SCK
+ d# 53 gpio-dir-out \ RTC_SCK
+ d# 103 gpio-dir-out \ EC_EDI_DO
+ d# 104 gpio-set \ EC_EDI_CS#
+ d# 104 gpio-dir-out \ EC_EDI_CS#
+ d# 106 gpio-dir-out \ EC_EDI_CLK
+ d# 143 gpio-clr
+ d# 143 gpio-dir-out \ MIC_AC#/DC
+ d# 149 gpio-clr \ eMMC_RST#
+ d# 149 gpio-dir-out \ eMMC_RST#
+[then]
+
+ d# 125 gpio-set \ EC_SPI_ACK
d# 125 gpio-dir-out \ EC_SPI_ACK
+[ifdef] cl2-a1
d# 145 gpio-dir-out \ EN_CAM_PWR
+[else]
+ d# 150 gpio-clr \ EN_CAM_PWR
+ d# 150 gpio-dir-out \ EN_CAM_PWR
+[then]
d# 146 gpio-dir-out \ HUB_RESET#
+[ifdef] cl2-a1
d# 151 gpio-dir-out \ DCONLOAD
+[else]
+ d# 142 gpio-dir-out \ DCONLOAD
+[then]
d# 155 gpio-clr
d# 155 gpio-dir-out \ EC_SPI_CMD
+[ifdef] cl2-a1
d# 162 gpio-dir-out \ DCON_SCL
d# 163 gpio-dir-out \ DCON_SDA
+[else]
+ d# 161 gpio-dir-out \ DCON_SCL
+ d# 110 gpio-dir-out \ DCON_SDA
+[then]
;
create mfpr-table
@@ -54,6 +75,7 @@
no-update, \ GPIO_12 - Not connected (TP52)
no-update, \ GPIO_13 - Not connected (TP116)
no-update, \ GPIO_14 - Not connected (TP64)
+[ifdef] cl2-a1
no-update, \ GPIO_15 - Not connected (TP55)
0 af, \ GPIO_16 - KEY_IN_1
0 af, \ GPIO_17 - KEY_IN_2
@@ -63,6 +85,17 @@
no-update, \ GPIO_21 - Not connected (TP63)
no-update, \ GPIO_22 - Not connected (TP118)
no-update, \ GPIO_23 - Not connected (TP61)
+[else]
+ 0 af, \ GPIO_15 - KEY_ROTATE
+ 1 af, \ GPIO_16 - KEY_R_UP (using KP_DKIN0)
+ 1 af, \ GPIO_17 - KEY_R_RT (using KP_DKIN1)
+ 1 af, \ GPIO_18 - KEY_R_DN (using KP_DKIN2)
+ 1 af, \ GPIO_19 - KEY_R_UP (using KP_DKIN3)
+ 1 af, \ GPIO_20 - KEY_L_UP (using KP_DKIN4)
+ 1 af, \ GPIO_21 - KEY_L_RT (using KP_DKIN5)
+ 1 af, \ GPIO_22 - KEY_L_DN (using KP_DKIN6)
+ 1 af, \ GPIO_23 - KEY_L_LF (using KP_DKIN7)
+[then]
1 af, \ GPIO_24 - I2S_SYSCLK (Codec)
1 af, \ GPIO_25 - I2S_BITCLK (Codec)
1 af, \ GPIO_26 - I2S_SYNC (Codec)
@@ -70,11 +103,11 @@
1 af, \ GPIO_28 - I2S_DATA_IN (Codec)
1 af, \ GPIO_29 - UART1_RXD (debug board)
1 af, \ GPIO_30 - UART1_TXD (debug board)
- 0 af, \ GPIO_31 - SD_CD# (via GPIO)
+ 0 af, \ GPIO_31 - SD_CD# AKA SD2_CD# (via GPIO)
no-update, \ GPIO_32 - Not connected (TP58)
- 0 af, \ GPIO_33 - EN_MSD_PWR
+ 0 af, \ GPIO_33 - EN_MSD_PWR AKA EN_SD1_PWR
0 af, \ GPIO_34 - EN_WLAN_PWR
- 0 af, \ GPIO_35 - EN_SD_PWR
+ 0 af, \ GPIO_35 - EN_SD_PWR AKA EN_SD2_PWR
no-update, \ GPIO_36 - Not connected (TP115)
1 af, \ GPIO_37 - SDDA_D3
1 af, \ GPIO_38 - SDDA_D2
@@ -94,10 +127,19 @@
no-update, \ GPIO_52 - Not connected (TP113)
\ 2 af, \ GPIO_53 - RTC_SCK (TWSI2) if R124 populated
\ 2 af, \ GPIO_54 - RTC_SDA (TWSI2) if R125 populated
+[ifdef] cl2-a1
no-update, \ GPIO_53 - Not connected if nopop R124 to use TWSI6 for RTC
no-update, \ GPIO_54 - Not connected if nopop R125 to use TWSI6 for RTC
+[else]
+ 0 af, \ GPIO_53 - RTC_SCK
+ 0 af, \ GPIO_54 - RTC_SDA
+[then]
no-update, \ GPIO_55 - Not connected (TP51)
+[ifdef] cl2-a1
no-update, \ GPIO_56 - Not connected (TP60)
+[else]
+ 0 af, \ GPIO_56 - BOOT_DEV_SEL
+[then]
0 af, \ GPIO_57 - WLAN_PD#
0 af, \ GPIO_58 - WLAN_RESET#
@@ -141,40 +183,57 @@
1 af, \ GPIO_94 - GFBDATA4
1 af, \ GPIO_95 - GFBDATA5
+[ifdef] cl2-a1
no-update, \ GPIO_96 - Not connected (TP112)
-
\ no-update, \ GPIO_97 - Not connected (R100 nopop) if we use TWSI2 for RTC
\ no-update, \ GPIO_98 - Not connected (R106 nopop) if we use TWSI2 for RTC
\ 2 af, \ GPIO_97 - RTC_SCK (TWSI6) if R100 populated
\ 2 af, \ GPIO_98 - RTC_SDA (TWSI6) if R106 populated
0 af, \ GPIO_97 - RTC_SCK (bitbang) if R100 populated
0 af, \ GPIO_98 - RTC_SDA (bitbang) if R106 populated
-
+[else]
+ 0 af, \ GPIO_96 - EXT_MIC_PLUG
+ 0 af, \ GPIO_97 - HP_PLUG
+ no-update, \ GPIO_98 - Not connected
+[then]
0 af, \ GPIO_99 - TOUCH_SCR_INT
0 af, \ GPIO_100 - DCONSTAT0
0 af, \ GPIO_101 - DCONSTAT1
-
+[ifdef] cl2-a1
no-update, \ GPIO_102 - (USIM_CLK) - Not connected (TP48)
no-update, \ GPIO_103 - (USIM_IO) - Not connected (TP50)
0 af, \ GPIO_104 - ND_IO[7]
0 af, \ GPIO_105 - ND_IO[6]
0 af, \ GPIO_106 - ND_IO[5]
+[else]
+ 1 af, \ GPIO_102 - reserved
+ 1 af, \ GPIO_103 - EC_EDI_DO
+ 1 af, \ GPIO_104 - EC_EDI_CS#
+ 1 af, \ GPIO_105 - EC_EDI_DI
+ 1 af, \ GPIO_106 - EC_EDI_CLK
+[then]
0 af, \ GPIO_107 - ND_IO[4]
1 af, \ GPIO_108 - CAM_SDL - Use as GPIO, bitbang
1 af, \ GPIO_109 - CAM_SDA - Use as GPIO, bitbang
+[ifdef] cl2-a1
1 af, \ GPIO_110 - (ND_IO[13]) - Not connected (TP43)
1 af, \ GPIO_111 - (ND_IO[8]) - Not connected (TP108)
0 af, \ GPIO_112 - ND_RDY[0]
- 3 af, \ GPIO_113 - (SM_RDY) - MSD_CMD (externally pulled up)
+[else]
+ 1 pull-up, \ GPIO_110 - DCON_SDA
+ 2 af, \ GPIO_111 - eMMC_D0
+ 2 af, \ GPIO_112 - eMMC_CMD
+[then]
+ 3 af, \ GPIO_113 - (SM_RDY) - MSD_CMD aka SD1_CMD (externally pulled up)
1 af, \ GPIO_114 - G_CLK_OUT - Not connected (TP93)
4 af, \ GPIO_115 - UART3_TXD (J4)
4 af, \ GPIO_116 - UART3_RXD (J4)
- 3 af, \ GPIO_117 - UART4_RXD - Not connected (TP117)
- 3 af, \ GPIO_118 - UART4_TXD - Not connected (TP56)
+ 3 af, \ GPIO_117 - UART4_RXD - Not connected on A1 (TP117)
+ 3 af, \ GPIO_118 - UART4_TXD - Not connected on A1 (TP56)
3 af, \ GPIO_119 - SDI_CLK (SSP3)
3 af, \ GPIO_120 - SDI_CS#
3 af, \ GPIO_121 - SDI_MOSI
@@ -183,39 +242,54 @@
3 af, \ GPIO_123 - 32 KHz_CLK_OUT - Not connected (TP92)
0 af, \ GPIO_124 - DCONIRQ
-\ 0 af, \ GPIO_125 - EC_SPI_ACK
+\ 0 af, \ GPIO_125 - EC_SPI_ACK
0 pull-up, \ GPIO_125 - EC_SPI_ACK
- 3 pull-up, \ GPIO_126 - MSD_DATA2
- 3 pull-up, \ GPIO_127 - MSD_DATA0
+ 3 pull-up, \ GPIO_126 - MSD_DATA2 AKA SD1_DATA2
+ 3 pull-up, \ GPIO_127 - MSD_DATA0 AKA SD1_DATA0
0 af, \ GPIO_128 - EB_MODE#
0 af, \ GPIO_129 - LID_SW#
- 3 pull-up, \ GPIO_130 - MSD_DATA3
- 1 +fast pull-up, \ GPIO_131 - SD_DATA3
- 1 +fast pull-up, \ GPIO_132 - SD_DATA2
- 1 +fast pull-up, \ GPIO_133 - SD_DATA1
- 1 +fast pull-up, \ GPIO_134 - SD_DATA0
- 3 pull-up, \ GPIO_135 - MSD_DATA1
-\ 1 +fast pull-up, \ GPIO_136 - SD_CMD
- 1 +fast af, \ GPIO_136 - SD_CMD - CMD is pulled up externally
+ 3 pull-up, \ GPIO_130 - MSD_DATA3 AKA SD1_DATA3
+ 1 +fast pull-up, \ GPIO_131 - SD_DATA3 AKA SD2_DATA3
+ 1 +fast pull-up, \ GPIO_132 - SD_DATA2 AKA SD2_DATA2
+ 1 +fast pull-up, \ GPIO_133 - SD_DATA1 AKA SD2_DATA1
+ 1 +fast pull-up, \ GPIO_134 - SD_DATA0 AKA SD2_DATA0
+ 3 pull-up, \ GPIO_135 - MSD_DATA1 AKA SD1_DATA1
+\ 1 +fast pull-up, \ GPIO_136 - SD_CMD AKA SD2_CMD
+ 1 +fast af, \ GPIO_136 - SD_CMD AKA SD2_DATA - CMD is pulled up externally
no-update, \ GPIO_137 - Not connected (TP111)
- 3 pull-up, \ GPIO_138 - MSD_CLK
- 1 +fast pull-up, \ GPIO_139 - SD_CLK
+ 3 pull-up, \ GPIO_138 - MSD_CLK AKA SD1_CLK
+ 1 +fast pull-up, \ GPIO_139 - SD_CLK AKA SD2_CLK
no-update, \ GPIO_140 - Not connected if R130 is nopop
\ 1 af, \ GPIO_140 - (SD_CD# if R130 is populated)
- 1 af, \ GPIO_141 - SD_WP
+ 1 af, \ GPIO_141 - SD_WP# AKA SD2_WP#
+[ifdef] cl2-a1
no-update, \ GPIO_142 - (USIM_RSTn) - Not connected (TP49)
0 af, \ GPIO_143 - ND_CS0#
+[else]
+ 1 af, \ GPIO_142 - DCONLOAD
+ 1 af, \ GPIO_143 - MIC_AC#/DC
+[then]
0 af, \ GPIO_144 - ND_CS1#
+[ifdef] cl2-a1
1 af, \ GPIO_145 - EN_CAM_PWR
+[else]
+ no-update, \ GPIO_145 - Not connected
+[then]
1 af, \ GPIO_146 - HUB_RESET#
0 af, \ GPIO_147 - ND_WE_N
0 af, \ GPIO_148 - ND_RE_N
+[ifdef] cl2-a1
0 af, \ GPIO_149 - ND_CLE
0 af, \ GPIO_150 - ND_ALE
1 af, \ GPIO_151 - DCONLOAD
+[else]
+ 1 af, \ GPIO_149 - eMMC_RST#
+ 1 af, \ GPIO_150 - EN_CAM_PWR
+ 2 af, \ GPIO_151 - eMMC_CLK
+[then]
1 af, \ GPIO_152 - (SM_BELn) - Not connected (TP40)
1 af, \ GPIO_153 - (SM_BEHn) - Not connected (TP105)
0 af, \ GPIO_154 - (SM_INT) - EC_IRQ#
@@ -225,6 +299,7 @@
no-update, \ GPIO_158 - PRI_TDK (JTAG)
no-update, \ GPIO_159 - PRI_TDO (JTAG)
0 af, \ GPIO_160 - ND_RDY[1]
+[ifdef] cl2-a1
1 af, \ GPIO_161 - ND_IO[12] - Not connected (TP 44)
1 af, \ GPIO_162 - (ND_IO[11]) - DCON_SCL
1 pull-up, \ GPIO_163 - (ND_IO[10]) - DCON_SDA
@@ -233,6 +308,16 @@
0 af, \ GPIO_166 - ND_IO[2]
0 af, \ GPIO_167 - ND_IO[1]
0 af, \ GPIO_168 - ND_IO[0]
+[else]
+ 1 af, \ GPIO_161 - DCON_SCL
+ 2 af, \ GPIO_162 - eMMC_D6
+ 2 af, \ GPIO_163 - eMMC_D4
+ 2 af, \ GPIO_164 - eMMC_D2
+ 1 af, \ GPIO_165 - eMMC_D7
+ 1 af, \ GPIO_166 - eMMC_D5
+ 1 af, \ GPIO_167 - eMMC_D3
+ 1 af, \ GPIO_168 - eMMC_D1
+[then]
: init-mfprs
d# 169 0 do
8 years, 7 months
[commit] r2088 - cpu/arm/mmp2
by repository service
Author: wmb
Date: Mon Dec 20 21:55:23 2010
New Revision: 2088
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2088
Log:
OLPC 1.75 - Implemented a simple driver for the MMP2 keypad controller.
Added:
cpu/arm/mmp2/keypad.fth
Added: cpu/arm/mmp2/keypad.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/arm/mmp2/keypad.fth Mon Dec 20 21:55:23 2010 (r2088)
@@ -0,0 +1,41 @@
+\ See license at end of file
+purpose: Driver for Armada 610/MMP2 keypad controller
+
+: keypad-on ( -- )
+ 5 h# d4015018 l! \ Clock on with reset asserted
+ 1 h# d4015018 l! \ Clock on, release reset
+;
+: kp! ( n offset -- ) h# d4012000 + l! ;
+: kp@ ( offset -- n ) h# d4012000 + l@ ;
+: keypad-direct-mode ( #keys -- )
+ 1+ 6 lshift h# 202 or 0 kp!
+;
+: scan-keypad ( -- n )
+ 0 kp@ h# 4000.0000 or 0 kp!
+ 1 ms
+ 8 kp@
+;
+
+\ LICENSE_BEGIN
+\ Copyright (c) 2010 FirmWorks
+\
+\ Permission is hereby granted, free of charge, to any person obtaining
+\ a copy of this software and associated documentation files (the
+\ "Software"), to deal in the Software without restriction, including
+\ without limitation the rights to use, copy, modify, merge, publish,
+\ distribute, sublicense, and/or sell copies of the Software, and to
+\ permit persons to whom the Software is furnished to do so, subject to
+\ the following conditions:
+\
+\ The above copyright notice and this permission notice shall be
+\ included in all copies or substantial portions of the Software.
+\
+\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+\
+\ LICENSE_END
8 years, 7 months
[commit] r2087 - in cpu/x86/pc/olpc: . via
by repository service
Author: wmb
Date: Mon Dec 20 21:54:30 2010
New Revision: 2087
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2087
Log:
OLPC - factored game key button names into a separate file so the XO-1.75 implementation of game-key@ can use the symbolic names.
Added:
cpu/x86/pc/olpc/gamekeynames.fth
Modified:
cpu/x86/pc/olpc/fw.bth
cpu/x86/pc/olpc/gamekeys.fth
cpu/x86/pc/olpc/via/fw.bth
Modified: cpu/x86/pc/olpc/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/fw.bth Sun Dec 19 18:02:27 2010 (r2086)
+++ cpu/x86/pc/olpc/fw.bth Mon Dec 20 21:54:30 2010 (r2087)
@@ -343,6 +343,7 @@
\ fload ${BP}/cpu/x86/pc/olpc/carousel.fth \ Carouseled NAND writing
fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation
fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory
+fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth
fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth
: emacs ( -- )
Added: cpu/x86/pc/olpc/gamekeynames.fth
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ cpu/x86/pc/olpc/gamekeynames.fth Mon Dec 20 21:54:30 2010 (r2087)
@@ -0,0 +1,16 @@
+purpose: Symbolic names for game key bitmasks
+
+\ These bitmasks directly match the values returned by the EC
+\ "game-key@" command on XO-1 and XO-1.5 hardware. For later
+\ hardware with different game key access methods, the hardware
+\ bit masks are translated into these values.
+
+h# 1 constant button-square
+h# 2 constant button-check
+h# 4 constant rocker-up
+h# 8 constant rocker-down
+h# 10 constant rocker-left
+h# 20 constant rocker-right
+h# 40 constant button-rotate
+h# 80 constant button-o
+h# 100 constant button-x
Modified: cpu/x86/pc/olpc/gamekeys.fth
==============================================================================
--- cpu/x86/pc/olpc/gamekeys.fth Sun Dec 19 18:02:27 2010 (r2086)
+++ cpu/x86/pc/olpc/gamekeys.fth Mon Dec 20 21:54:30 2010 (r2087)
@@ -1,15 +1,5 @@
purpose: Access to game keys (buttons on front panel)
-h# 1 constant button-square
-h# 2 constant button-check
-h# 4 constant rocker-up
-h# 8 constant rocker-down
-h# 10 constant rocker-left
-h# 20 constant rocker-right
-h# 40 constant button-rotate
-h# 80 constant button-o
-h# 100 constant button-x
-
0 value game-key-mask
: show-key ( mask x y -- )
Modified: cpu/x86/pc/olpc/via/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/via/fw.bth Sun Dec 19 18:02:27 2010 (r2086)
+++ cpu/x86/pc/olpc/via/fw.bth Mon Dec 20 21:54:30 2010 (r2087)
@@ -382,6 +382,7 @@
fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation
fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory
+fload ${BP}/cpu/x86/pc/olpc/gamekeynames.fth
fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth
: emacs ( -- )
8 years, 7 months