aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-05-08 09:04:01 +0200
committerLubomir Rintel <lkundrak@v3.sk>2019-05-08 10:22:32 +0200
commit273995fb1d99eb7d0e4372ed46c69e7c7a9db72c (patch)
tree1d7ce81008ab626e1e5c1c7a604b547057390a0f
parent72c676ac00733e8f504129279da8265571506988 (diff)
downloadopenfirmware-273995fb1d99eb7d0e4372ed46c69e7c7a9db72c.tar.gz
olpc: include mmp2/galcore on MMP2
-rw-r--r--cpu/arm/mmp2/galcore.fth8
-rw-r--r--cpu/arm/olpc/build-fw.fth3
2 files changed, 3 insertions, 8 deletions
diff --git a/cpu/arm/mmp2/galcore.fth b/cpu/arm/mmp2/galcore.fth
index b7d75dc9..3fb0a36a 100644
--- a/cpu/arm/mmp2/galcore.fth
+++ b/cpu/arm/mmp2/galcore.fth
@@ -8,17 +8,9 @@ new-device
" gpu" device-name
" mrvl,galcore" +compatible
gpu-pa /gpu reg
-[ifdef] mmp2
8 encode-int " interrupts" property
" /interrupt-controller" encode-phandle " interrupt-parent" property
" galcore 2D" encode-string " interrupt-names" property
-[then]
-
-[ifdef] mmp3
- d# 0 encode-int 2 encode-int encode+ " interrupts" property
- " /interrupt-controller/interrupt-controller@1c0" encode-phandle " interrupt-parent" property
- " galcore 3D" encode-string " galcore 2D" encode-string encode+ " interrupt-names" property
-[then]
" /clocks" encode-phandle mmp2-gc-clk# encode-int encode+ " clocks" property
" GCCLK" " clock-names" string-property
diff --git a/cpu/arm/olpc/build-fw.fth b/cpu/arm/olpc/build-fw.fth
index 41d1b393..66466dbe 100644
--- a/cpu/arm/olpc/build-fw.fth
+++ b/cpu/arm/olpc/build-fw.fth
@@ -265,6 +265,9 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth
end-package
fload ${BP}/cpu/arm/olpc/lcd.fth
+[ifdef] mmp2
+fload ${BP}/cpu/arm/mmp2/galcore.fth
+[then]
[ifdef] mmp3
fload ${BP}/cpu/arm/mmp3/galcore.fth
[then]