rp2350: Fix architecture in crash snapshot

Fixes: b/362506213 Change-Id: I85ce6eefe3227e480a2379081bfb58adcdc841ec Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/232231 Reviewed-by: Armando Montanez <[email protected]> Commit-Queue: Auto-Submit <[email protected]> Pigweed-Auto-Submit: Dave Roth <[email protected]> Lint: Lint 🤖 <[email protected]>
google · Aug 27, 2024 · 9e609d2 · 9e609d2
1 parent 70bff1c
commit 9e609d2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pw_system/BUILD.bazel b/pw_system/BUILD.bazel
@@ -696,3 +696,10 @@ device_console(
     binary = ":rp2040_system_example",
     script = "//pw_system/py:pw_system_console",
 )
+
+device_console(
+    name = "rp2350_system_example_console",
+    testonly = True,
+    binary = ":rp2350_system_example",
+    script = "//pw_system/py:pw_system_console",
+)
diff --git a/targets/rp2040/device_handler.cc b/targets/rp2040/device_handler.cc
@@ -23,9 +23,19 @@ void RebootSystem() { watchdog_reboot(0, 0, 0); }
 
 void CapturePlatformMetadata(
     snapshot::pwpb::Metadata::StreamEncoder& metadata_encoder) {
+// The device_handler is shared between rp2040 and 2350, so handle differences
+// with the preprocessor.
+#if _PW_ARCH_ARM_V6M
   // TODO: https://pwbug.dev/357132837 - Review if IgnoreError is correct here.
   metadata_encoder.WriteCpuArch(snapshot::pwpb::CpuArchitecture::Enum::ARMV6M)
       .IgnoreError();
+#elif _PW_ARCH_ARM_V8M_MAINLINE || _PW_ARCH_ARM_V8_1M_MAINLINE
+  // TODO: https://pwbug.dev/357132837 - Review if IgnoreError is correct here.
+  metadata_encoder.WriteCpuArch(snapshot::pwpb::CpuArchitecture::Enum::ARMV8M)
+      .IgnoreError();
+#else
+#error "Unknown CPU architecture."
+#endif  // _PW_ARCH_ARM_V6M
 }
 
 Status CaptureCpuState(