From: Matthias Rampke Date: Sat, 13 Aug 2011 18:58:14 +0000 (+0200) Subject: remove dead and untested code X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=summon-arm-toolchain.git;a=commitdiff_plain;h=8408f8c62513442801d056d4058f86e1cc895b8f remove dead and untested code --- diff --git a/summon-arm-toolchain b/summon-arm-toolchain index dd5d6ea..4b90124 100755 --- a/summon-arm-toolchain +++ b/summon-arm-toolchain @@ -25,12 +25,6 @@ QUIET=0 USE_LINARO=0 # Set to 1 to enable C++ USE_CPP=0 -# Set to 1 to enable building of OpenOCD -OOCD_EN=0 -# 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 # Make the gcc default to Cortex-M3 DEFAULT_TO_CORTEX_M3=1 @@ -60,11 +54,6 @@ fi BINUTILS=binutils-2.21 NEWLIB=newlib-1.19.0 GDB=gdb-7.3 -OOCD=master -LIBCMSIS=v1.10-2 -LIBSTM32=v3.0.0-1 -LIBSTM32USB=v3.0.1-1 -LIBOPENSTM32=master GMP=gmp-5.0.2 MPFR=mpfr-3.0.1 MPC=mpc-0.9 @@ -139,9 +128,6 @@ case "$(uname)" in fi TAR=gnutar - - 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." @@ -220,64 +206,6 @@ fetch ${GMP} ftp://ftp.gmplib.org/pub/${GMP}/${GMP}.tar.bz2 fetch ${MPFR} http://www.mpfr.org/${MPFR}/${MPFR}.tar.bz2 fetch ${MPC} http://www.multiprecision.org/mpc/download/${MPC}.tar.gz -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..." - git clone git://git.open-bldc.org/libcmsis.git - cd libcmsis - git archive --format=tar --prefix=libcmsis-${LIBCMSIS}/ ${LIBCMSIS} | \ - bzip2 --stdout > ../libcmsis-${LIBCMSIS}.tar.bz2 - cd .. - rm -rf libcmsis -fi - -if [ ! -e libstm32-${LIBSTM32}.tar.bz2 ]; then - log "Cloning libstm32 sources..." - git clone git://git.open-bldc.org/libstm32.git - cd libstm32 - git archive --format=tar --prefix=libstm32-${LIBSTM32}/ ${LIBSTM32} | \ - bzip2 --stdout > ../libstm32-${LIBSTM32}.tar.bz2 - cd .. - rm -rf libstm32 -fi - -if [ ! -e libstm32usb-${LIBSTM32USB}.tar.bz2 ]; then - log "Cloning libstm32usb sources..." - git clone git://git.open-bldc.org/libstm32usb.git - cd libstm32usb - git archive --format=tar --prefix=libstm32usb-${LIBSTM32USB}/ ${LIBSTM32USB} | \ - bzip2 --stdout > ../libstm32usb-${LIBSTM32USB}.tar.bz2 - cd .. - rm -rf libstm32usb -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 - cd .. - rm -rf libopenstm32 -fi -fi - cd ${SUMMON_DIR} if [ ! -e build ]; then @@ -420,93 +348,6 @@ 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} - cd libcmsis-${LIBCMSIS} - log "Building libcmsis-${LIBCMSIS}" - make arch_prefix=${TARGET} prefix=${PREFIX} - install libcmsis-${LIBCMSIS} arch_prefix=${TARGET} prefix=${PREFIX} install - cd .. - log "Cleaning up libcmsis-${LIBCMSIS}" - touch ${STAMPS}/libcmsis-${LIBCMSIS}.build - rm -rf libcmsis-${LIBCMSIS} -fi - -if [ ! -e ${STAMPS}/libstm32-${LIBSTM32}.build ]; then - unpack libstm32-${LIBSTM32} - cd libstm32-${LIBSTM32} - log "Building libstm32-${LIBSTM32}" - make arch_prefix=${TARGET} prefix=${PREFIX} - install libstm32-${LIBSTM32} arch_prefix=${TARGET} prefix=${PREFIX} install - cd .. - log "Cleaning up libstm32-${LIBSTM32}" - touch ${STAMPS}/libstm32-${LIBSTM32}.build - rm -rf libstm32-${LIBSTM32} -fi - -if [ ! -e ${STAMPS}/libstm32usb-${LIBSTM32USB}.build ]; then - unpack libstm32usb-${LIBSTM32USB} - cd libstm32usb-${LIBSTM32USB} - log "Building libstm32usb-${LIBSTM32USB}" - make arch_prefix=${TARGET} prefix=${PREFIX} - install libstm32usb-${LIBSTM32USB} arch_prefix=${TARGET} prefix=${PREFIX} install - cd .. - log "Cleaning up libstm32usb-${LIBSTM32USB}" - touch ${STAMPS}/libstm32usb-${LIBSTM32USB}.build - rm -rf libstm32usb-${LIBSTM32USB} -fi -fi - -if [ $LIBOPENSTM32_EN != 0 ]; then -if [ ! -e ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build ]; then - unpack libopenstm32-${LIBOPENSTM32} - cd libopenstm32-${LIBOPENSTM32} - log "Building libopenstm32-${LIBOPENSTM32}" - make PREFIX=${TARGET} DESTDIR=${PREFIX} - install libopenstm32-${LIBOPENSTM32} PREFIX=${TARGET} DESTDIR=${PREFIX} install - cd .. - log "Cleaning up libopenstm32-${LIBOPENSTM32}" - touch ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build - rm -rf libopenstm32-${LIBOPENSTM32} -fi -fi - if [ ${SUMMON_DIR_CREATED} = 1 ]; then log "Removing work directory" rm -rf ${SUMMON_DIR}