zephyrproject-rtos · ajf58 · Nov 25, 2024 · Nov 25, 2024 · Dec 1, 2024 · Dec 2, 2024
diff --git a/.github/workflows/choco_packages.config b/.github/workflows/choco_packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="gcc-arm-embedded" version="10.2.1" />
-  <package id="cmake" version="3.31.0" installArguments="ADD_CMAKE_TO_PATH=System" />
   <package id="mingw" version="12.2.0" />
   <package id="ninja" version="1.11.1" />
 </packages>
diff --git a/.github/workflows/multi-gcc.yml b/.github/workflows/multi-gcc.yml
diff --git a/.github/workflows/scripts/generate_multi_gcc_workflow.py b/.github/workflows/scripts/generate_multi_gcc_workflow.py
@@ -5,15 +5,52 @@
 import subprocess
 import re
 
-toolchain_dir = "/opt/arm"
-toolchains = os.listdir(toolchain_dir)
+toolchains = [os.path.join("/opt/arm", x) for x in os.listdir("/opt/arm")]
+toolchains += [os.path.join("/opt/riscv", x) for x in os.listdir("/opt/riscv")]
 
-gcc_versions = OrderedDict()
+compilers = []
+class Compiler:
+    def __init__(self, version, path, type):
+        self.version = version
+        self.path = path
+        self.type = type
 
+    @property
+    def gcc(self):
+        return self.type == "GCC"
+
+    @property
+    def llvm(self):
+        return self.type == "LLVM"
+
+    @property
+    def riscv(self):
+        return "RISCV" in self.type
+
+    def __repr__(self):
+        return self.version
+
+seen_versions = []
 for toolchain in toolchains:
-    fullpath = os.path.join(toolchain_dir, toolchain)
-    gcc_path = os.path.join(fullpath, "bin/arm-none-eabi-gcc")
-    version = subprocess.run([gcc_path, "--version"], capture_output=True)
+    gcc_path = os.path.join(toolchain, "bin/arm-none-eabi-gcc")
+    llvm_path = os.path.join(toolchain, "bin/clang")
+    riscv_gcc_path = os.path.join(toolchain, "bin/riscv32-unknown-elf-gcc")
+
+    type = None
+    path = None
+    if os.path.exists(gcc_path):
+        path = gcc_path
+        type = "GCC"
+    elif os.path.exists(llvm_path):
+        path = llvm_path
+        type = "LLVM"
+    elif os.path.exists(riscv_gcc_path):
+        path = riscv_gcc_path
+        type = "RISCV GCC"
+    else:
+        raise Exception("Unknown compiler type")
+
+    version = subprocess.run([path, "--version"], capture_output=True)
     stdout = version.stdout.decode('utf-8')
     stderr = version.stderr.decode('utf-8')
     assert(len(stderr) == 0)
@@ -23,14 +60,13 @@
     assert(m is not None)
     version = m.group(1)
 
-    if version in gcc_versions:
-        raise Exception("Already have version {} in versions current path {}, this path {}".format(version, gcc_versions[version], fullpath))
-
-    gcc_versions[version] = fullpath
+    if version in seen_versions:
+        raise Exception("Already have version {} in versions current path {}, this path {}".format(version, gcc_versions[version], path))
 
-# Sort by major version
-gcc_versions_sorted = OrderedDict(sorted(gcc_versions.items(), key=lambda item: int(item[0].replace(".", ""))))
+    compilers.append(Compiler(version, toolchain, type))
+    seen_versions.append(version)
 
+compilers_sorted = sorted(compilers, key=lambda x: int(x.version.replace(".", "")))
 
 # Create output
 output = '''
@@ -59,14 +95,55 @@
 
     - name: Checkout submodules
       run: git submodule update --init
+
+    - name: Host Release
+      run: cd ${{github.workspace}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE=Release -DPICO_NO_PICOTOOL=1 -DPICO_PLATFORM=host; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)
+
+    - name: Host Debug
+      run: cd ${{github.workspace}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE=Debug -DPICO_NO_PICOTOOL=1 -DPICO_PLATFORM=host; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)
 '''
 
