Added description of summon-arm-toolchain script command line options.

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

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 3e98e2bd3258812a901e4e235c21ae054fbbcd33..0fd7a1ac537276c7695608bee38b9af1635f5d48 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -36,6 +36,8 @@ LIBSTM32_EN=0
 LIBOPENSTM32_EN=1
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=0
+# Override automatic detection of cpus to compile on
+CPUS=
 
 ##############################################################################
 # Parsing command line parameters
@@ -73,6 +75,9 @@ while [ $# -gt 0 ]; do
                DEFAULT_TO_CORTEX_M3=*)
                DEFAULT_TO_CORTEX_M3=$(echo $1 | sed 's,^DEFAULT_TO_CORTEX_M3=,,')
                ;;
+               CPUS=*)
+               CPUS=$(echo $1 | sed 's,^CPUS=,,')
+               ;;
                *)
                echo "Unknown parameter: $1"
                exit 1
@@ -93,8 +98,8 @@ echo "OOCD_EN=$OOCD_EN"
 echo "LIBSTM32_EN=$LIBSTM32_EN"
 echo "LIBOPENSTM32_EN=$LIBOPENSTM32_EN"
 echo "DEFAULT_TO_CORTEX_M3=$DEFAULT_TO_CORTEX_M3"
+echo "CPUS=$CPUS"
 
-exit 0
 ##############################################################################
 # Version and download url settings section
 ##############################################################################
@@ -116,7 +121,7 @@ NEWLIB=newlib-1.19.0
 GDB=gdb-7.2
 OOCD=master
 LIBCMSIS=v1.10-3
-LIBSTM32=v3.0.0-1
+LIBSTM32=v3.0.0-2
 LIBSTM32USB=v3.0.1-1
 LIBOPENSTM32=master
 
@@ -124,12 +129,18 @@ LIBOPENSTM32=master
 # Flags section
 ##############################################################################
 
-if which getconf > /dev/null; then
-       CPUS=$(getconf _NPROCESSORS_ONLN)
+if [ "x${CPUS}" == "x" ]; then
+       if which getconf > /dev/null; then
+               CPUS=$(getconf _NPROCESSORS_ONLN)
+       else
+               CPUS=1
+       fi
+
+       PARALLEL=-j$((CPUS + 1))
 else
-       CPUS=1
+       PARALLEL=-j${CPUS}
 fi
-PARALLEL=-j$((CPUS + 1))
+
 echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
 
 GDBFLAGS=
@@ -204,8 +215,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 --no-passive-ftp $2 && touch ${STAMPS}/$1.fetch
     fi
 }