Making a common v5 board definition

nateinaction · nateinaction · commit dd722b948dcd · 2025-09-12T19:14:18.000-05:00
diff --git a/boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig b/boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig
@@ -0,0 +1,12 @@
+config SOC_RP2350A_M33
+    bool "Enable Arm cores"
+    default y
+
+config USB_SELF_POWERED
+	default n
+
+config USB_CDC_ACM_LOG_LEVEL
+	default 0
+
+config USB_DEVICE_LOG_LEVEL
+	default 1
diff --git a/boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5-pinctrl.dtsi b/boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5-pinctrl.dtsi
diff --git a/boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi b/boards/bronco_space/proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi
@@ -3,7 +3,7 @@
 #include <zephyr/dt-bindings/i2c/i2c.h>
 #include <zephyr/dt-bindings/pwm/pwm.h>
 
-#include "proves_flight_control_board_v5c-pinctrl.dtsi"
+#include "proves_flight_control_board_v5-pinctrl.dtsi"
 
 / {
 	chosen {
diff --git a/boards/bronco_space/proves_flight_control_board_v5c/Kconfig.defconfig b/boards/bronco_space/proves_flight_control_board_v5c/Kconfig.defconfig
diff --git a/boards/bronco_space/proves_flight_control_board_v5c/Kconfig.proves_flight_control_board_v5c b/boards/bronco_space/proves_flight_control_board_v5c/Kconfig.proves_flight_control_board_v5c
@@ -1,5 +1 @@
-# Copyright (c) 2024 Andrew Featherstone
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_PROVES_FLIGHT_CONTROL_BOARD_V5C
-	select SOC_RP2350A_M33 if BOARD_PROVES_FLIGHT_CONTROL_BOARD_V5C_RP2350A_M33
+source "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"
diff --git a/boards/bronco_space/proves_flight_control_board_v5c/proves_flight_control_board_v5c_rp2350a_m33.dts b/boards/bronco_space/proves_flight_control_board_v5c/proves_flight_control_board_v5c_rp2350a_m33.dts
@@ -16,4 +16,4 @@
 #include <raspberrypi/rpi_pico/rp2350a.dtsi>
 #include <raspberrypi/rpi_pico/m33.dtsi>
 
-#include "proves_flight_control_board_v5c.dtsi"
+#include "../proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi"
diff --git a/boards/bronco_space/proves_flight_control_board_v5c/proves_flight_control_board_v5c_rp2350a_m33_defconfig b/boards/bronco_space/proves_flight_control_board_v5c/proves_flight_control_board_v5c_rp2350a_m33_defconfig
@@ -18,7 +18,7 @@ CONFIG_LSM6DSO_ENABLE_TEMP=y
 CONFIG_LIS2MDL=y
 CONFIG_INA219=y
 
-# Lora
+# Radio
 CONFIG_LORA=y
 CONFIG_LORA_SX127X=y
 
diff --git a/boards/bronco_space/proves_flight_control_board_v5d/Kconfig.defconfig b/boards/bronco_space/proves_flight_control_board_v5d/Kconfig.defconfig
diff --git a/boards/bronco_space/proves_flight_control_board_v5d/Kconfig.proves_flight_control_board_v5d b/boards/bronco_space/proves_flight_control_board_v5d/Kconfig.proves_flight_control_board_v5d
@@ -1,5 +1,5 @@
-# Copyright (c) 2024 Andrew Featherstone
-# SPDX-License-Identifier: Apache-2.0
-
 config BOARD_PROVES_FLIGHT_CONTROL_BOARD_V5D
-	select SOC_RP2350A_M33 if BOARD_PROVES_FLIGHT_CONTROL_BOARD_V5D_RP2350A_M33
+	bool "PROVES Flight Control Board v5d"
+	default y
+
+source "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"
diff --git a/boards/bronco_space/proves_flight_control_board_v5d/proves_flight_control_board_v5d.dtsi b/boards/bronco_space/proves_flight_control_board_v5d/proves_flight_control_board_v5d.dtsi
diff --git a/boards/bronco_space/proves_flight_control_board_v5d/proves_flight_control_board_v5d_rp2350a_m33.dts b/boards/bronco_space/proves_flight_control_board_v5d/proves_flight_control_board_v5d_rp2350a_m33.dts
@@ -16,4 +16,9 @@
 #include <raspberrypi/rpi_pico/rp2350a.dtsi>
 #include <raspberrypi/rpi_pico/m33.dtsi>
 
-#include "proves_flight_control_board_v5d.dtsi"
+#include "../proves_flight_control_board_v5/proves_flight_control_board_v5.dtsi"
+
+&led0 {
+	gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+	label = "User LED GPIO23";
+};
diff --git a/boards/bronco_space/proves_flight_control_board_v5d/proves_flight_control_board_v5d_rp2350a_m33_defconfig b/boards/bronco_space/proves_flight_control_board_v5d/proves_flight_control_board_v5d_rp2350a_m33_defconfig
@@ -18,7 +18,7 @@ CONFIG_LSM6DSO_ENABLE_TEMP=y
 CONFIG_LIS2MDL=y
 CONFIG_INA219=y
 
-# Lora
+# Radio
 CONFIG_LORA=y
 CONFIG_LORA_SX127X=y
 
diff --git a/settings.ini b/settings.ini
@@ -7,4 +7,4 @@ default_toolchain: zephyr
 default_cmake_options:  FPRIME_ENABLE_FRAMEWORK_UTS=OFF
                         FPRIME_ENABLE_AUTOCODER_UTS=OFF
                         BOARD_ROOT=.
-                        BOARD=proves_flight_control_board_v5d/rp2350a/m33
+                        BOARD=proves_flight_control_board_v5c/rp2350a/m33
