Cosmetics and typo fixes.

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

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index bf2059d9f56e629f3e162d40609ce5161da30708..6f268e26a0c882c36634a7e68e141215fd930401 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -2,22 +2,25 @@
 # Written by Uwe Hermann <uwe@hermann-uwe.de>, released as public domain.
 # Modified by Piotr Esden-Tempski <piotr@esden.net>, released as public domain.
 
-TARGET=arm-elf                 # Or: TARGET=arm-none-eabi
-PREFIX=${HOME}/arm-elf         # Install location of your final toolchain
-PARALLEL=""                    # Or: PARALLEL="-j 5" for 4 CPU's
+TARGET=arm-none-eabi           # Or: TARGET=arm-elf
+PREFIX=${HOME}/arm-none-eabi   # Install location of your final toolchain
+PARALLEL=""                    # Or: PARALLEL="-j 5" for 4 CPUs
 DARWIN_OPT_PATH=/opt/local     # Path in which MacPorts or Fink is installed
 
 BINUTILS=binutils-2.19.1
-GCC=gcc-4.4.0
+GCC=gcc-4.4.2
 NEWLIB=newlib-1.17.0
-GDB=gdb-6.8
+GDB=gdb-7.1
 LIBCMSIS=v1.10-2
 LIBSTM32=v3.0.0-1
 LIBSTM32USB=v3.0.1-1
 LIBOPENSTM32=master
-LIBSTM32_EN=0
+LIBSTM32_EN=1
 LIBOPENSTM32_EN=0
 
+SUMMON_DIR=$(pwd)
+SOURCES=${SUMMON_DIR}/sources
+
 export PATH="${PREFIX}/bin:${PATH}"
 
 case "$(uname)" in
@@ -25,6 +28,7 @@ case "$(uname)" in
        echo "Found Linux OS."
        GCCFLAGS=
        GDBFLAGS=
+       BINUTILFLAGS=
        ;;
        Darwin)
        echo "Found Darwin OS."
@@ -32,6 +36,7 @@ case "$(uname)" in
                  --with-mpfr=${DARWIN_OPT_PATH} \
                  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
         GDBFLAGS="--disable-werror"
+       BINUTILFLAGS="--disable-werror"
        ;;
        *)
        echo "Found unknown OS. Aborting!"
@@ -39,30 +44,23 @@ case "$(uname)" in
        ;;
 esac
 
-if [ ! -e sources ]; then
-    mkdir sources
+if [ ! -e ${SOURCES} ]; then
+    mkdir ${SOURCES}
 fi
 
-cd sources
-if [ ! -e ${BINUTILS}.tar.bz2 ]; then
-       echo "Downloading binutils sources..."
-       wget -c http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
-fi
+cd ${SOURCES}
 
-if [ ! -e ${GCC}.tar.bz2 ]; then
-       echo "Downloading gcc sources..."
-       wget -c ftp://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.bz2
-fi
+echo "Downloading binutils sources..."
+wget -c http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
 
-if [ ! -e ${NEWLIB}.tar.gz ]; then
-       echo "Downloading newlib sources..."
-       wget -c ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
-fi
+echo "Downloading gcc sources..."
+wget -c ftp://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.bz2
 
-if [ ! -e ${GDB}.tar.bz2 ]; then
-       echo "Downloading gdb sources..."
-       wget -c ftp://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
-fi
+echo "Downloading newlib sources..."
+wget -c ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
+
+echo "Downloading gdb sources..."
+wget -c ftp://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
 
 if [ ${LIBSTM32_EN} != 0 ]; then
 if [ ! -e libcmsis-${LIBCMSIS}.tar.bz2 ]; then
@@ -99,7 +97,7 @@ fi
 if [ ${LIBOPENSTM32_EN} != 0 ]; then
 if [ ! -e libopenstm32-${LIBOPENSTM32}.tar.bz2 ]; then
        echo "Cloning libopenstm32 sources..."
-       git clone git://libopenstm32.git.sourceforge.net/gitroot/libopenstm32
+       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
@@ -108,7 +106,7 @@ if [ ! -e libopenstm32-${LIBOPENSTM32}.tar.bz2 ]; then
 fi
 fi
 
-cd ..
+cd ${SUMMON_DIR}
 
 if [ ! -e build ]; then
     mkdir build
