From dde806c6dfc3600d4a8cb2cac0d19d230e377866 Mon Sep 17 00:00:00 2001 From: Deqing Sun Date: Thu, 17 Jan 2019 00:17:08 -0500 Subject: [PATCH 1/2] fix bootloader reenumerate issue in new OSX DFU_UTIL don't reenumerate successfully in new OSX. So the bootloader will not exit and user need to reset target board. reenumerate utility from Apple's Prober.app can fix this issue --- tools/macosx/maple_upload | 10 +++++++++- tools/macosx/reenumerate | Bin 0 -> 14852 bytes 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 tools/macosx/reenumerate diff --git a/tools/macosx/maple_upload b/tools/macosx/maple_upload index 3521aa1ef..3e6221c15 100755 --- a/tools/macosx/maple_upload +++ b/tools/macosx/maple_upload @@ -50,7 +50,15 @@ if [ ! -x ${DFU_UTIL} ]; then exit 2 fi -${DFU_UTIL} -d ${usbID} -a ${altID} -D ${binfile} -R ${dfuse_addr} -R +${DFU_UTIL} -d ${usbID} -a ${altID} -D ${binfile} ${dfuse_addr} + +# DFU_UTIL doesn't reset properly in new Mac OS, use reenumerate tool from Prober.app +if (system_profiler SPUSBDataType | grep --quiet Maple\ 003) then + echo Maple 003 bootloader found, try to reenumerate it. + ${DIR}/reenumerate -v 0x1eaf,0x0003 +else + echo Maple 003 bootloader not found +fi echo -n Waiting for ${dummy_port_fullpath} serial... diff --git a/tools/macosx/reenumerate b/tools/macosx/reenumerate new file mode 100755 index 0000000000000000000000000000000000000000..9e9275d8b138380b91cc20b6aff20ca6ece9fbbf GIT binary patch literal 14852 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 Ps@6HyR;^t_p(y Date: Thu, 17 Jan 2019 13:03:17 -0500 Subject: [PATCH 2/2] restore reset with DFU_UTIL --- tools/macosx/maple_upload | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/macosx/maple_upload b/tools/macosx/maple_upload index 3e6221c15..2ffec6cc4 100755 --- a/tools/macosx/maple_upload +++ b/tools/macosx/maple_upload @@ -50,7 +50,7 @@ if [ ! -x ${DFU_UTIL} ]; then exit 2 fi -${DFU_UTIL} -d ${usbID} -a ${altID} -D ${binfile} ${dfuse_addr} +${DFU_UTIL} -d ${usbID} -a ${altID} -D ${binfile} -R ${dfuse_addr} -R # DFU_UTIL doesn't reset properly in new Mac OS, use reenumerate tool from Prober.app if (system_profiler SPUSBDataType | grep --quiet Maple\ 003) then