From 4974fe45068e29ec3214625161ca981c6c141e57 Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Fri, 2 Jul 2021 12:04:51 -0700
Subject: [PATCH] Add CMSIS-DAP to openocd, update its repo

---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 037c034..07821c9 100644
--- a/Makefile
+++ b/Makefile
@@ -333,6 +333,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	    esac ; \
 	    (cd $(REPODIR)/$(GCC_DIR); rm -rf $${base}; ln -s $${name} $${base}) \
 	done >> $(call log,$@) 2>&1
+	(cd  $(REPODIR)/openocd && ./bootstrap) >> $(call log,$@) 2>&1
 	touch $@
 
 # Checkout any required branches
@@ -341,7 +342,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	(cd $(REPODIR)/$(GCC_DIR) && git reset --hard && git checkout $(GCC_BRANCH)) > $(call log,$@) 2>&1
 	(cd $(REPODIR)/$(BINUTILS_DIR) && git reset --hard && git checkout $(BINUTILS_BRANCH)) >> $(call log,$@) 2>&1
 	(cd $(REPODIR)/$(NEWLIB_DIR) && git reset --hard && git checkout $(NEWLIB_BRANCH)) >> $(call log,$@) 2>&1
-	(cd $(REPODIR)/openocd && git reset --hard && git checkout picoprobe && git submodule update --init --recursive) >> $(call log,$@) 2>&1
+	(cd $(REPODIR)/openocd && git reset --hard && git checkout rp2040 && git submodule update --init --recursive) >> $(call log,$@) 2>&1
 	(cd $(REPODIR)/pico-sdk && git reset --hard && git checkout $(PICOSCK_BRANCH)) >> $(call log,$@) 2>&1
 	touch $@
 
@@ -501,7 +502,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	cp -a $(REPODIR)/openocd $(call arena,$@)/openocd >> $(call log,$@) 2>&1
 	cp blobs/libudev1_237-3ubuntu10_arm64.deb blobs/libudev-dev_237-3ubuntu10_arm64.deb blobs/libusb-1.0-0-dev_1.0.21-2_arm64.deb $(call arena,$@)/. >> $(call log,$@) 2>&1
 	(cd $(call arena,$@); for i in *.deb; do ar x $$i; tar xvf data.tar.xz; rm $$i; done) >> $(call log,$@) 2>&1