@@ -118,7 +116,7 @@ if [ ! -e .${BINUTILS}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${BINUTILS}"
     echo "******************************************************************"
-    tar xfvj sources/${BINUTILS}.tar.bz2
+    tar xfvj ${SOURCES}/${BINUTILS}.tar.bz2
     cd build
     echo "******************************************************************"
     echo "* Configuring ${BINUTILS}"
@@ -129,7 +127,8 @@ if [ ! -e .${BINUTILS}.build ]; then
                            --enable-multilib \
                            --with-gnu-as \
                            --with-gnu-ld \
-                           --disable-nls || exit
+                           --disable-nls \
+                          ${BINUTILFLAGS} || exit
     echo "******************************************************************"
     echo "* Building ${BINUTILS}"
     echo "******************************************************************"
@@ -150,7 +149,7 @@ if [ ! -e .${GCC}-boot.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${GCC}-boot"
     echo "******************************************************************"
-    tar xfvj sources/${GCC}.tar.bz2
+    tar xfvj ${SOURCES}/${GCC}.tar.bz2
     cd build
     echo "******************************************************************"
     echo "* Configuring ${GCC}-boot"
@@ -187,7 +186,7 @@ if [ ! -e .${NEWLIB}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${NEWLIB}"
     echo "******************************************************************"
-    tar xfvz sources/${NEWLIB}.tar.gz
+    tar xfvz ${SOURCES}/${NEWLIB}.tar.gz
     cd build
     echo "******************************************************************"
     echo "* Configuring ${NEWLIB}"
@@ -221,7 +220,7 @@ if [ ! -e .${GCC}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${GCC}"
     echo "******************************************************************"
-    tar xfvj sources/${GCC}.tar.bz2
+    tar xfvj ${SOURCES}/${GCC}.tar.bz2
     cd build
     echo "******************************************************************"
     echo "* Configuring ${GCC}"
@@ -236,7 +235,7 @@ if [ ! -e .${GCC}.build ]; then
                       --with-gnu-as \
                       --with-gnu-ld \
                      --disable-nls \
-                     ${GCCFLAGS} || exit
+                    ${GCCFLAGS} || exit
     echo "******************************************************************"
     echo "* Building ${GCC}"
     echo "******************************************************************"
@@ -257,7 +256,7 @@ if [ ! -e .${GDB}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${GDB}"
     echo "******************************************************************"
-    tar xfvj sources/${GDB}.tar.bz2
+    tar xfvj ${SOURCES}/${GDB}.tar.bz2
     cd build
     echo "******************************************************************"
     echo "* Configuring ${GDB}"
@@ -288,7 +287,7 @@ if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking libcmsis-${LIBCMSIS}"
     echo "******************************************************************"
-    tar xfvj sources/libcmsis-${LIBCMSIS}.tar.bz2
+    tar xfvj ${SOURCES}/libcmsis-${LIBCMSIS}.tar.bz2
     cd libcmsis-${LIBCMSIS}
     echo "******************************************************************"
     echo "* Building libcmsis-${LIBCMSIS}"
@@ -310,7 +309,7 @@ if [ ! -e .libstm32-${LIBSTM32}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking libstm32-${LIBSTM32}"
     echo "******************************************************************"
-    tar xfvj sources/libstm32-${LIBSTM32}.tar.bz2
+    tar xfvj ${SOURCES}/libstm32-${LIBSTM32}.tar.bz2
     cd libstm32-${LIBSTM32}
     echo "******************************************************************"
     echo "* Building libstm32-${LIBSTM32}"
@@ -332,7 +331,7 @@ if [ ! -e .libstm32usb-${LIBSTM32USB}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking libstm32usb-${LIBSTM32USB}"
     echo "******************************************************************"
-    tar xfvj sources/libstm32usb-${LIBSTM32USB}.tar.bz2
+    tar xfvj ${SOURCES}/libstm32usb-${LIBSTM32USB}.tar.bz2
     cd libstm32usb-${LIBSTM32USB}
     echo "******************************************************************"
     echo "* Building libstm32usb-${LIBSTM32USB}"
@@ -355,7 +354,7 @@ if [ $LIBOPENSTM32_EN != 0 ]; then
     echo "******************************************************************"
     echo "* Unpacking libopenstm32-${LIBOPENSTM32}"
     echo "******************************************************************"
-    tar xfvj sources/libopenstm32-${LIBOPENSTM32}.tar.bz2
+    tar xfvj ${SOURCES}/libopenstm32-${LIBOPENSTM32}.tar.bz2
     cd libopenstm32-${LIBOPENSTM32}
     echo "******************************************************************"
     echo "* Building libopenstm32-${LIBOPENSTM32}"