-for gcc_version, toolchain_path in gcc_versions_sorted.items():
-    for build_type in ["Debug", "Release"]:
-        output += "\n"
-        output += "    - name: GCC {} {}\n".format(gcc_version, build_type)
-        output += "      if: always()\n"
-        output += "      shell: bash\n"
-        output += "      run: cd ${{{{github.workspace}}}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE={} -DPICO_TOOLCHAIN_PATH={} -DPICO_BOARD=pico_w; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)\n".format(build_type, toolchain_path)
+platforms = []
+class Platform:
+    def __init__(self, name, platform, board, minimum_gcc_version=None):
+        self.name = name
+        self.board = board
+        self.platform = platform
+        self.riscv = "riscv" in platform
+        self.minimum_gcc_version = minimum_gcc_version
+
+    def cmake_string(self, compiler):
+        opts = []
+        # Temporary while private repo
+        opts.append("-DPICO_NO_PICOTOOL=1")
+        if self.board: opts.append(f"-DPICO_BOARD={self.board}")
+        opts.append(f"-DPICO_PLATFORM={self.platform}")
+        if compiler.llvm: opts.append("-DPICO_COMPILER=pico_arm_clang")
+        opts.append(f"-DPICO_TOOLCHAIN_PATH={compiler.path}")
+        return " ".join(opts)
+
+    def compiler_valid(self, compiler):
+        if compiler.riscv != self.riscv:
+            return False
+
+        if self.minimum_gcc_version and compiler.gcc:
+            if int(compiler.version.split(".")[0]) < self.minimum_gcc_version:
+                return False
 
