X-Git-Url: https://git.gag.com/?p=fw%2Fcortex-toolchain;a=blobdiff_plain;f=summon-arm-toolchain;h=ac3a91312f35d69e6a5372526f577dcc84e187bb;hp=705b9cc20528f3c2eee6d74d257c6b2944fe3433;hb=7824687485533666b54e56fcb9a5b90054e65fc0;hpb=d897aaf9a3814003f5fd9d7805e0226f7ad8a63d

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 705b9cc..ac3a913 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -20,7 +20,7 @@ set -e
 # You can also pass them as parameters to the script
 ##############################################################################
 TARGET=arm-none-eabi		# Or: TARGET=arm-elf
-PREFIX=${HOME}/sat	# Install location of your final toolchain
+PREFIX=/opt/cortex	# Install location of your final toolchain
 DARWIN_OPT_PATH=/opt/local	# Path in which MacPorts or Fink is installed
 # Set to 'sudo' if you need superuser privileges while installing
 SUDO=
@@ -32,8 +32,9 @@ USE_LINARO=1
 OOCD_EN=1
 # Set to 1 to build libstm32 provided by ST
 LIBSTM32_EN=0
-# Set to 1 to build libopenstm32 an open source library for stm32
-LIBOPENSTM32_EN=1
+# Set to 1 to build libopencm3 an open source library for Cortex M3 and simalar
+# chips
+LIBOPENCM3_EN=1
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=0
 # Override automatic detection of cpus to compile on
@@ -69,8 +70,8 @@ while [ $# -gt 0 ]; do
 		LIBSTM32_EN=*)
 		LIBSTM32_EN=$(echo $1 | sed 's,^LIBSTM32_EN=,,')
 		;;
-		LIBOPENSTM32_EN=*)
-		LIBOPENSTM32_EN=$(echo $1 | sed 's,^LIBOPENSTM32_EN=,,')
+		LIBOPENCM3_EN=*)
+		LIBOPENCM3_EN=$(echo $1 | sed 's,^LIBOPENCM3_EN=,,')
 		;;
 		DEFAULT_TO_CORTEX_M3=*)
 		DEFAULT_TO_CORTEX_M3=$(echo $1 | sed 's,^DEFAULT_TO_CORTEX_M3=,,')
@@ -96,7 +97,7 @@ echo "QUIET=$QUIET"
 echo "USE_LINARO=$USE_LINARO"
 echo "OOCD_EN=$OOCD_EN"
 echo "LIBSTM32_EN=$LIBSTM32_EN"
-echo "LIBOPENSTM32_EN=$LIBOPENSTM32_EN"
+echo "LIBOPENCM3_EN=$LIBOPENCM3_EN"
 echo "DEFAULT_TO_CORTEX_M3=$DEFAULT_TO_CORTEX_M3"
 echo "CPUS=$CPUS"
 
@@ -118,12 +119,12 @@ fi
 
 BINUTILS=binutils-2.21.1
 NEWLIB=newlib-1.19.0
-GDB=gdb-7.3.1
+GDB=gdb-7.5.1
 OOCD=master
 LIBCMSIS=v1.10-3
 LIBSTM32=v3.0.0-2
 LIBSTM32USB=v3.0.1-1
-LIBOPENSTM32=master
+LIBOPENCM3=master
 
 ##############################################################################
 # Flags section
@@ -219,7 +220,7 @@ esac
 function fetch {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
-        wget -c --no-passive-ftp $2 && touch ${STAMPS}/$1.fetch
+        wget -c $2 && touch ${STAMPS}/$1.fetch
     fi
 }
 
@@ -315,15 +316,15 @@ if [ ! -e libstm32usb-${LIBSTM32USB}.tar.bz2 ]; then
 fi
 fi
 
-if [ ${LIBOPENSTM32_EN} != 0 ]; then
-if [ ! -e libopenstm32-${LIBOPENSTM32}.tar.bz2 ]; then
-	log "Cloning libopenstm32 sources..."
-	git clone git://libopenstm32.git.sourceforge.net/gitroot/libopenstm32/libopenstm32
-        cd libopenstm32
-        git archive --format=tar --prefix=libopenstm32-${LIBOPENSTM32}/ ${LIBOPENSTM32} | \
-            bzip2 --stdout > ../libopenstm32-${LIBOPENSTM32}.tar.bz2
+if [ ${LIBOPENCM3_EN} != 0 ]; then
+if [ ! -e libopencm3-${LIBOPENCM3}.tar.bz2 ]; then
+	log "Cloning libopencm3 sources..."
+	git clone https://github.com/libopencm3/libopencm3
+        cd libopencm3
+        git archive --format=tar --prefix=libopencm3-${LIBOPENCM3}/ ${LIBOPENCM3} | \
+            bzip2 --stdout > ../libopencm3-${LIBOPENCM3}.tar.bz2
         cd ..
-        rm -rf libopenstm32
+        rm -rf libopencm3
 fi
 fi
 
@@ -335,6 +336,10 @@ fi
 
 if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
     unpack ${BINUTILS}
+    log "Patching binutils to allow SVC support on cortex-m3"
+    cd ${BINUTILS}
+    patch -p1 -i ../patches/patch-binutils-2.21.1-svc-cortexm3.diff
+    cd ..
     cd build
     log "Configuring ${BINUTILS}"
     ../${BINUTILS}/configure --target=${TARGET} \
@@ -442,6 +447,7 @@ if [ ! -e ${STAMPS}/openocd-${OOCD}.build ]; then
     CFLAGS="${CFLAGS} ${OOCD_CFLAGS}" \
     LDFLAGS="${LDFLAGS} ${OOCD_LDFLAGS}" \
     ../openocd-${OOCD}/configure --enable-maintainer-mode \
+				 --disable-werror \
 				 --prefix=${PREFIX} \
 				 --enable-dummy \
 				 --enable-ft2232_libftdi \
@@ -502,16 +508,16 @@ if [ ! -e ${STAMPS}/libstm32usb-${LIBSTM32USB}.build ]; then
 fi
 fi
 
-if [ $LIBOPENSTM32_EN != 0 ]; then
-if [ ! -e ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build ]; then
-    unpack libopenstm32-${LIBOPENSTM32}
-    cd libopenstm32-${LIBOPENSTM32}
-    log "Building libopenstm32-${LIBOPENSTM32}"
+if [ $LIBOPENCM3_EN != 0 ]; then
+if [ ! -e ${STAMPS}/libopencm3-${LIBOPENCM3}.build ]; then
+    unpack libopencm3-${LIBOPENCM3}
+    cd libopencm3-${LIBOPENCM3}
+    log "Building libopencm3-${LIBOPENCM3}"
     make PREFIX=${TARGET} DESTDIR=${PREFIX}
-    install libopenstm32-${LIBOPENSTM32} PREFIX=${TARGET} DESTDIR=${PREFIX} install
+    install libopencm3-${LIBOPENCM3} PREFIX=${TARGET} DESTDIR=${PREFIX} install
     cd ..
-    log "Cleaning up libopenstm32-${LIBOPENSTM32}"
-    touch ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build
-    rm -rf libopenstm32-${LIBOPENSTM32}
+    log "Cleaning up libopencm3-${LIBOPENCM3}"
+    touch ${STAMPS}/libopencm3-${LIBOPENCM3}.build
+    rm -rf libopencm3-${LIBOPENCM3}
 fi
 fi