Fixed openocd build. Not all of the previously enabled interfaces were working. Becau...

[fw/cortex-toolchain] / summon-arm-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 2a12296a9531dc6197046c362d728e7538d90f01..d7592f7fe014abffe74998a847665db1ff1fdb46 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -41,19 +41,19 @@ DEFAULT_TO_CORTEX_M3=0
 ##############################################################################
 if [ ${USE_LINARO} == 0 ] ; then
        # For FSF GCC:
-       GCCVERSION=4.5.1
+       GCCVERSION=4.5.2
        GCC=gcc-${GCCVERSION}
        GCCURL=http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
 else
        # For the Linaro GCC:
-       GCCRELEASE=4.5-2010.11-0
-       GCCVERSION=4.5-2010.11-1
+       GCCRELEASE=4.5-2011.01-1
+       GCCVERSION=4.5-2011.01-1
        GCC=gcc-linaro-${GCCVERSION}
        GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCRELEASE}/+download/${GCC}.tar.bz2
 fi
 
-BINUTILS=binutils-2.20
-NEWLIB=newlib-1.18.0
+BINUTILS=binutils-2.21
+NEWLIB=newlib-1.19.0
 GDB=gdb-7.2
 OOCD=master
 LIBCMSIS=v1.10-2
@@ -123,8 +123,8 @@ case "$(uname)" in
                   --with-gmp=${DARWIN_OPT_PATH} \
                  --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"
+                 --with-libiconv-prefix=${DARWIN_OPT_PATH}"
+       OOCD_CFLAGS="-I/opt/mine/include -I/opt/local/include"
        OOCD_LDFLAGS="-L/opt/mine/lib -L/opt/local/lib"
        ;;
        CYGWIN*)
@@ -383,26 +383,21 @@ if [ ! -e ${STAMPS}/openocd-${OOCD}.build ]; then
     unpack openocd-${OOCD}
     cd build
     log "Configuring openocd-${OOCD}"
-    export CFLAGS="${OOCD_CFLAGS}"
-    export LDFLAGS="${OOCD_LDFLAGS}"
+    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
+                                --prefix=${PREFIX} \
+                                --enable-dummy \
+                                --enable-ft2232_libftdi \
+                                --enable-usb_blaster_libftdi \
+                                --enable-ep93xx \
+                                --enable-at91rm9200 \
+                                --enable-presto_libftdi \
+                                --enable-usbprog \
+                                --enable-jlink \
+                                --enable-vsllink \
+                                --enable-rlink \
+                                --enable-arm-jtag-ew
     log "Building openocd-${OOCD}"
     make ${MAKEFLAGS}
     install openocd-${OOCD} install