Update flashtool and t-head toolchain

Author: wy-hh

config/bouffalolab/toolchain/riscv_toolchain.gni

@@ -25,7 +25,7 @@ template("riscv_toolchain") {
 
     if ("linux" == host_os) {
       if (chip_device_platform == "bl616") {
-        _tool_name_root = "${bouffalolab_sdk_root}/toolchain/riscv/Thead_riscv/Linux_x86_64/bin/riscv64-unknown-elf-"
+        _tool_name_root = "${bouffalolab_sdk_root}/toolchain/t-head-riscv/gcc_t-head_v2.6.1/bin/riscv64-unknown-elf-"
       } else {
         _tool_name_root = "${bouffalolab_sdk_root}/toolchain/riscv/Linux/bin/riscv64-unknown-elf-"
       }

examples/lighting-app/bouffalolab/README.md

@@ -80,24 +80,19 @@ Mac OS.
     source ./scripts/activate.sh -p bouffalolab
     ```
 
-    > After environment setup `Bouffalo Lab` flash tool, `bflb-iot-tool`,
-    > imports under this environment. If not, please try
-    > `scripts/bootstrap.sh -p bouffalolab` for matter environment update.
-
 -   Setup build environment for `Bouffalo Lab` SoC
 
-    Run `setup.sh` to install `Bouffalo Lab` SDK to /opt/bouffalolab_sdk
+    Run `env-setup.sh` to install `Bouffalo Lab` toolchain.
 
     ```
-    cd third_party/bouffalolab/repo
-    sudo bash scripts/setup.sh
+    ./third_party/bouffalolab/env-setup.sh
     ```
 
     Please execute following command to export `BOUFFALOLAB_SDK_ROOT` before
     building.
 
     ```
-    export BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk
+    export BOUFFALOLAB_SDK_ROOT="Your install path"
     ```
 
 ## Build CHIP Lighting App example

scripts/build/builders/bouffalolab.py

@@ -223,12 +223,12 @@ def __init__(self,
 
     def print_enviroment_error(self):
         logging.fatal('*' * 80)
+        logging.error('Flashtool is not installed, or environment variable BOUFFALOLAB_SDK_ROOT is not exported.')
         logging.fatal('\tPlease make sure Bouffalo Lab SDK installs as below:')
-        logging.fatal('\t\tcd third_party/bouffalolab/repo')
-        logging.fatal('\t\tsudo bash scripts/setup.sh')
+        logging.fatal('\t\t./third_party/bouffalolab/env-setup.sh')
 
         logging.fatal('\tPlease make sure BOUFFALOLAB_SDK_ROOT exports before building as below:')
-        logging.fatal('\t\texport BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk')
+        logging.fatal('\t\texport BOUFFALOLAB_SDK_ROOT="your install path"')
         logging.fatal('*' * 80)
 
     def GnBuildArgs(self):

scripts/flashing/bouffalolab_firmware_utils.py

@@ -20,6 +20,7 @@
 import re
 import shutil
 import sys
+import subprocess
 
 import coloredlogs
 import firmware_utils
@@ -169,36 +170,23 @@ def actions(self):
         """Perform actions on the device according to self.option."""
         self.log(3, 'Options:', self.option)
 
-        try:
-            import bflb_iot_tool
-            import bflb_iot_tool.__main__
+        flashtool_path = os.environ.get('BOUFFALOLAB_SDK_ROOT') + "/flashtool/BouffaloLabDevCube-v1.8.9"
+        flashtool_exe = flashtool_path + "/bflb_iot_tool-ubuntu"
 
-        #     version_target_str = "1.8.9"
-        #     version_target = version_target_str.split('.')
-        #     version_target = "".join(["%03d" % int(var) for var in version_target])
-
-        #     version_current_str = importlib.metadata.version("bflb_iot_tool")
-        #     version_current = version_current_str.split('.')
-        #     version_current = "".join(["%03d" % int(var) for var in version_current])
-
-        #     if version_current < version_target:
-        #         raise Exception("bflb_iot_tool {} version is less than {}".format(version_current_str, version_target_str))
-
-        except Exception as e:
-
-        #     logging.error('Please try the following command to setup or upgrade Bouffalo Lab environment:')
-        #     logging.error('source scripts/activate.sh -p bouffalolab')
-        #     logging.error('Or')
-        #     logging.error('source scripts/bootstrap.sh -p bouffalolab')
-
-        #     logging.error('If upgrade bflb_iot_tool failed, try pip uninstall bflb_iot_tool first.')
+        if not os.path.exists(flashtool_exe):
+            logging.fatal('*' * 80)
+            logging.error('Flashtool is not installed, or environment variable BOUFFALOLAB_SDK_ROOT is not exported.')
+            logging.fatal('\tPlease make sure Bouffalo Lab SDK installs as below:')
+            logging.fatal('\t\t./third_party/bouffalolab/env-setup.sh')
 
+            logging.fatal('\tPlease make sure BOUFFALOLAB_SDK_ROOT exports before building as below:')
+            logging.fatal('\t\texport BOUFFALOLAB_SDK_ROOT="your install path"')
+            logging.fatal('*' * 80)
             raise Exception(e)
 
-        tool_path = os.path.dirname(bflb_iot_tool.__file__)
-
         options_keys = BOUFFALO_OPTIONS["configuration"].keys()
-        arguments = [__file__]
+        # arguments = [__file__]
+        arguments = [flashtool_exe]
         work_dir = None
 
         if self.option.reset:
@@ -285,22 +273,22 @@ def actions(self):
             raise Exception("Wrong key pair.")
 
         if not dts_path and xtal_value:
-            chip_config_path = os.path.join(tool_path, "chips", chip_name, "device_tree")
+            chip_config_path = os.path.join(flashtool_path, "chips", chip_name, "device_tree")
             dts_path = self.get_dts_file(chip_config_path, xtal_value, chip_name)
             arguments.append("--dts")
             arguments.append(dts_path)
 
         if boot2_image:
-            chip_config_path = os.path.join(tool_path, "chips", chip_name, "builtin_imgs")
+            chip_config_path = os.path.join(flashtool_path, "chips", chip_name, "builtin_imgs")
             boot2_image = self.get_boot_image(chip_config_path, boot2_image)
             arguments.append("--boot2")
             arguments.append(boot2_image)
         else:
             if self.option.erase:
                 arguments.append("--erase")
 
-            if chip_name in {"bl602", "bl702"}:
-                chip_config_path = os.path.join(tool_path, "chips", chip_name, "builtin_imgs")
+            if chip_name in {"bl602", "bl702", "bl616"}:
+                chip_config_path = os.path.join(flashtool_path, "chips", chip_name, "builtin_imgs")
                 boot2_image = self.get_boot_image(chip_config_path, boot2_image)
                 arguments.append("--boot2")
                 arguments.append(boot2_image)
@@ -315,7 +303,11 @@ def actions(self):
             os.mkdir(ota_output_folder)
 
         logging.info("Arguments {}".format(arguments))
-        bflb_iot_tool.__main__.run_main()
+        process = subprocess.Popen(arguments, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        while process.poll() is None:
+            line = process.stdout.readline().decode('utf-8').rstrip()
+            if line:
+                logging.info(line)
 
         if ota_output_folder:
             ota_images = os.listdir(ota_output_folder)

scripts/setup/requirements.bouffalolab.txt

@@ -1,4 +1,3 @@
-bflb-iot-tool>=1.8.6
 jsonschema>=4.4.0
 cbor2>=5.4.3
 ecdsa>=0.18.0

third_party/bouffalolab/common/bouffalolab_executable.gni

@@ -27,7 +27,7 @@ template("bouffalolab_executable") {
   objcopy = "riscv64-unknown-elf-objcopy"
   if ("linux" == host_os) {
     if (invoker.bl_plat_name == "bl616") {
-      objcopy = "${bouffalolab_sdk_root}/toolchain/riscv/Thead_riscv/Linux_x86_64/bin/riscv64-unknown-elf-objcopy"
+      objcopy = "${bouffalolab_sdk_root}/toolchain/t-head-riscv/gcc_t-head_v2.6.1/bin/riscv64-unknown-elf-objcopy"
     } else {
       objcopy = "${bouffalolab_sdk_root}/toolchain/riscv/Linux/bin/riscv64-unknown-elf-objcopy"
     }

third_party/bouffalolab/env-setup.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+set -x
+CURRENT_DIR=$(
+    cd "$(dirname "$0")"
+    pwd
+)
+
+user=`stat -c %U $0`
+
+SDK_ROOT=/opt/bouffalolab_sdk
+ 
+echo "Please input path to install toolchain, or type Enter to install under ${SDK_ROOT}"
+read TOOLCHAIN_SETUP_ROOT
+if [[ ${TOOLCHAIN_SETUP_ROOT} == "" ]]; then
+    TOOLCHAIN_SETUP_ROOT=$SDK_ROOT
+fi
+echo "Toolchain will install under ${TOOLCHAIN_SETUP_ROOT}"
+flash_tool_postfix=
+
+flash_tool=BouffaloLabDevCube-v1.8.9
+flash_tool_url=https://dev.bouffalolab.com/media/upload/download/${flash_tool}.zip
+thead_toolchain=gcc_t-head_v2.6.1
+thead_toolchain_url=https://codeload.github.com/bouffalolab/toolchain_gcc_t-head_linux/zip/c4afe91cbd01bf7dce525e0d23b4219c8691e8f0
+thead_toolchain_unzip=toolchain_gcc_t-head_linux-c4afe91cbd01bf7dce525e0d23b4219c8691e8f0
+
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    toolchains_url=(
+        "toolchain/riscv" "https://dev.bouffalolab.com/media/upload/download/toolchain_riscv_sifive_linux64.zip" Linux toolchain_riscv_sifive_linux
+        "toolchain/t-head-riscv" ${thead_toolchain_url} ${thead_toolchain} ${thead_toolchain_unzip}
+        "flashtool" ${flash_tool_url} ${flash_tool} ""
+    )
+    flash_tool_postfix=ubuntu
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    toolchains_url=(
+        "toolchain/riscv/Darwin" "https://dev.bouffalolab.com/media/upload/download/toolchain_riscv_sifive_macos.zip"
+    )
+    flash_tool_postfix=macos
+else
+    echo "Not support for ""$OSTYPE"
+fi
+
+if [ ! -d "$TOOLCHAIN_SETUP_ROOT" ]; then
+    mkdir -p "$TOOLCHAIN_SETUP_ROOT"
+fi
+rm -rf "$TOOLCHAIN_SETUP_ROOT"/*.zip
+
+for ((i = 0; i < ${#toolchains_url[@]}; i += 4)); do
+    path=${toolchains_url[i]}
+    url=${toolchains_url[i + 1]}
+    out=${toolchains_url[i + 2]}
+    unzip_name=${toolchains_url[i + 3]}
+
+    if [ -d "$TOOLCHAIN_SETUP_ROOT/$path/$out" ]; then
+        continue
+    fi
+    rm -rf "$TOOLCHAIN_SETUP_ROOT/$path"
+    mkdir -p "$TOOLCHAIN_SETUP_ROOT/$path"
+
+    wget -P "$TOOLCHAIN_SETUP_ROOT"/ "$url"
+    toolchain_zip=$(basename "$url")
+    toolchain_zip=`find $TOOLCHAIN_SETUP_ROOT -maxdepth 1 -name *${toolchain_zip}*`
+    toolchain_zip=$(basename "$toolchain_zip")
+    if [ ! -f "$TOOLCHAIN_SETUP_ROOT/$toolchain_zip" ]; then
+        exit 1
+    fi
+
+    unzip -q "$TOOLCHAIN_SETUP_ROOT/$toolchain_zip" -d "$TOOLCHAIN_SETUP_ROOT/$path/tmp"
+    mv $TOOLCHAIN_SETUP_ROOT/$path/tmp/$unzip_name $TOOLCHAIN_SETUP_ROOT/$path/$out
+
+    rm -rf $TOOLCHAIN_SETUP_ROOT/$path/tmp
+    rm -rf $TOOLCHAIN_SETUP_ROOT/$toolchain_zip
+
+    if [ -f "$TOOLCHAIN_SETUP_ROOT/$path"/$out/chmod755.sh ]; then
+        cd "$TOOLCHAIN_SETUP_ROOT/$path"/$out
+        bash chmod755.sh
+        cd "$CURRENT_DIR"
+    fi
+done
+
+chmod +x ${TOOLCHAIN_SETUP_ROOT}/flashtool/${flash_tool}/BLDevCube-${flash_tool_postfix}
+chmod +x ${TOOLCHAIN_SETUP_ROOT}/flashtool/${flash_tool}/bflb_iot_tool-${flash_tool_postfix}
+
+if [[ "$user" != "root" ]]; then
+    chown $user ${TOOLCHAIN_SETUP_ROOT}/flashtool/${flash_tool}/ -R
+fi