aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2020-02-09 15:31:07 +0100
committerMitch Bradley <wmb@firmworks.com>2020-02-09 07:20:37 -1000
commitb1396ea8c2f714c9893b3a20ca8384a91aa7a588 (patch)
treefaf612377af3f0bb06de83df8a847c18ecaa3c9e
parente32a267b0b9c0be5383360e7db5700b449f74569 (diff)
downloadcforth-b1396ea8c2f714c9893b3a20ca8384a91aa7a588.tar.gz
arm-mmp2: s/create cl4/create mmp3/
This is a trivial rename. The cl4 word conditionalizes things that are specific to MMP3, not the just OLPC CL4 machine. Using the cl4 name outside OLPC would be misleading.
-rw-r--r--src/app/arm-mmp2/lcd.fth2
-rw-r--r--src/app/arm-xo-1.75/boardgpio.fth2
-rw-r--r--src/app/arm-xo-1.75/showpmu.fth4
-rw-r--r--src/app/arm-xo-cl4/app.fth2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/app/arm-mmp2/lcd.fth b/src/app/arm-mmp2/lcd.fth
index 202c29b..d044d5b 100644
--- a/src/app/arm-mmp2/lcd.fth
+++ b/src/app/arm-mmp2/lcd.fth
@@ -1,4 +1,4 @@
-[ifdef] cl4
+[ifdef] mmp3
\ This value has the same effect as the value below. The
\ difference is that the SCLK_SOURCE_SELECT field added a
\ low-order bit (bit 29), so the high nibble changed from
diff --git a/src/app/arm-xo-1.75/boardgpio.fth b/src/app/arm-xo-1.75/boardgpio.fth
index 4714460..dc4c486 100644
--- a/src/app/arm-xo-1.75/boardgpio.fth
+++ b/src/app/arm-xo-1.75/boardgpio.fth
@@ -24,7 +24,7 @@ purpose: Board-specific setup details - pin assigments, etc.
led-storage-gpio# gpio-dir-out
[then]
-[ifdef] cl4
+[ifdef] mmp3
vid2-gpio# gpio-out-set
[else]
vid2-gpio# gpio-out-clr
diff --git a/src/app/arm-xo-1.75/showpmu.fth b/src/app/arm-xo-1.75/showpmu.fth
index 5b19b7b..e6ea19d 100644
--- a/src/app/arm-xo-1.75/showpmu.fth
+++ b/src/app/arm-xo-1.75/showpmu.fth
@@ -46,7 +46,7 @@
." PJ_ISR " h# a0 p.8 ." MC_HW_SLP" h# b0 p.8 ." MC_SLP_REQ " h# b4 p.8 cr
." MC_SW_SLP " h# c0 p.8 ." PLL_SEL " h# c4 p.8 ." PWR_ONOFF " h# e0 p.8 cr
." PWR_TIMER " h# e4 p.8 ." MC_PAR " h# 11c p.8 cr
-[ifdef] cl4
+[ifdef] mmp3
\ some of these might exist on mmp2 as well
." CC2_PJ " h# 150 p.8 ." CC3_PJ " h# 188 p.8 ." DEBUG2 " h# 190 p.8 cr
[then]
@@ -60,7 +60,7 @@
." CCIC2_RES " h# f4 p.8 ." HSI_RES " h# 108 p.8 ." AUDIO_RES " h# 10c p.8 cr
." DISP2_RES " h# 110 p.8 ." CCIC2_RES" h# 118 p.8 ." ISP_RES " h# 120 p.8 cr
." EPD_RES " h# 124 p.8 ." APB2_RES " h# 134 p.8 cr
-[ifdef] cl4
+[ifdef] mmp3
\ some of these might exist on mmp2 as well
." IDLE_CFG2 " h# 200 p.8 ." IDLE_CFG3" h# 204 p.8 ." ISL_POWER " h# 220 p.8 cr
." ==Other Controls==" cr
diff --git a/src/app/arm-xo-cl4/app.fth b/src/app/arm-xo-cl4/app.fth
index d4c8f97..eb0d8c5 100644
--- a/src/app/arm-xo-cl4/app.fth
+++ b/src/app/arm-xo-cl4/app.fth
@@ -1,4 +1,4 @@
-create cl4 \ OLPC XO-CL4
+create mmp3 \ MMP3-based OLPC XO-CL4
h# 10.0000 constant /rom
h# 08fe.0000 constant dlofw-base