Updated package: MRS 2.1.0; Changed dockerfile to handle new package structure, ISP and SVD files are now extracted from the MRS package

Author: islandcontroller

Diff for: .github/workflows/deploy-dockerhub-action.yml

@@ -38,7 +38,7 @@ jobs:
           CACHE_ACCESS_TOKEN: ${{ secrets.CACHE_ACCESS_TOKEN }}
           CACHE_GITHUB_USER: ${{ secrets.CACHE_GITHUB_USER }}
           CACHE_USER_REPO: ${{ secrets.CACHE_USER_REPO }}
-          CACHE_REPO_TAG: v1.92.0
+          CACHE_REPO_TAG: v2.1.0
         run: |
           .cache/fetch_cache.sh
       

Diff for: Dockerfile

@@ -55,31 +55,47 @@ RUN curl -sLO ${DOTNET_URL} && \
 ENV PATH=$PATH:${DOTNET_INSTALL_DIR}
 
 #- Mounriver Toolchain & Debugger ----------------------------------------------
-ARG MOUNRIVER_VERSION=1.92
-#ARG MOUNRIVER_URL="http://file.mounriver.com/tools/MRS_Toolchain_Linux_x64_V$MOUNRIVER_VERSION.tar.xz"
-ARG MOUNRIVER_URL="/tmp/MRS_Toolchain_Linux_x64_V$MOUNRIVER_VERSION.tar.xz"
-ARG MOUNRIVER_MD5="370603b2bf606ac1ccb15531bd22f012"
+ARG MOUNRIVER_VERSION=210
+#ARG MOUNRIVER_URL="http://file-oss.mounriver.com/upgrade/MounRiverStudio_Linux_X64_V${MOUNRIVER_VERSION}.tar.xz"
+ARG MOUNRIVER_URL="/tmp/MounRiverStudio_Linux_X64_V${MOUNRIVER_VERSION}.tar.xz"
+ARG MOUNRIVER_MD5="53daec6011d4b5b9302681a7237ffeb4"
 ARG MOUNRIVER_OPENOCD_INSTALL_DIR="/opt/openocd"
 ARG MOUNRIVER_TOOLCHAIN_INSTALL_DIR="/opt/gcc-riscv-none-elf"
 ARG MOUNRIVER_RULES_INSTALL_DIR="/opt/wch/rules"
+ARG MOUNRIVER_FIRMWARE_INSTALL_DIR="/opt/wch/firmware"
+ARG MOUNRIVER_SVD_INSTALL_DIR="/opt/wch/svd"
 
 # Download and install package
-#RUN curl -sLO ${MOUNRIVER_URL} && \
-COPY MRS_Toolchain_Linux_x64_V$MOUNRIVER_VERSION.tar.xz /tmp
-RUN echo "${MOUNRIVER_MD5} $(basename ${MOUNRIVER_URL})" | md5sum -c - && \
+#RUN curl -sLO ${MOUNRIVER_URL}
+COPY MounRiverStudio_Linux_X64_V${MOUNRIVER_VERSION}.tar.xz /tmp
+RUN mkdir -p ${MOUNRIVER_RULES_INSTALL_DIR} && \
+    mkdir -p ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR} && \
+    mkdir -p ${MOUNRIVER_SVD_INSTALL_DIR} && \
+    echo "${MOUNRIVER_MD5} $(basename ${MOUNRIVER_URL})" | md5sum -c - && \
     MOUNRIVER_TMP=$(mktemp -d) && \
     tar -xf $(basename "${MOUNRIVER_URL}") -C $MOUNRIVER_TMP --strip-components=1 && \
     rm $(basename "${MOUNRIVER_URL}") && \
     mv $MOUNRIVER_TMP/beforeinstall/lib* /usr/lib/ && ldconfig && \
