Updated openocd to version 0.6.0-rc1.

esden · Aug 11, 2012 · 19eb747 · 19eb747
1 parent 2a23594
commit 19eb747
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/summon-arm-toolchain b/summon-arm-toolchain
@@ -136,8 +136,8 @@ fi
 
 BINUTILS=binutils-2.21.1
 NEWLIB=newlib-1.19.0
-OOCD=openocd-0.5.0
-OOCD_GIT=9e1a16690e669b895dce7c3951b1fe893bfd6149
+OOCD=openocd-0.6.0-rc1
+OOCD_GIT=
 LIBCMSIS=
 LIBCMSIS_GIT=v1.10-3
 LIBSTM32=
@@ -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.5.0/${OOCD}.tar.bz2
+		fetch ${OOCD} http://sourceforge.net/projects/openocd/files/openocd/0.6.0-rc1/${OOCD}.tar.bz2
 	else
 		clone oocd ${OOCD_GIT} git://openocd.git.sourceforge.net/gitroot/openocd/openocd ./bootstrap
 	fi
@@ -489,10 +489,10 @@ fi
 if [ ${OOCD_EN} != 0 ]; then
 if [ ! -e ${STAMPS}/${OOCD}.build ]; then
     unpack ${OOCD}
-    log "Patching openocd to support arm7m registers"
-    cd ${OOCD}
-    patch -p1 -i ../patches/patch-openocd-arm7m-registers.diff
-    cd ..
+    #log "Patching openocd to support arm7m registers"
+    #cd ${OOCD}
+    #patch -p1 -i ../patches/patch-openocd-arm7m-registers.diff
+    #cd ..
     cd build
     log "Configuring openocd-${OOCD}"
     CFLAGS="${CFLAGS} ${OOCD_CFLAGS}" \