Support RP2350 in builder/picosdk, added custom board for testing

boards/db_rp2350.json

@@ -0,0 +1,55 @@
+{
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "none.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0xF00F"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m33",
+        "extra_flags": " ",
+        "f_cpu": "150000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0xF00F"
+            ]
+        ],
+        "mcu": "rp2350",
+        "variant": "db_rp2350"
+    },
+    "debug": {
+        "jlink_device": "RP2350_0",
+        "openocd_target": "rp2350.cfg",
+        "svd_path": "rp2350.svd"
+    },
+    "frameworks": [
+        "picosdk"
+    ],
+    "name": "RP2350",
+    "upload": {
+        "maximum_ram_size": 524288,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "native_usb": true,
+        "use_1200bps_touch": true,
+        "wait_for_upload_port": false,
+        "protocol": "picoprobe",
+        "protocols": [
+            "blackmagic",
+            "cmsis-dap",
+            "jlink",
+            "raspberrypi-swd",
+            "picotool",
+            "picoprobe"
+        ]
+    },
+    "url": "https://github.com/ece362-purdue",
+    "vendor": "DB-RP2350"
+}

builder/frameworks/picosdk.py

@@ -1,4 +1,4 @@
-from os.path import isdir, join
+from os.path import isdir, isfile, join
 from os import makedirs
 from pathlib import Path
 import sys
@@ -11,11 +11,14 @@
 FRAMEWORK_DIR = platform.get_package_dir("framework-picosdk")
 assert isdir(FRAMEWORK_DIR)
 
-# hardcoded for now
-rp2_variant_dir = join(FRAMEWORK_DIR, "src", "rp2040")
-# todo: try to better guess the board header name based from the board definition name
-# instead of requiring them to explicitly include it
-rp2_board_header = board.get("build.picosdk.board_header", "pico.h")
+mcu = "rp2350" if board.get('build.mcu') == "rp2350" else "rp2040"
+rp2_variant_dir = join(FRAMEWORK_DIR, "src", mcu)
+header = "%s.h" % board.get("build.variant")
+# try to find the board header in the common directory
+if isfile(join(FRAMEWORK_DIR, "src", "boards", "include", "boards", header)):
+    rp2_board_header = board.get("build.picosdk.board_header", header)
+else:
+    rp2_board_header = board.get("build.picosdk.board_header", "pico.h")
 
 # include basic settings
 env.SConscript("_bare.py")
@@ -32,7 +35,6 @@ def gen_config_autogen(target_base_dir, board_hdr):
         env.Exit(-1)
     autogen_content_paths = [
         join(FRAMEWORK_DIR, "src", "boards", "include", "boards", board_hdr),
-        # only for ARM based RP2040
         join(FRAMEWORK_DIR, "src" , "rp2_common", "cmsis", "include", "cmsis", "rename_exceptions.h")
     ]
     # read content
