boards: adafruit feather nrf52840 convert to variants

Update both versions of adafruit feather nrf52840 to be variants rather
than separate boards. The aim is to provide a more consistent approach
and to remove some unnecessary Kconfig redundancy.

Signed-off-by: Jacob Winther <jacob@9.nz>

boards/adafruit/feather_nrf52840/Kconfig.adafruit_feather_nrf52840

@@ -4,5 +4,5 @@
 # Copyright (c) 2024 Jacob Winther
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_ADAFRUIT_FEATHER_NRF52840_SENSE
+config BOARD_ADAFRUIT_FEATHER_NRF52840
 	select SOC_NRF52840_QIAA

boards/adafruit/feather_nrf52840/Kconfig.adafruit_feather_nrf52840_express

@@ -1,8 +0,0 @@
-# Adafruit Feather nRF52840 Express board configuration
-
-# Copyright (c) 2020 Tobias Svehagen
-# Copyright (c) 2024 Jacob Winther
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_ADAFRUIT_FEATHER_NRF52840_EXPRESS
-	select SOC_NRF52840_QIAA

boards/adafruit/feather_nrf52840/Kconfig.defconfig

@@ -4,9 +4,9 @@
 # Copyright (c) 2024 Jacob Winther
 # SPDX-License-Identifier: Apache-2.0
 
-if (BOARD_ADAFRUIT_FEATHER_NRF52840_EXPRESS || BOARD_ADAFRUIT_FEATHER_NRF52840_SENSE)
+if BOARD_ADAFRUIT_FEATHER_NRF52840
 
 config BT_CTLR
 	default BT
 
-endif # BOARD_ADAFRUIT_FEATHER_NRF52840_EXPRESS || BOARD_ADAFRUIT_FEATHER_NRF52840_SENSE
+endif # BOARD_ADAFRUIT_FEATHER_NRF52840

boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840.dts

@@ -11,7 +11,7 @@
 
 / {
 	model = "Adafruit Feather nRF52840 Express";
-	compatible = "adafruit,feather_nrf52840-express";
+	compatible = "adafruit,feather-nrf52840";
 
 	chosen {
 		zephyr,console = &uart0;

boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840.yaml

@@ -1,4 +1,4 @@
-identifier: adafruit_feather_nrf52840_express
+identifier: adafruit_feather_nrf52840/nrf52840
 name: Adafruit Feather nRF52840 Express
 type: mcu
 arch: arm

boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_defconfig

@@ -3,12 +3,12 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# enable GPIO
+# Enable GPIO
 CONFIG_GPIO=y
 
-# enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y

boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_nrf52840_sense.dts

@@ -10,7 +10,7 @@
 
 / {
 	model = "Adafruit Feather nRF52840 Sense";
-	compatible = "adafruit,feather_nrf52840-sense";
+	compatible = "adafruit,feather-nrf52840-sense";
 
 	chosen {
 		zephyr,console = &cdc_acm_uart0;
@@ -48,6 +48,7 @@
 		 */
 		reserved_partition_0: partition@0 {
 			label = "SoftDevice";
+			read-only;
 			reg = <0x000000000 DT_SIZE_K(152)>;
 		};
 		code_partition: partition@26000 {
@@ -66,6 +67,7 @@
 
 		boot_partition: partition@f4000 {
 			label = "UF2";
+			read-only;
 			reg = <0x000f4000 DT_SIZE_K(48)>;
 		};
 	};

boards/adafruit/feather_nrf52840/adafruit_feather_nrf52840_nrf52840_sense.yaml

@@ -1,4 +1,4 @@
-identifier: adafruit_feather_nrf52840_sense
+identifier: adafruit_feather_nrf52840/nrf52840/sense
 name: Adafruit Feather nRF52840 Sense
 type: mcu
 arch: arm

boards/adafruit/feather_nrf52840/board.cmake

@@ -2,7 +2,7 @@
 
 board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
-if(CONFIG_BOARD_ADAFRUIT_FEATHER_NRF52840_SENSE)
+if(CONFIG_BUILD_OUTPUT_UF2)
   include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 endif()
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/adafruit/feather_nrf52840/board.yml

@@ -1,9 +1,7 @@
-boards:
+board:
-  - name: adafruit_feather_nrf52840_express
+  name: adafruit_feather_nrf52840
-    vendor: adafruit
-    socs:
-      - name: nrf52840
-  - name: adafruit_feather_nrf52840_sense
   vendor: adafruit
   socs:
     - name: nrf52840
+      variants:
+        - name: sense

boards/adafruit/feather_nrf52840/doc/index.rst

@@ -135,11 +135,11 @@ Programming and Debugging
 Flashing
 ========
 
-Flashing Zephyr onto the ``adafruit_feather_nrf52480_express`` board is possible
+Flashing Zephyr onto the ``adafruit_feather_nrf52480`` board is possible
 using an external programmer. The programmer is attached to the SWD header.
 
-The Feather nRF52840 ships with the `Adafruit nRF52 Bootloader`_ which
+Both the Feather nRF52840 Express and Sense ship with the `Adafruit nRF52 Bootloader`_
-supports flashing using `UF2`_. This allows easy flashing of new images,
+which supports flashing using `UF2`_. This allows easy flashing of new images,
 but does not support debugging the device.
 
 #. Build the Zephyr kernel and the :zephyr:code-sample:`blinky` sample application.
@@ -150,7 +150,7 @@ but does not support debugging the device.
 
       .. zephyr-app-commands::
          :zephyr-app: samples/basic/blinky
-         :board: adafruit_feather_nrf52840_express/nrf52840
+         :board: adafruit_feather_nrf52840/nrf52840
          :goals: build
          :compact:
 
@@ -158,7 +158,7 @@ but does not support debugging the device.
 
       .. zephyr-app-commands::
          :zephyr-app: samples/basic/blinky
-         :board: adafruit_feather_nrf52840_sense/nrf52840
+         :board: adafruit_feather_nrf52840/nrf52840/sense
          :goals: build
          :compact:
 
@@ -173,11 +173,19 @@ but does not support debugging the device.
 
 .. tabs::
 
+   .. group-tab:: Express
+
+      .. zephyr-app-commands::
+         :zephyr-app: samples/basic/blinky
+         :board: adafruit_feather_nrf52840/nrf52840
+         :goals: flash
+         :compact:
+
    .. group-tab:: Sense
 
       .. zephyr-app-commands::
          :zephyr-app: samples/basic/blinky
-         :board: adafruit_feather_nrf52840_sense
+         :board: adafruit_feather_nrf52840/nrf52840/sense
          :goals: flash
          :compact:
 

boards/deprecated.cmake

@@ -35,10 +35,10 @@ set(actinius_icarus_som_ns_DEPRECATED
     actinius_icarus_som/nrf9160/ns
 )
 set(adafruit_feather_DEPRECATED
-    adafruit_feather_nrf52840_express
+    adafruit_feather_nrf52840/nrf52840
 )
 set(adafruit_feather_nrf52840_DEPRECATED
-    adafruit_feather_nrf52840_express
+    adafruit_feather_nrf52840/nrf52840
 )
 set(adafruit_itsybitsy_nrf52840_DEPRECATED
     adafruit_itsybitsy