boards: refactor using extensions and shields

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
teslabs · Aug 21, 2023 · ef0ff2b · ef0ff2b
1 parent d27de4c
commit ef0ff2b
Show file tree

Hide file tree

Showing 24 changed files with 200 additions and 297 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,8 +43,10 @@ jobs:
       - name: Build
         working-directory: spinner
         run: |
-          west build -b nucleof302r8_ihm07m1 spinner -p
-          west build -b nucleog431rb_ihm16m1 spinner -p
+          west build -b nucleo_f302r8 spinner -p -- -DSHIELD=ihm07m1
+          west build -b nucleo_f302r8 spinner -p -- -DSHIELD=ihm16m1
+          west build -b nucleo_g431rb spinner -p -- -DSHIELD=ihm07m1
+          west build -b nucleo_g431rb spinner -p -- -DSHIELD=ihm16m1
 
       - name: Test
         working-directory: spinner

diff --git a/README.md b/README.md
@@ -41,11 +41,11 @@ west update
 The application can be built by running:
 
 ```shell
-west build -b $BOARD spinner
+west build -b $BOARD spinner [-- -DSHIELD=$SHIELD]
 ```
 
-where `$BOARD` is the target board (see `boards`). Some other build
-configurations are also provided:
+where `$BOARD` is the target board (see `boards`) and `$SHIELD` an optional
+shield (see `boards/shields`). Some other build configurations are also provided:
 
 - `debug.conf`: Enable debug-friendly build
 - `shell.conf`: Enable shell facilities

diff --git a/boards/arm/nucleof302r8_ihm07m1/Kconfig.board b/boards/arm/nucleof302r8_ihm07m1/Kconfig.board
diff --git a/boards/arm/nucleof302r8_ihm07m1/Kconfig.defconfig b/boards/arm/nucleof302r8_ihm07m1/Kconfig.defconfig
diff --git a/boards/arm/nucleof302r8_ihm07m1/board.cmake b/boards/arm/nucleof302r8_ihm07m1/board.cmake
diff --git a/boards/arm/nucleof302r8_ihm07m1/nucleof302r8_ihm07m1.dts b/boards/arm/nucleof302r8_ihm07m1/nucleof302r8_ihm07m1.dts
diff --git a/boards/arm/nucleof302r8_ihm07m1/nucleof302r8_ihm07m1_defconfig b/boards/arm/nucleof302r8_ihm07m1/nucleof302r8_ihm07m1_defconfig
diff --git a/boards/arm/nucleof302r8_ihm07m1/support/openocd.cfg b/boards/arm/nucleof302r8_ihm07m1/support/openocd.cfg
diff --git a/boards/arm/nucleog431rb_ihm16m1/Kconfig.board b/boards/arm/nucleog431rb_ihm16m1/Kconfig.board
diff --git a/boards/arm/nucleog431rb_ihm16m1/Kconfig.defconfig b/boards/arm/nucleog431rb_ihm16m1/Kconfig.defconfig
diff --git a/boards/arm/nucleog431rb_ihm16m1/board.cmake b/boards/arm/nucleog431rb_ihm16m1/board.cmake
diff --git a/boards/arm/nucleog431rb_ihm16m1/nucleog431rb_ihm16m1.dts b/boards/arm/nucleog431rb_ihm16m1/nucleog431rb_ihm16m1.dts
diff --git a/boards/arm/nucleog431rb_ihm16m1/nucleog431rb_ihm16m1_defconfig b/boards/arm/nucleog431rb_ihm16m1/nucleog431rb_ihm16m1_defconfig
diff --git a/boards/arm/nucleog431rb_ihm16m1/support/openocd.cfg b/boards/arm/nucleog431rb_ihm16m1/support/openocd.cfg
diff --git a/boards/extensions/nucleo_f302r8/nucleo_f302r8.overlay b/boards/extensions/nucleo_f302r8/nucleo_f302r8.overlay
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 Teslabs Engineering S.L.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dts-bindings/adc/stm32f3xx.h>
+
+&timers1 {
+	svpwm: svpwm {
+		compatible = "st,stm32-svpwm";
+		currsmp = <&currsmp>;
+	};
+};
+
+&adc1 {
+	currsmp: currsmp {
+		compatible = "st,stm32-currsmp-shunt";
+		adc-resolution = <12>;
+		adc-tsample = <2>;
+		adc-trigger = <STM32_ADC_INJ_TRIG_TIM1_TRGO>;
+	};
+};
+
+&timers2 {
+	feedback: feedback {
+		compatible = "st,stm32-halls";
+		phase-shift = <60>;
+	};
+};
diff --git a/boards/extensions/nucleo_g431rb/nucleo_g431rb.overlay b/boards/extensions/nucleo_g431rb/nucleo_g431rb.overlay
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 Teslabs Engineering S.L.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <dts-bindings/adc/stm32g4xx.h>
+
+&timers1 {
+	svpwm: svpwm {
+		compatible = "st,stm32-svpwm";
+		currsmp = <&currsmp>;
+	};
+};
+
+&adc1 {
+	currsmp: currsmp {
+		compatible = "st,stm32-currsmp-shunt";
+
+		adc-resolution = <12>;
+		adc-tsample = <3>;
+		adc-trigger = <STM32_ADC12_INJ_TRIG_TIM1_TRGO>;
+	};
+};
+
+&timers2 {
+	feedback: feedback {
+		compatible = "st,stm32-halls";
+		phase-shift = <60>;
+	};
+};
diff --git a/boards/shields/ihm07m1/Kconfig.shield b/boards/shields/ihm07m1/Kconfig.shield
@@ -0,0 +1,2 @@
+config SHIELD_IHM07M1
+	def_bool $(shields_list_contains,ihm07m1)