@@ -55,11 +57,12 @@ def gen_config_autogen(target_base_dir, board_hdr):
     #CFLAGS=sorted(list(cflags - ccflags)),
     #CCFLAGS=sorted(list(ccflags)),
     CPPDEFINES=[
-        ("PICO_RP2040", 1),
-        ("PICO_RP2350", 0),
+        # BUG: defining PICO_RP2040 in any way will force compilation for 2040 only.
+        # FIX: add RP2350 only if board requested was 2350
+        ("PICO_RP2350" if board.get('build.mcu') == "rp2350" else "PICO_RP2040", 1),
         ("PICO_RISCV", 0),
         ("PICO_ARM", 1),
-        ("PICO_CMSIS_DEVICE", "\"RP2040\""),
+        ("PICO_CMSIS_DEVICE", "\"%s\"" % mcu.upper()),
         ("PICO_DEFAULT_FLASH_SIZE_BYTES", 2 * 1024 * 1024),
         # default SDK defines for on-hardware build
         ("PICO_ON_DEVICE", "1"),
@@ -98,8 +101,9 @@ def gen_config_autogen(target_base_dir, board_hdr):
         join(rp2_variant_dir, "boot_stage2", "include"),
 
         # common for rp2040, rp2350
-        join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_base", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "boot_bootrom_headers", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_adc", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_base", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_boot_lock", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_clocks", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_divider", "include"),
@@ -116,41 +120,41 @@ def gen_config_autogen(target_base_dir, board_hdr):
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_resets", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_rtc", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_spi", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_sync", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_sync_spin_lock", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_sync", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_ticks", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_timer", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_uart", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_vreg", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_watchdog", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "hardware_xosc", "include"),
 
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_bootrom", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_platform_compiler", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_platform_sections", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_platform_panic", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_aon_timer", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_bootsel_via_double_reset", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_multicore", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_unique_id", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_atomic", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_bit_ops", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_bootrom", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_bootsel_via_double_reset", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_divider", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_double", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_int64_ops", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_flash", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_float", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_mem_ops", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_int64_ops", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_malloc", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_mem_ops", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_multicore", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_platform_compiler", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_platform_panic", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_platform_sections", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_printf", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_rand", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdio_rtt", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdio_semihosting", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdio_uart", "include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdio_rtt", "include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "pico_unique_id", "include"),
         # CMSIS only for ARM
         join(FRAMEWORK_DIR, "src", "rp2_common", "cmsis", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "cmsis", "stub", "CMSIS", "Core", "Include"),
