X-Git-Url: https://git.gag.com/?p=fw%2Fcortex-toolchain;a=blobdiff_plain;f=summon-arm-toolchain;h=ff196e89640564fdc921d86fc8930f28d12570cd;hp=fe9e58ad4049f248c2e9b743ff79f943efdd2704;hb=e489f98fa7081127b55f234d145d0c5f356f17c3;hpb=d1fe6940a33afa4d4dc83d1429bcb66c5740b967

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index fe9e58a..ff196e8 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -26,11 +26,13 @@ SUDO=
 # Set to 1 to be quieter while running
 QUIET=0
 # Set to 1 to use linaro gcc instead of the FSF gcc
-USE_LINARO=0
+USE_LINARO=1
+# Set to 1 to enable building of OpenOCD
+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=0
+LIBOPENSTM32_EN=1
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=0
 
@@ -44,14 +46,16 @@ if [ ${USE_LINARO} == 0 ] ; then
 	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
 else
 	# For the Linaro GCC:
-	GCCVERSION=4.5-2010.08-1
+	GCCRELEASE=4.5-2010.11-0
+	GCCVERSION=4.5-2010.11-1
 	GCC=gcc-linaro-${GCCVERSION}
-	GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCVERSION}/+download/${GCC}.tar.gz
+	GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCRELEASE}/+download/${GCC}.tar.bz2
 fi
 
 BINUTILS=binutils-2.20
 NEWLIB=newlib-1.18.0
 GDB=gdb-7.2
+OOCD=master
 LIBCMSIS=v1.10-2
 LIBSTM32=v3.0.0-1
 LIBSTM32USB=v3.0.1-1
@@ -61,7 +65,11 @@ LIBOPENSTM32=master
 # Flags section
 ##############################################################################
 
-CPUS=$(getconf _NPROCESSORS_ONLN)
+if which getconf > /dev/null; then
+	CPUS=$(getconf _NPROCESSORS_ONLN)
+else
+	CPUS=1
+fi
 PARALLEL=-j$((CPUS + 1))
 echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
 
@@ -116,6 +124,11 @@ case "$(uname)" in
 	          --with-mpfr=${DARWIN_OPT_PATH} \
 	          --with-mpc=${DARWIN_OPT_PATH} \
 		  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
+	OOCD_CFLAGS="-m32 -I/opt/mine/include -I/opt/local/include"
+	OOCD_LDFLAGS="-L/opt/mine/lib -L/opt/local/lib"
+	;;
+	CYGWIN*)
+	echo "Found CygWin that means Windows most likely."
 	;;
 	*)
 	echo "Found unknown OS. Aborting!"
@@ -183,6 +196,20 @@ fetch ${GCC} ${GCCURL}
 fetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
 fetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
 
+if [ ${OOCD_EN} != 0 ]; then
+if [ ! -e openocd-${OOCD}.tar.bz2 ]; then
+	log "Cloning OpenOCD sources..."
+	git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd openocd-${OOCD}
+        cd openocd-${OOCD}
+	./bootstrap
+	cd ..
+	tar cfvj openocd-${OOCD}.tar.bz2 openocd-${OOCD}
+        #git archive --format=tar --prefix=openocd-${OOCD}/ ${OOCD} | \
+        #    bzip2 --stdout > ../openocd-${OOCD}.tar.bz2
+        rm -rf openocd-${OOCD}
+fi
+fi
+
 if [ ${LIBSTM32_EN} != 0 ]; then
 if [ ! -e libcmsis-${LIBCMSIS}.tar.bz2 ]; then
 	log "Cloning libcmsis sources..."
@@ -351,6 +378,41 @@ if [ ! -e ${STAMPS}/${GDB}.build ]; then
     rm -rf build/* ${GDB}
 fi
 
+if [ ${OOCD_EN} != 0 ]; then
+if [ ! -e ${STAMPS}/openocd-${OOCD}.build ]; then
+    unpack openocd-${OOCD}
+    cd build
+    log "Configuring openocd-${OOCD}"
+    CFLAGS="${CFLAGS} ${OOCD_CFLAGS}" \
+    LDFLAGS="${LDFLAGS} ${OOCD_LDFLAGS}" \
+    ../openocd-${OOCD}/configure --enable-maintainer-mode \
+                      --prefix=${PREFIX} \
+                      --enable-dummy \
+		      --enable-parport \
+		      --enable-ft2232_libftdi \
+		      --enable-usb_blaster_libftdi \
+		      --enable-amtjtagaccel \
+		      --enable-zy1000 \
+		      --enable-ep93xx \
+		      --enable-at91rm9200 \
+		      --enable-gw16012 \
+		      --enable-presto_libftdi \
+		      --enable-usbprog \
+		      --enable-jlink \
+		      --enable-vsllink \
+		      --enable-rlink \
+		      --enable-arm-jtag-ew \
+		      --enable-buspirate
+    log "Building openocd-${OOCD}"
+    make ${MAKEFLAGS}
+    install openocd-${OOCD} install
+    cd ..
+    log "Cleaning up openocd-${OOCD}"
+    touch ${STAMPS}/openocd-${OOCD}.build
+    rm -rf build/* ${OOCD}
+fi
+fi
+
 if [ ${LIBSTM32_EN} != 0 ]; then
 if [ ! -e ${STAMPS}/libcmsis-${LIBCMSIS}.build ]; then
     unpack libcmsis-${LIBCMSIS}