-    mkdir -p ${MOUNRIVER_RULES_INSTALL_DIR} && \
     mv $MOUNRIVER_TMP/beforeinstall/*.rules ${MOUNRIVER_RULES_INSTALL_DIR} && \
-    mv $MOUNRIVER_TMP/RISC-V_Embedded_GCC12 ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR} && \
-    rm $MOUNRIVER_TMP/OpenOCD/bin/wch-arm.cfg && \
-    mv $MOUNRIVER_TMP/OpenOCD ${MOUNRIVER_OPENOCD_INSTALL_DIR} && \
+    mv $MOUNRIVER_TMP/MRS-linux-x64/resources/app/resources/linux/components/WCH/Toolchain/RISC-V\ Embedded\ GCC12 ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR}/wch && \
+    rm $MOUNRIVER_TMP/MRS-linux-x64/resources/app/resources/linux/components/WCH/OpenOCD/OpenOCD/bin/wch-arm.cfg && \
+    mv $MOUNRIVER_TMP/MRS-linux-x64/resources/app/resources/linux/components/WCH/OpenOCD/OpenOCD ${MOUNRIVER_OPENOCD_INSTALL_DIR} && \
+    mv $MOUNRIVER_TMP/MRS-linux-x64/resources/app/resources/linux/components/WCH/Others/Firmware_Link/default ${MOUNRIVER_FIRMWARE_INSTALL_DIR} && \
+    for i in $(find $MOUNRIVER_TMP/MRS-linux-x64/resources/app/resources/linux/components/WCH/SDK/default/RISC-V/ -name *.svd | uniq); do mv $i ${MOUNRIVER_SVD_INSTALL_DIR}; done && \
     rm -rf $MOUNRIVER_TMP
 COPY gcc-riscv-none-elf.cmake ${CMAKE_CONFIGS_PATH}
 ENV PATH=$PATH:${MOUNRIVER_TOOLCHAIN_INSTALL_DIR}/bin:${MOUNRIVER_OPENOCD_INSTALL_DIR}/bin
 
+# Fix broken openocd file permissions
+RUN chmod +x ${MOUNRIVER_OPENOCD_INSTALL_DIR}/bin/openocd
+
+# Workaround: link to mis-named toolchain binaries
+RUN mkdir -p ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR}/bin && \
+    for i in $(ls ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR}/wch/bin/riscv-wch-elf-*); do k=$(echo "$(basename $i)" | sed s/wch/none/g); ln -s ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR}/wch/bin/$(basename $i) ${MOUNRIVER_TOOLCHAIN_INSTALL_DIR}/bin/$k; done
+
+# Create links to SVD files
+RUN ln -s -t ${MOUNRIVER_SVD_INSTALL_DIR}/../ $(ls ${MOUNRIVER_SVD_INSTALL_DIR}/*.svd)
+
 # Display warning for mis-configured toolchains
 ARG MOUNRIVER_LEGACY_TOOLCHAIN_INSTALL_DIR="/opt/gcc-riscv-none-embed"
 COPY path-info.sh ${MOUNRIVER_LEGACY_TOOLCHAIN_INSTALL_DIR}/bin/path-info.sh
@@ -98,27 +114,6 @@ RUN curl -sLO ${ISPTOOL_URL} && \
     rm -rf $(basename ${ISPTOOL_URL})
 ENV PATH=$PATH:${ISPTOOL_INSTALL_DIR}
 
-#- Debugger SVD and ISP Firmware files -----------------------------------------
-ARG UPDATE_VERSION=191
-#ARG UPDATE_URL="http://file.mounriver.com/upgrade/MounRiver_Update_V$UPDATE_VERSION.zip"
-ARG UPDATE_URL="/tmp/MounRiver_Update_V$UPDATE_VERSION.zip"
-ARG UPDATE_MD5="fadf314169815d819fbc477891859259"
-ARG UPDATE_FIRMWARE_INSTALL_DIR="/opt/wch/firmware"
-ARG UPDATE_SVD_INSTALL_DIR="/opt/wch/svd"
-
-# Download update package, extract firmware/SVD files and install
-#RUN curl -sLO ${UPDATE_URL} && \
-COPY MounRiver_Update_V$UPDATE_VERSION.zip /tmp
-RUN echo "${UPDATE_MD5} $(basename ${UPDATE_URL})" | md5sum -c - && \
-    UPDATE_TMP=$(mktemp -d) && \
-    unzip $(basename ${UPDATE_URL}) -d $UPDATE_TMP && \
-    rm $(basename ${UPDATE_URL}) && \
-    mv $UPDATE_TMP/update/Firmware_Link ${UPDATE_FIRMWARE_INSTALL_DIR} && \
-    mkdir -p ${UPDATE_SVD_INSTALL_DIR} && \
-    for i in $(find $UPDATE_TMP/template/wizard/WCH/RISC-V/ -name *.svd | uniq); do mv $i ${UPDATE_SVD_INSTALL_DIR}; done && \
-    rm -rf $UPDATE_TMP && \
-    ln -s -t ${UPDATE_SVD_INSTALL_DIR}/../ $(ls ${UPDATE_SVD_INSTALL_DIR}/*.svd)
-
 #- CH32X035 PIOC assembler -----------------------------------------------------
 ARG WASM53B_COMMIT="3c09f65938122733a0af728c30999bac51a9abbf"
 ARG WASM53B_URL="https://github.com/openwch/ch32x035/raw/${WASM53B_COMMIT}/EVT/EXAM/PIOC/Tool_Manual/Tool/WASM53B.EXE"

Diff for: README.md

@@ -7,22 +7,11 @@
 
 ### Packages
 * [Microsoft .NET 6.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) Version 6.0.36
-* [MounRiver MRS Toolchain & Debugger](http://www.mounriver.com/download) Linux_x64 Version 1.92
-  * includes WCH-custom GNU toolchain for RISC-V
-  * includes WCH-custom OpenOCD debugger
-* [MounRiver Studio SVD and ISP firmware files](http://www.mounriver.com/download) Update Version 1.91
-  * ISP Firmware: Version `v31`
-  * SVD files:
-    - `CH32V003xx`
-    - `CH32V103xx`
-    - `CH32V203xx`
-    - `CH32V208xx`
-    - `CH32V303xx`
-    - `CH32V305xx`
-    - `CH32V307xx`
-    - `CH56Xxx`
-    - `CH57Xxx`
-    - `CH58Xxx`
+* [MounRiver Studio II (MRS2)](http://www.mounriver.com/download) Version 2.1.0
+  * WCH-custom GNU toolchain for RISC-V Version 12.2.0
+  * WCH-custom OpenOCD Version 0.11.0
+  * ISP Firmware Version `v36`
+  * SVD files
 * [CH32X035 PIOC Assembler](https://github.com/openwch/ch32x035/tree/main/EVT/EXAM/PIOC/Tool_Manual/Tool) Version 3.1
 
 * [CMake](https://cmake.org/download) Version 3.31.2