cforth: update to a newer version

This switches to the github.com/MitchBradley repository and pins it to
the commit that is known to build well. It contains fixes for newer
compilers, native and cross-compilers.

The cforth image grew a couple of kilos, which is why move the shim 4k
further on XO-1.75.

Tested on XO-1.75 (MMP2) and Dell Ariel (MMP3).

6 files changed, 14 insertions, 21 deletions

diff --git a/cpu/arm/olpc/1.75/cforth-version.fth b/cpu/arm/olpc/1.75/cforth-version.fth
index 1abce974..5c0318b3 100644
--- a/cpu/arm/olpc/1.75/cforth-version.fth
+++ b/cpu/arm/olpc/1.75/cforth-version.fth
@@ -10,8 +10,7 @@
 \ You don't need ssh access to the server.
 \ macro: CFORTH_VERSION clone
 
-\ Otherwise, the source code will be will be downloaded as a tarball via gitweb.
-\ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6
-macro: CFORTH_VERSION HEAD
+\ Otherwise, the source code will be will be downloaded as a tarball.
+macro: CFORTH_VERSION d3370770888eca85c2a64e5da551091f90c341cb
 
 macro: CFORTH_BUILD_DIR cforth/build/arm-xo-1.75
diff --git a/cpu/arm/olpc/1.75/olpc.bth b/cpu/arm/olpc/1.75/olpc.bth
index ea39215c..13691839 100644
--- a/cpu/arm/olpc/1.75/olpc.bth
+++ b/cpu/arm/olpc/1.75/olpc.bth
@@ -50,7 +50,7 @@ timh:  TIMH        0 d101f000
 \ Main Processor code loaded into DRAM
 image: OBMI      800 d101c000 ${BP}/cpu/arm/olpc/dummy.img
 \ Secure Processor code loaded into SRAM
-image: WTMI     1000 d1018000 shim.img
+image: WTMI     1000 d1019000 shim.img
 image: CFTH     2000 d1000000 cforth.img
 reserved:
   term:
diff --git a/cpu/arm/olpc/3.0/cforth-version.fth b/cpu/arm/olpc/3.0/cforth-version.fth
index 1d588786..682b3d35 100644
--- a/cpu/arm/olpc/3.0/cforth-version.fth
+++ b/cpu/arm/olpc/3.0/cforth-version.fth
@@ -10,8 +10,7 @@
 \ You don't need ssh access to the server.
 \ macro: CFORTH_VERSION clone
 
-\ Otherwise, the source code will be will be downloaded as a tarball via gitweb.
-\ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6
-macro: CFORTH_VERSION HEAD
+\ Otherwise, the source code will be will be downloaded as a tarball.
+macro: CFORTH_VERSION d3370770888eca85c2a64e5da551091f90c341cb
 
 macro: CFORTH_BUILD_DIR cforth/build/arm-xo-3.0
diff --git a/cpu/arm/olpc/4.0/cforth-version.fth b/cpu/arm/olpc/4.0/cforth-version.fth
index c464c931..edb2105e 100644
--- a/cpu/arm/olpc/4.0/cforth-version.fth
+++ b/cpu/arm/olpc/4.0/cforth-version.fth
@@ -10,8 +10,7 @@
 \ You don't need ssh access to the server.
 \ macro: CFORTH_VERSION clone
 
-\ Otherwise, the source code will be will be downloaded as a tarball via gitweb.
-\ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6
-macro: CFORTH_VERSION HEAD
+\ Otherwise, the source code will be will be downloaded as a tarball.
+macro: CFORTH_VERSION d3370770888eca85c2a64e5da551091f90c341cb
 
 macro: CFORTH_BUILD_DIR cforth/build/arm-xo-cl4
diff --git a/cpu/arm/olpc/build-cforth.fth b/cpu/arm/olpc/build-cforth.fth
index 7743986b..36103418 100644
--- a/cpu/arm/olpc/build-cforth.fth
+++ b/cpu/arm/olpc/build-cforth.fth
@@ -8,17 +8,14 @@ purpose: Common instructions for fetching and building CForth
 
 " ${CFORTH_BUILD_DIR}/Makefile" expand$ $file-exists?  0=  [if]
    " ${CFORTH_VERSION}" expand$ " modify" $=  [if]
-      " git clone -q git+ssh://dev.laptop.org/git/users/wmb/cforth" expand$ $sh
+      " git clone -q git@github.com:MitchBradley/cforth" expand$ $sh
    [else]
       " ${CFORTH_VERSION}" expand$ " clone" $=  [if]
-         " git clone -q git://dev.laptop.org/users/wmb/cforth" expand$ $sh
+         " git clone -q https://github.com/MitchBradley/cforth" expand$ $sh
       [else]   
-         " wget -q -O - http://dev.laptop.org/git/users/wmb/cforth/snapshot/cforth-${CFORTH_VERSION}.tar.gz | tar xfz -" expand$ $sh
-         " mv cforth-${CFORTH_VERSION} cforth" expand$ $sh
-         " wget -q -O - http://dev.laptop.org/git/users/wmb/cforth/patch | head -1 | cut -f 2 -d ' ' >>${CFORTH_BUILD_DIR}/version" expand$ $sh
-         \ " echo -n const char cforth_version[] = '""' >${CFORTH_BUILD_DIR}/cforth_version.c" expand$ $sh
-         \ " wget -q -O - http://dev.laptop.org/git/users/wmb/cforth/patch | head -1 | cut -f 2 -d ' ' >>${CFORTH_BUILD_DIR}/cforth_version.c" expand$ $sh
-         \ " echo '"";' >>${CFORTH_BUILD_DIR}/cforth_version.c" expand$ $sh
+         " mkdir -p cforth" $sh
+         " wget -q -O - https://github.com/MitchBradley/cforth/archive/${CFORTH_VERSION}/cforth-${CFORTH_VERSION}.tar.gz | tar xfz - --strip-components=1 -C cforth" expand$ $sh
+         " wget -q -O - https://github.com/MitchBradley/cforth/commit/${CFORTH_VERSION}.patch | head -1 | cut -f 2 -d ' ' >>${CFORTH_BUILD_DIR}/version" expand$ $sh
       [then]
    [then]
 [then]
diff --git a/cpu/arm/olpc/cl4/cforth-version.fth b/cpu/arm/olpc/cl4/cforth-version.fth
index c464c931..edb2105e 100644
--- a/cpu/arm/olpc/cl4/cforth-version.fth
+++ b/cpu/arm/olpc/cl4/cforth-version.fth
@@ -10,8 +10,7 @@
 \ You don't need ssh access to the server.
 \ macro: CFORTH_VERSION clone
 
-\ Otherwise, the source code will be will be downloaded as a tarball via gitweb.
-\ macro: CFORTH_VERSION 59859f04454bc2574ab68cf0fd76ebdbc5f26fb6
-macro: CFORTH_VERSION HEAD
+\ Otherwise, the source code will be will be downloaded as a tarball.
+macro: CFORTH_VERSION d3370770888eca85c2a64e5da551091f90c341cb
 
 macro: CFORTH_BUILD_DIR cforth/build/arm-xo-cl4