-        join(FRAMEWORK_DIR, "src", "rp2_common", "cmsis", "stub", "CMSIS", "Device", "RP2040", "Include"),
+        join(FRAMEWORK_DIR, "src", "rp2_common", "cmsis", "stub", "CMSIS", "Device", mcu.upper(), "Include"),
 
         join(FRAMEWORK_DIR, "src", "rp2_common", "tinyusb", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdio_usb", "include"),
@@ -177,7 +181,7 @@ def gen_config_autogen(target_base_dir, board_hdr):
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdio", "include"),
         join(FRAMEWORK_DIR, "src", "rp2_common", "pico_stdlib", "include"),
 
-        join(FRAMEWORK_DIR, "src", "rp2040", "boot_stage2", "asminclude"),
+        join(FRAMEWORK_DIR, "src", mcu, "boot_stage2", "asminclude"),
     ],
     #CXXFLAGS=sorted(list(cxxflags - ccflags)),
     LIBPATH=[
@@ -205,6 +209,9 @@ def gen_config_autogen(target_base_dir, board_hdr):
     pass
 if not "PIO_NO_STDIO_UART" in cpp_defines:
     flags.append(("PICO_STDIO_UART", 1))
+    # SDK C code specifies it as LIB_... so do that too
+    flags.append(("LIB_PICO_STDIO", 1))
+    flags.append(("LIB_PICO_STDIO_UART", 1))
 if not "PIO_NO_MULTICORE" in cpp_defines:
     flags.append(("PICO_MULTICORE_ENABLED", 1))
 # check selected double implementation
@@ -266,7 +273,7 @@ def configure_printf_impl():
 flash_region = "FLASH(rx) : ORIGIN = 0x10000000, LENGTH = %s\n" % str(board.get("upload.maximum_size"))
 Path(join(genned_dir, "pico_flash_region.ld")).write_text(flash_region)
 
-env.Replace(LDSCRIPT_PATH=join(FRAMEWORK_DIR, "src", "rp2_common", "pico_crt0", "rp2040", "memmap_default.ld"))
+env.Replace(LDSCRIPT_PATH=join(FRAMEWORK_DIR, "src", "rp2_common", "pico_crt0", mcu, "memmap_default.ld"))
 
 # build base files
 # system_RP2040.c
@@ -277,7 +284,7 @@ def configure_printf_impl():
 
 gen_boot2_cmd = env.Command(
     join("$BUILD_DIR", "boot2.S"),  # $TARGET
-    join(FRAMEWORK_DIR, "src", "rp2040", "boot_stage2", "compile_time_choice.S"),  # $SOURCE
+    join(FRAMEWORK_DIR, "src", mcu, "boot_stage2", "compile_time_choice.S"),  # $SOURCE
     env.VerboseAction(" ".join([
         "$CC",
         "$ASPPFLAGS",
@@ -286,8 +293,8 @@ def configure_printf_impl():
     ] 
     + ["-D%s=%s" % (flag[0], str(flag[1])) for flag in env["CPPDEFINES"]] 
     + [
-        "-I\"%s\"" % join(FRAMEWORK_DIR, "src", "rp2040", "boot_stage2", "asminclude"),
-        "-I\"%s\"" % join(FRAMEWORK_DIR, "src", "rp2040", "boot_stage2", "include"),
+        "-I\"%s\"" % join(FRAMEWORK_DIR, "src", mcu, "boot_stage2", "asminclude"),
+        "-I\"%s\"" % join(FRAMEWORK_DIR, "src", mcu, "boot_stage2", "include"),
         "-I\"%s\"" % join(FRAMEWORK_DIR, "src", "common", "pico_base_headers", "include"),
         "-I\"%s\"" % join(FRAMEWORK_DIR, "generated"),
         "-I", "$PROJECT_BUILD_DIR/$PIOENV/generated",
@@ -301,7 +308,7 @@ def configure_printf_impl():
         "-nostdlib",
         "--specs=nosys.specs",
         "-nostartfiles",
-        "-Wl,-T,\"%s\"" % join(FRAMEWORK_DIR, "src", "rp2040", "boot_stage2", "boot_stage2.ld"),
+        "-Wl,-T,\"%s\"" % join(FRAMEWORK_DIR, "src", mcu, "boot_stage2", "boot_stage2.ld"),
         "$SOURCE"
     ] + [ " && "] + [
         "$OBJCOPY",
@@ -310,7 +317,7 @@ def configure_printf_impl():
         join("$BUILD_DIR", "boot2.bin")
     ] + [ " && "] + [
         "$PYTHONEXE",
-        join(FRAMEWORK_DIR, "src", "rp2040", "boot_stage2", "pad_checksum"),
+        join(FRAMEWORK_DIR, "src", mcu, "boot_stage2", "pad_checksum"),
         "-s 0xffffffff",
         join("$BUILD_DIR", "boot2.bin"),
         join("$BUILD_DIR", "boot2.S"),
@@ -320,21 +327,26 @@ def configure_printf_impl():
 
 # default compontents
 default_common_rp2_components = [
-    ("pico_runtime_init", "+<*>"),
     ("hardware_adc", "+<*>"),
     ("hardware_boot_lock", "+<*>"),
     ("hardware_clocks", "+<*>"),
-    ("hardware_xosc", "+<*>"),
-    ("hardware_pll", "+<*>"),
-    ("hardware_ticks", "+<*>"),
-    ("pico_clib_interface", "-<*> +<newlib_interface.c>"),
     ("hardware_gpio", "+<*>"),
-    ("hardware_timer", "+<*>"),
     ("hardware_irq", "+<*>"),
+    ("hardware_pll", "+<*>"),
     ("hardware_sync", "+<*>"),
     ("hardware_sync_spin_lock", "+<*>"),
+    ("hardware_ticks", "+<*>"),
+    ("hardware_timer", "+<*>"),
+    ("hardware_uart", "+<*>"),
+    ("hardware_xosc", "+<*>"),
+    ("pico_bootrom", "+<*>"),
+    ("pico_clib_interface", "-<*> +<newlib_interface.c>"),
     ("pico_platform_panic", "+<*>"),
     ("pico_runtime", "+<*>"),
+    ("pico_runtime_init", "+<*>"),
+    ("pico_stdlib", "+<*>"),
+    ("pico_stdio", "+<*>"),
+    ("pico_stdio_uart", "+<*>"),
 ]
 
 for component, src_filter in default_common_rp2_components:
@@ -362,4 +374,4 @@ def configure_printf_impl():
         join("$BUILD_DIR", "PicoSDKCommon%s" % component),
         join(FRAMEWORK_DIR, "src", "common", component),
         src_filter
-    )
+    )