commit 5c834c956a5b8e216cbd7193c718054f8b17fe23
author Erik Gilling <konkers@google.com> Thu Oct 17 20:52:39 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 17 20:52:39 2024 +0000
tree bdf1fb55b8a6aab9eeb9e2a456b3f56e15dfb0a4
parent bc3e1f57e9122ba0dba6588c7bce4ce0ef208a94

apps: Support flashing rp2350 binaries with debug probes

Change-Id: I0bd53ff4cd062b2e56f8166a6d967912f379dd70
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/showcase/sense/+/242673
Pigweed-Auto-Submit: Erik Gilling <konkers@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Reviewed-by: Armando Montanez <amontanez@google.com>

apps/blinky/BUILD.bazel

diff --git a/apps/blinky/BUILD.bazel b/apps/blinky/BUILD.bazel
index b565162..53ff154 100644
--- a/apps/blinky/BUILD.bazel
+++ b/apps/blinky/BUILD.bazel
@@ -13,7 +13,7 @@
 # the License.
 
 load("@pigweed//targets/host_device_simulator:transition.bzl", "host_device_simulator_binary")
-load("@pigweed//targets/rp2040:flash.bzl", "flash_rp2040")
+load("@pigweed//targets/rp2040:flash.bzl", "flash_rp2040", "flash_rp2350")
 load("//targets/rp2:binary.bzl", "rp2040_binary", "rp2350_binary")
 load("//tools:tools.bzl", "sense_device_console", "sense_device_script", "sense_host_console")
 
@@ -124,8 +124,7 @@
     rp2040_binary = "rp2040_blinky.elf",
 )
 
-# Note: Despite the name, the rule works for the 2350.
-flash_rp2040(
+flash_rp2350(
     name = "flash_rp2350",
-    rp2040_binary = "rp2350_blinky.elf",
+    rp2350_binary = "rp2350_blinky.elf",
 )

apps/factory/BUILD.bazel

diff --git a/apps/factory/BUILD.bazel b/apps/factory/BUILD.bazel
index 69cd41c..933e51d 100644
--- a/apps/factory/BUILD.bazel
+++ b/apps/factory/BUILD.bazel
@@ -17,7 +17,7 @@
     "nanopb_proto_library",
     "nanopb_rpc_proto_library",
 )
-load("@pigweed//targets/rp2040:flash.bzl", "flash_rp2040")
+load("@pigweed//targets/rp2040:flash.bzl", "flash_rp2040", "flash_rp2350")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 load("//targets/rp2:binary.bzl", "rp2040_binary", "rp2350_binary")
 load("//tools:tools.bzl", "sense_device_console", "sense_device_script")
@@ -87,10 +87,9 @@
     rp2040_binary = "rp2040.elf",
 )
 
-# Note: Despite the name, the rule works for the 2350.
-flash_rp2040(
+flash_rp2350(
     name = "flash_rp2350",
-    rp2040_binary = "rp2350.elf",
+    rp2350_binary = "rp2350.elf",
 )
 
 cc_library(

apps/production/BUILD.bazel

diff --git a/apps/production/BUILD.bazel b/apps/production/BUILD.bazel
index 580d3bb..b267b51 100644
--- a/apps/production/BUILD.bazel
+++ b/apps/production/BUILD.bazel
@@ -14,7 +14,7 @@
 
 load("@pigweed//pw_build:compatibility.bzl", "host_backend_alias")
 load("@pigweed//targets/host_device_simulator:transition.bzl", "host_device_simulator_binary")
-load("@pigweed//targets/rp2040:flash.bzl", "flash_rp2040")
+load("@pigweed//targets/rp2040:flash.bzl", "flash_rp2040", "flash_rp2350")
 load("//targets/rp2:binary.bzl", "rp2040_binary", "rp2350_binary")
 load("//tools:tools.bzl", "sense_device_console", "sense_host_console")
 
@@ -128,8 +128,7 @@
     rp2040_binary = "rp2040.elf",
 )
 
-# Note: Despite the name, the rule works for the 2350.
-flash_rp2040(
+flash_rp2350(
     name = "flash_rp2350",
-    rp2040_binary = "rp2350.elf",
+    rp2350_binary = "rp2350.elf",
 )