From a6ca739d7d8e38f964e3563a58bcdaabdc73fe22 Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Sat, 6 Sep 2025 14:40:20 -0600
Subject: [PATCH] refactor(boards): Adjust XIAO RP2040 override names,
 bootloader support

Adjust the .conf/.overlay files to match the proper naming for the
XIAO rp2040 board. Also add the necessary Kconfig/DTS bits for
supporting bootloader using retained memory/boot mode retention.
---
 app/boards/{seeeduino_xiao_rp2040.conf => xiao_rp2040.conf}   | 4 ++++
 .../{seeeduino_xiao_rp2040.overlay => xiao_rp2040.overlay}    | 2 ++
 2 files changed, 6 insertions(+)
 rename app/boards/{seeeduino_xiao_rp2040.conf => xiao_rp2040.conf} (73%)
 rename app/boards/{seeeduino_xiao_rp2040.overlay => xiao_rp2040.overlay} (87%)

diff --git a/app/boards/seeeduino_xiao_rp2040.conf b/app/boards/xiao_rp2040.conf
similarity index 73%
rename from app/boards/seeeduino_xiao_rp2040.conf
rename to app/boards/xiao_rp2040.conf
index 714e715cc..1f7d85b36 100644
--- a/app/boards/seeeduino_xiao_rp2040.conf
+++ b/app/boards/xiao_rp2040.conf
@@ -9,3 +9,7 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_FLASH_MAP=y
+
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_RETENTION_BOOT_MODE=y
diff --git a/app/boards/seeeduino_xiao_rp2040.overlay b/app/boards/xiao_rp2040.overlay
similarity index 87%
rename from app/boards/seeeduino_xiao_rp2040.overlay
rename to app/boards/xiao_rp2040.overlay
index e6ba81364..8f2e87143 100644
--- a/app/boards/seeeduino_xiao_rp2040.overlay
+++ b/app/boards/xiao_rp2040.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <arm/raspberrypi/rp2040-boot-mode-retention.dtsi>
+
 &xiao_serial { status = "disabled"; };
 
 &code_partition {