Skip to content

Commit

Permalink
Merge pull request #31 Update to openocd-0.6.0 and doc apt-get zlib
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'revlon/master' into beta
  • Loading branch information
esden committed Oct 31, 2012
2 parents 26d84dd + 832a080 commit 068966e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Notes for Linux users:
You need to install several packages. On Debian just run:

$ apt-get install flex bison libgmp3-dev libmpfr-dev libncurses5-dev \
libmpc-dev autoconf texinfo build-essential libftdi-dev
libmpc-dev autoconf texinfo build-essential libftdi-dev zlib1g-dev git

You may want to try running the following command instead too:

Expand Down
6 changes: 3 additions & 3 deletions summon-arm-toolchain
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Requirements (example is for Debian, replace package names as needed):
#
# apt-get install flex bison libgmp3-dev libmpfr-dev libncurses5-dev \
# libmpc-dev autoconf texinfo build-essential
# libmpc-dev autoconf texinfo build-essential libftdi-dev zlib1g-dev git
#
# Or on Ubuntu Maverick give `apt-get build-dep gcc-4.5` a try.
#
Expand Down Expand Up @@ -136,7 +136,7 @@ fi

BINUTILS=binutils-2.21.1
NEWLIB=newlib-1.19.0
OOCD=openocd-0.6.0-rc1
OOCD=openocd-0.6.0
OOCD_GIT=
LIBCMSIS=
LIBCMSIS_GIT=v1.10-3
Expand Down Expand Up @@ -334,7 +334,7 @@ fetch ${GDB} ${GDBURL}

if [ ${OOCD_EN} != 0 ]; then
if [ "x${OOCD_GIT}" == "x" ]; then
fetch ${OOCD} http://sourceforge.net/projects/openocd/files/openocd/0.6.0-rc1/${OOCD}.tar.bz2
fetch ${OOCD} http://sourceforge.net/projects/openocd/files/openocd/0.6.0/${OOCD}.tar.bz2
else
clone oocd ${OOCD_GIT} git://openocd.git.sourceforge.net/gitroot/openocd/openocd ./bootstrap
fi
Expand Down

0 comments on commit 068966e

Please sign in to comment.