Skip to content

Commit

Permalink
Add CMSIS-DAP to openocd, update its repo
Browse files Browse the repository at this point in the history
  • Loading branch information
@earlephilhower
earlephilhower committed Jul 2, 2021
1 parent dcbbdf3 commit 4974fe4
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $@

Expand Down Expand Up @@ -501,29 +502,29 @@ 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: $@
rm -rf $(call arena,$@)/openocd > $(call log,$@) 2>&1
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: $@
rm -rf $(call arena,$@)/openocd > $(call log,$@) 2>&1
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: $@
Expand All @@ -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: $@
Expand All @@ -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: $@
Expand Down

0 comments on commit 4974fe4

Please sign in to comment.