+        return True
+
+
+platforms.append(Platform("Pico W", "rp2040", "pico_w"))
+platforms.append(Platform("RP2350", "rp2350", None, 9))
+platforms.append(Platform("RP2350 RISCV", "rp2350-riscv", None))
+
+for compiler in compilers_sorted:
+    for build_type in ["Debug", "Release"]:
+        for p in platforms:
+            if not p.compiler_valid(compiler): continue
+            output += "\n"
+            output += "    - name: {} {} {} {}\n".format(compiler.type, compiler.version, build_type, p.name)
+            output += "      if: always()\n"
+            output += "      shell: bash\n"
+            output += "      run: cd ${{{{github.workspace}}}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE={} {}; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)\n".format(build_type, p.cmake_string(compiler))
 print(output)
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,12 +1,12 @@
 module(
     name = "pico-sdk",
-    version = "2.1.0",
+    version = "2.1.1",
 )
 
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "rules_python", version = "0.36.0")
-bazel_dep(name = "picotool", version = "2.1.0")
+bazel_dep(name = "picotool", version = "2.1.1")
 bazel_dep(name = "rules_cc", version = "0.0.10")
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -54,34 +54,34 @@ http_archive(
 http_archive(
     name = "clang_linux-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "6c599d1aba568236064c340d7813324849896d5a4e2f3fd8225a8c31bfcbf884",
+    sha256 = "82302f8f0d9cb1062e60756147403c1525e965e1d7b777fab8076c74c7a5a19b",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/linux-amd64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
 http_archive(
     name = "clang_win-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "f49ba4123ee3958f2b47289d017a5b3f1ca01f82dd7a2168c45412c18101fd13",
+    sha256 = "2e9b8ac889838754e5305b6fd73c7bba7a6ec7364f1ce8ac60268b6d3bc61e6c",
     type = "zip",
     # Windows doesn't like `:` in the produced filename, so replace it with `%3A`.
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/windows-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026".replace("git_revision:", "git_revision%3A"),
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/windows-amd64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c".replace("git_revision:", "git_revision%3A"),
 )
 
 http_archive(
     name = "clang_mac-x86_64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "d3516f2eb4c12d17ae77ee84c9226fbea581d4fb806910ceac4717d5adfcf748",
+    sha256 = "d3f2ef6f391ef66141092cfdf07facd18d2587a25616e1251e6e6b13b05ab3df",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-amd64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-amd64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
 http_archive(
     name = "clang_mac-aarch64",
     build_file = "//bazel/toolchain:clang.BUILD",
-    sha256 = "68e551f41c7e9473063b09819f6ab8ec6e7e53677f4078189656cb14dc52984b",
+    sha256 = "61109b8464e9213ef8b9bfe55ce56298b94d4c66eaea308cf2b6556b0b85429e",
     type = "zip",
-    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:2b0a708f41dd6291ee744704d43febc975e3d026",
+    url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
 new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
@@ -90,23 +90,23 @@ new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl"
 new_git_repository(
     name = "tinyusb",
     build_file = "//src/rp2_common/tinyusb:tinyusb.BUILD",
-    commit = "5217cee5de4cd555018da90f9f1bcc87fb1c1d3a",  # keep-in-sync-with-submodule: lib/tinyusb
+    commit = "86ad6e56c1700e85f1c5678607a762cfe3aa2f47",  # keep-in-sync-with-submodule: lib/tinyusb
     remote = "https://github.com/hathach/tinyusb.git",
 )
 
 # TODO: Provide btstack as a proper Bazel module.
 new_git_repository(
     name = "btstack",
     build_file = "//src/rp2_common/pico_btstack:btstack.BUILD",
-    commit = "2b49e57bd1fae85ac32ac1f41cdb7c794de335f6",  # keep-in-sync-with-submodule: lib/btstack
+    commit = "501e6d2b86e6c92bfb9c390bcf55709938e25ac1",  # keep-in-sync-with-submodule: lib/btstack
     remote = "https://github.com/bluekitchen/btstack.git",
 )
 
 # TODO: Provide cyw43-driver as a proper Bazel module.
 new_git_repository(
     name = "cyw43-driver",
     build_file = "//src/rp2_common/pico_cyw43_driver:cyw43-driver.BUILD",
-    commit = "cf924bb04c8984675ca0fc2178f082e404e048c3",  # keep-in-sync-with-submodule: lib/cyw43-driver
+    commit = "c1075d4bc440422cf2b2fd12c64a1f53f77660ee",  # keep-in-sync-with-submodule: lib/cyw43-driver
     remote = "https://github.com/georgerobotics/cyw43-driver.git",
 )
 

diff --git a/README.md b/README.md
@@ -184,7 +184,7 @@ instructions for other platforms, and just in general, we recommend you see [Ras
 
    When building for a board other than the Raspberry Pi Pico, you should pass `-DPICO_BOARD=board_name` to the `cmake` command above, e.g. `cmake -DPICO_BOARD=pico2 ..` or `cmake -DPICO_BOARD=pico_w ..` to configure the SDK and build options accordingly for that particular board.
 
-   Specifying `PICO_BOARD=<booardname>` sets up various compiler defines (e.g. default pin numbers for UART and other hardware) and in certain 
+   Specifying `PICO_BOARD=<boardname>` sets up various compiler defines (e.g. default pin numbers for UART and other hardware) and in certain 
    cases also enables the use of additional libraries (e.g. wireless support when building for `PICO_BOARD=pico_w`) which cannot
    be built without a board which provides the requisite hardware functionality.
 

diff --git a/bazel/toolchain/BUILD.bazel b/bazel/toolchain/BUILD.bazel
@@ -79,9 +79,11 @@ cc_args(
     name = "llvm-libc_args",
     actions = ["@rules_cc//cc/toolchains/actions:link_actions"],
     args = [
+        "--unwindlib=none",
         "-nostdlib++",
         "-nostartfiles",
         "-Wl,-lc++",
+        "-Wl,-lm",
     ],
     visibility = ["//visibility:private"],
 )

diff --git a/cmake/preload/toolchains/pico_arm_clang_arm.cmake b/cmake/preload/toolchains/pico_arm_clang_arm.cmake
@@ -1,5 +1,3 @@
-# NOTE: THIS IS A WIP ONLY PICO_ARM_GCC IS CURRENTLY SUPPORTED
-# todo there is probably a more "cmake" way of doing this going thru the standard path with our "PICO" platform
 #  i.e. CMake<Lang>Information and whatnot
 include(${CMAKE_CURRENT_LIST_DIR}/util/find_compiler.cmake)
 

diff --git a/cmake/preload/toolchains/pico_arm_cortex_m33_clang.cmake b/cmake/preload/toolchains/pico_arm_cortex_m33_clang.cmake
@@ -4,5 +4,5 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m33)
 set(PICO_CLANG_RUNTIMES armv8m.main_soft_nofp armv8m.main-unknown-none-eabi)
 
 set(PICO_COMMON_LANG_FLAGS "-mcpu=cortex-m33 --target=armv8m.main-none-eabi -mfloat-abi=softfp -march=armv8m.main+fp+dsp")
-
+set(PICO_DISASM_OBJDUMP_ARGS --mcpu=cortex-m33 --arch=armv8m.main+fp+dsp)
 include(${CMAKE_CURRENT_LIST_DIR}/util/pico_arm_clang_common.cmake)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -55,11 +55,21 @@ if(PICO_BUILD_DOCS)
     set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
     set(doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 
+    if(DOXYGEN_VERSION VERSION_GREATER_EQUAL "1.9.8")
+        # see https://github.com/doxygen/doxygen/issues/10562
+        set(DOXY_API_DOCS_TAB_TYPE "topics")
+    else()
+        set(DOXY_API_DOCS_TAB_TYPE "modules")
+    endif()
+    set(doxylayout_in ${CMAKE_CURRENT_SOURCE_DIR}/DoxygenLayout.xml.in)
+    set(doxylayout ${CMAKE_CURRENT_BINARY_DIR}/DoxygenLayout.xml)
+
     if (PICO_PLATFORM STREQUAL "rp2040")
         set(PICO_DOXYGEN_TAG "(RP2040)")
     elseif (PICO_PLATFORM STREQUAL "rp2350-arm-s" OR PICO_PLATFORM STREQUAL "rp2350-riscv")
         set(PICO_DOXYGEN_TAG "(RP2350)")
     endif()
+    configure_file(${doxylayout_in} ${doxylayout} @ONLY)
     configure_file(${doxyfile_in} ${doxyfile} @ONLY)
 
     add_custom_target(docs

diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
@@ -17,7 +17,7 @@ FILE_PATTERNS          = *.h \
                          *.md
 
 USE_MDFILE_AS_MAINPAGE = @PROJECT_SOURCE_DIR@/docs/mainpage.md
-LAYOUT_FILE = @PROJECT_SOURCE_DIR@/docs/DoxygenLayout.xml
+LAYOUT_FILE = @PROJECT_BINARY_DIR@/docs/DoxygenLayout.xml
 HTML_FOOTER = @PROJECT_SOURCE_DIR@/docs/footer.html
 HTML_HEADER = @PROJECT_SOURCE_DIR@/docs/header.html
 
@@ -65,4 +65,4 @@ PREDEFINED             = __not_in_flash_func(x)= \
                          DOXYGEN_GENERATION= \
                          @DOXY_PREDEFINED@
 
-ENABLED_SECTIONS       = @DOXY_ENABLED_SECTIONS@
+ENABLED_SECTIONS       = @DOXY_ENABLED_SECTIONS@
diff --git a/docs/DoxygenLayout.xml → docs/DoxygenLayout.xml.in b/docs/DoxygenLayout.xml → docs/DoxygenLayout.xml.in
@@ -3,7 +3,7 @@
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title="Introduction"></tab>
-    <tab type="modules" visible="yes" title="API Documentation" intro="These are the libraries supplied in the Raspberry Pi Pico SDK"/>
+    <tab type="@DOXY_API_DOCS_TAB_TYPE@" visible="yes" title="API Documentation" intro="These are the libraries supplied in the Raspberry Pi Pico SDK"/>
     <tab type="user" url="@ref examples_page" visible="yes" title="Examples" intro="Links to SDK examples"/>
     <tab type="usergroup" url="@ref weblinks_page" visible="yes" title="Additional Documentation" intro="Links to datasheets and documentation">
       <tab type="user" url="https://rptl.io/pico-datasheet" visible="yes" title="Raspberry Pi Pico Datasheet" intro=""/>