-	(cd $(call arena,$@)/openocd; LIBUSB1_CFLAGS=-I$(call arena,$@)/usr/include/libusb-1.0 LIBUSB1_LIBS="-L$(call arena,$@)/usr/lib/$(call host,$@) -lusb-1.0" LDFLAGS="-L$(call arena,$@)/lib/$(call host,$@) -lpthread -ludev" ./configure --enable-picoprobe --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
+	(cd $(call arena,$@)/openocd; LIBUSB1_CFLAGS=-I$(call arena,$@)/usr/include/libusb-1.0 LIBUSB1_LIBS="-L$(call arena,$@)/usr/lib/$(call host,$@) -lusb-1.0" LDFLAGS="-L$(call arena,$@)/lib/$(call host,$@) -lpthread -ludev" ./configure --enable-picoprobe --enable-cmsis-dap --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
 
 .stage.RPI.openocd-prep: .stage.RPI.start
 	echo STAGE: $@
@@ -509,7 +510,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	cp -a $(REPODIR)/openocd $(call arena,$@)/openocd >> $(call log,$@) 2>&1
 	cp blobs/libudev-dev_237-3ubuntu10_armhf.deb  blobs/libudev1_237-3ubuntu10.48_armhf.deb  blobs/libusb-1.0-0-dev_1.0.21-1_armhf.deb $(call arena,$@)/. >> $(call log,$@) 2>&1
 	(cd $(call arena,$@); for i in *.deb; do ar x $$i; tar xvf data.tar.xz; rm $$i; done) >> $(call log,$@) 2>&1
-	(cd $(call arena,$@)/openocd; LIBUSB1_CFLAGS=-I$(call arena,$@)/usr/include/libusb-1.0 LIBUSB1_LIBS="-L$(call arena,$@)/usr/lib/$(call host,$@) -lusb-1.0" LDFLAGS="-L$(call arena,$@)/lib/$(call host,$@) -lpthread -ludev" ./configure --enable-picoprobe --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
+	(cd $(call arena,$@)/openocd; LIBUSB1_CFLAGS=-I$(call arena,$@)/usr/include/libusb-1.0 LIBUSB1_LIBS="-L$(call arena,$@)/usr/lib/$(call host,$@) -lusb-1.0" LDFLAGS="-L$(call arena,$@)/lib/$(call host,$@) -lpthread -ludev" ./configure --enable-picoprobe --enable-cmsis-dap --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
 
 .stage.LINUX32.openocd-prep: .stage.LINUX32.start
 	echo STAGE: $@
@@ -517,13 +518,13 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	cp -a $(REPODIR)/openocd $(call arena,$@)/openocd >> $(call log,$@) 2>&1
 	cp blobs/libudev1_237-3ubuntu10_i386.deb blobs/libudev-dev_237-3ubuntu10_i386.deb blobs/libusb-1.0-0-dev_1.0.21-2_i386.deb $(call arena,$@)/. >> $(call log,$@) 2>&1
 	(cd $(call arena,$@); for i in *.deb; do ar x $$i; tar xvf data.tar.xz; rm $$i; done) >> $(call log,$@) 2>&1
-	(cd $(call arena,$@)/openocd; LIBUSB1_CFLAGS=-I$(call arena,$@)/usr/include/libusb-1.0 LIBUSB1_LIBS="-L$(call arena,$@)/usr/lib/i386-linux-gnu -lusb-1.0" LDFLAGS="-L$(call arena,$@)/lib/i386-linux-gnu -lpthread -ludev" ./configure --enable-picoprobe --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
+	(cd $(call arena,$@)/openocd; LIBUSB1_CFLAGS=-I$(call arena,$@)/usr/include/libusb-1.0 LIBUSB1_LIBS="-L$(call arena,$@)/usr/lib/i386-linux-gnu -lusb-1.0" LDFLAGS="-L$(call arena,$@)/lib/i386-linux-gnu -lpthread -ludev" ./configure --enable-picoprobe --enable-cmsis-dap --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
 
 .stage.LINUX.openocd-prep: .stage.LINUX.start
 	echo STAGE: $@
 	rm -rf $(call arena,$@)/openocd > $(call log,$@) 2>&1
 	cp -a $(REPODIR)/openocd $(call arena,$@)/openocd >> $(call log,$@) 2>&1
-	(cd $(call arena,$@)/openocd; ./configure --enable-picoprobe --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd) >> $(call log,$@) 2>&1
+	(cd $(call arena,$@)/openocd; ./configure --enable-picoprobe --enable-cmsis-dap --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd) >> $(call log,$@) 2>&1
 
 .stage.WIN32.openocd-prep: .stage.WIN32.start
 	echo STAGE: $@
@@ -532,7 +533,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	cp blobs/mingw-w64-i686-libusb-1.0.23-1-any.pkg.tar.xz $(call arena,$@) >> $(call log,$@) 2>&1
 	(cd $(call arena,$@); tar xvf mingw-w64-i686-libusb-1.0.23-1-any.pkg.tar.xz) >> $(call log,$@) 2>&1
 	mkdir -p $(call arena,$@)/pkg.openocd.$(call arch,$@)/openocd/bin; cp $(call arena,$@)/mingw32/bin/libusb-1.0.dll $(call arena,$@)/pkg.openocd.$(call arch,$@)/openocd/bin >> $(call log,$@) 2>&1
-	(cd $(call arena,$@)/openocd; LDFLAGS="-L$(call arena,$@)/mingw32/lib" ./configure --enable-picoprobe --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
+	(cd $(call arena,$@)/openocd; LDFLAGS="-L$(call arena,$@)/mingw32/lib" ./configure --enable-picoprobe --enable-cmsis-dap --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
 
 .stage.WIN64.openocd-prep: .stage.WIN64.start
 	echo STAGE: $@
@@ -541,7 +542,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	cp blobs/mingw-w64-x86_64-libusb-1.0.23-1-any.pkg.tar.xz $(call arena,$@) >> $(call log,$@) 2>&1
 	(cd $(call arena,$@); tar xvf mingw-w64-x86_64-libusb-1.0.23-1-any.pkg.tar.xz) >> $(call log,$@) 2>&1
 	mkdir -p $(call arena,$@)/pkg.openocd.$(call arch,$@)/openocd/bin; cp $(call arena,$@)/mingw64/bin/libusb-1.0.dll $(call arena,$@)/pkg.openocd.$(call arch,$@)/openocd/bin >> $(call log,$@) 2>&1
-	(cd $(call arena,$@)/openocd; LDFLAGS="-L$(call arena,$@)/mingw64/lib" ./configure --enable-picoprobe --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
+	(cd $(call arena,$@)/openocd; LDFLAGS="-L$(call arena,$@)/mingw64/lib" ./configure --enable-picoprobe --enable-cmsis-dap --disable-werror --prefix $(call arena,$@)/../pkg.openocd.$(call arch,$@)/openocd --host=$(call host,$@)) >> $(call log,$@) 2>&1
 
 .stage.OSX.openocd: .stage.OSX.start
 	echo STAGE: $@