Move to Zephyr v3.7 LTS

- Migrate boards to board layout v2 - Update some deprecated devicetree nodes - Bump ThingSet node library to fix iterable sections
LibreSolar · Jul 31, 2024 · 3070141 · 3070141
1 parent 43383b2
commit 3070141
Show file tree

Hide file tree

Showing 53 changed files with 59 additions and 83 deletions.
diff --git a/app/boards/bms_16s100_sc_esp32c3.conf b/app/boards/bms_16s100_sc_esp32c3.conf
@@ -7,7 +7,6 @@ CONFIG_NVS_LOG_LEVEL_WRN=y
 
 # Bluetooth
 CONFIG_BT=y
-CONFIG_BT_DEBUG_LOG=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="LibreSolar BMS-C1"
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y

diff --git a/app/boards/bms_c1.conf b/app/boards/bms_c1.conf
@@ -17,7 +17,6 @@ CONFIG_NVS_LOG_LEVEL_WRN=y
 
 # Bluetooth
 CONFIG_BT=y
-CONFIG_BT_DEBUG_LOG=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="LibreSolar BMS-C1"
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y

diff --git a/boards/arm/bms_8s50_ic/revision.cmake b/boards/arm/bms_8s50_ic/revision.cmake
diff --git a/boards/arm/bms_15s80_sc/Kconfig.board → ...resolar/bms_15s80_sc/Kconfig.bms_15s80_sc b/boards/arm/bms_15s80_sc/Kconfig.board → ...resolar/bms_15s80_sc/Kconfig.bms_15s80_sc
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BMS_15S80_SC
-	bool "Libre Solar BMS 15S80 SC"
-	depends on SOC_STM32F072XB
+	select SOC_STM32F072XB
diff --git a/boards/arm/bms_15s80_sc/Kconfig.defconfig → ...libresolar/bms_15s80_sc/Kconfig.defconfig b/boards/arm/bms_15s80_sc/Kconfig.defconfig → ...libresolar/bms_15s80_sc/Kconfig.defconfig
@@ -1,13 +1,6 @@
 # Copyright (c) The Libre Solar Project Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_BMS_15S80_SC
-
-config BOARD
-	default "bms_15s80_sc"
-
-endif # BOARD_BMS_15S80_SC
-
 if BMS_IC
 
 config BMS_IC_MAX_THERMISTORS

diff --git a/boards/arm/bms_15s80_sc/bms_15s80_sc.dts → .../libresolar/bms_15s80_sc/bms_15s80_sc.dts b/boards/arm/bms_15s80_sc/bms_15s80_sc.dts → .../libresolar/bms_15s80_sc/bms_15s80_sc.dts
@@ -174,7 +174,7 @@ uext_i2c: &i2c1 {
 &can1 {
 	pinctrl-0 = <&can_rx_pb8 &can_tx_pb9>;
 	pinctrl-names = "default";
-	bus-speed = <500000>;
+	bitrate = <500000>;
 	phys = <&transceiver0>;
 	status = "okay";
 };
diff --git a/boards/arm/bms_15s80_sc/bms_15s80_sc.yaml → ...libresolar/bms_15s80_sc/bms_15s80_sc.yaml b/boards/arm/bms_15s80_sc/bms_15s80_sc.yaml → ...libresolar/bms_15s80_sc/bms_15s80_sc.yaml
diff --git a/...s/arm/bms_15s80_sc/bms_15s80_sc_defconfig → ...solar/bms_15s80_sc/bms_15s80_sc_defconfig b/...s/arm/bms_15s80_sc/bms_15s80_sc_defconfig → ...solar/bms_15s80_sc/bms_15s80_sc_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F0X=y
-CONFIG_SOC_STM32F072XB=y
-
 CONFIG_CLOCK_CONTROL=y
 
 CONFIG_PINCTRL=y

diff --git a/boards/arm/bms_15s80_sc/board.cmake → boards/libresolar/bms_15s80_sc/board.cmake b/boards/arm/bms_15s80_sc/board.cmake → boards/libresolar/bms_15s80_sc/board.cmake
diff --git a/boards/libresolar/bms_15s80_sc/board.yml b/boards/libresolar/bms_15s80_sc/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: bms_15s80_sc
+  vendor: libresolar
+  socs:
+    - name: stm32f072xb
diff --git a/boards/arm/bms_15s80_sc/support/openocd.cfg → ...bresolar/bms_15s80_sc/support/openocd.cfg b/boards/arm/bms_15s80_sc/support/openocd.cfg → ...bresolar/bms_15s80_sc/support/openocd.cfg
diff --git a/boards/arm/bms_16s100_sc/Kconfig.board → ...solar/bms_16s100_sc/Kconfig.bms_16s100_sc b/boards/arm/bms_16s100_sc/Kconfig.board → ...solar/bms_16s100_sc/Kconfig.bms_16s100_sc
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BMS_16S100_SC
-	bool "Libre Solar BMS 16S100 SC"
-	depends on SOC_STM32G0B1XX
+	select SOC_STM32G0B1XX
diff --git a/boards/arm/bms_16s100_sc/Kconfig.defconfig → ...ibresolar/bms_16s100_sc/Kconfig.defconfig b/boards/arm/bms_16s100_sc/Kconfig.defconfig → ...ibresolar/bms_16s100_sc/Kconfig.defconfig
@@ -1,13 +1,6 @@
 # Copyright (c) The Libre Solar Project Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_BMS_16S100_SC
-
-config BOARD
-	default "bms_16s100_sc"
-
-endif # BOARD_BMS_16S100_SC
-
 if BMS_IC
 
 config BMS_IC_MAX_THERMISTORS

diff --git a/boards/arm/bms_16s100_sc/bms_16s100_sc.dts → ...ibresolar/bms_16s100_sc/bms_16s100_sc.dts b/boards/arm/bms_16s100_sc/bms_16s100_sc.dts → ...ibresolar/bms_16s100_sc/bms_16s100_sc.dts
@@ -199,8 +199,8 @@ uext_i2c: &i2c1 {
 		 <&rcc STM32_SRC_PLL_Q FDCAN_SEL(1)>;
 	pinctrl-0 = <&fdcan1_rx_pd0 &fdcan1_tx_pd1>;
 	pinctrl-names = "default";
-	bus-speed = <500000>;
-	bus-speed-data = <500000>;
+	bitrate = <500000>;
+	bitrate-data = <500000>;
 	sample-point = <875>;
 	sample-point-data = <875>;
 	phys = <&transceiver0>;

diff --git a/boards/arm/bms_16s100_sc/bms_16s100_sc.yaml → ...bresolar/bms_16s100_sc/bms_16s100_sc.yaml b/boards/arm/bms_16s100_sc/bms_16s100_sc.yaml → ...bresolar/bms_16s100_sc/bms_16s100_sc.yaml
diff --git a/...arm/bms_16s100_sc/bms_16s100_sc_defconfig → ...lar/bms_16s100_sc/bms_16s100_sc_defconfig b/...arm/bms_16s100_sc/bms_16s100_sc_defconfig → ...lar/bms_16s100_sc/bms_16s100_sc_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32G0X=y
-CONFIG_SOC_STM32G0B1XX=y
-
 CONFIG_ARM_MPU=y
 
 CONFIG_CLOCK_CONTROL=y

diff --git a/boards/arm/bms_16s100_sc/board.cmake → boards/libresolar/bms_16s100_sc/board.cmake b/boards/arm/bms_16s100_sc/board.cmake → boards/libresolar/bms_16s100_sc/board.cmake
diff --git a/boards/libresolar/bms_16s100_sc/board.yml b/boards/libresolar/bms_16s100_sc/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: bms_16s100_sc
+  vendor: libresolar
+  socs:
+    - name: stm32g0b1xe
diff --git a/boards/arm/bms_5s50_sc/Kconfig.board → ...ibresolar/bms_5s50_sc/Kconfig.bms_5s50_sc b/boards/arm/bms_5s50_sc/Kconfig.board → ...ibresolar/bms_5s50_sc/Kconfig.bms_5s50_sc
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BMS_5S50_SC
-	bool "Libre Solar BMS 5S50 SC"
-	depends on SOC_STM32F072XB
+	select SOC_STM32F072XB
diff --git a/boards/arm/bms_5s50_sc/Kconfig.defconfig → .../libresolar/bms_5s50_sc/Kconfig.defconfig b/boards/arm/bms_5s50_sc/Kconfig.defconfig → .../libresolar/bms_5s50_sc/Kconfig.defconfig
@@ -1,13 +1,6 @@
 # Copyright (c) The Libre Solar Project Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_BMS_5S50_SC
-
-config BOARD
-	default "bms_5s50_sc"
-
-endif # BOARD_BMS_5S50_SC
-
 if BMS_IC
 
 config BMS_IC_MAX_CELLS

diff --git a/boards/arm/bms_5s50_sc/bms_5s50_sc.dts → ...ds/libresolar/bms_5s50_sc/bms_5s50_sc.dts b/boards/arm/bms_5s50_sc/bms_5s50_sc.dts → ...ds/libresolar/bms_5s50_sc/bms_5s50_sc.dts
@@ -164,7 +164,7 @@ uext_i2c: &i2c1 {
 &can1 {
 	pinctrl-0 = <&can_rx_pb8 &can_tx_pb9>;
 	pinctrl-names = "default";
-	bus-speed = <500000>;
+	bitrate = <500000>;
 	phys = <&transceiver0>;
 	status = "okay";
 };
diff --git a/boards/arm/bms_5s50_sc/bms_5s50_sc.yaml → ...s/libresolar/bms_5s50_sc/bms_5s50_sc.yaml b/boards/arm/bms_5s50_sc/bms_5s50_sc.yaml → ...s/libresolar/bms_5s50_sc/bms_5s50_sc.yaml
diff --git a/boards/arm/bms_5s50_sc/bms_5s50_sc_defconfig → ...resolar/bms_5s50_sc/bms_5s50_sc_defconfig b/boards/arm/bms_5s50_sc/bms_5s50_sc_defconfig → ...resolar/bms_5s50_sc/bms_5s50_sc_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32F0X=y
-CONFIG_SOC_STM32F072XB=y
-
 CONFIG_CLOCK_CONTROL=y
 
 CONFIG_PINCTRL=y

diff --git a/boards/arm/bms_5s50_sc/board.cmake → boards/libresolar/bms_5s50_sc/board.cmake b/boards/arm/bms_5s50_sc/board.cmake → boards/libresolar/bms_5s50_sc/board.cmake
diff --git a/boards/libresolar/bms_5s50_sc/board.yml b/boards/libresolar/bms_5s50_sc/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: bms_5s50_sc
+  vendor: libresolar
+  socs:
+    - name: stm32f072xb
diff --git a/boards/arm/bms_5s50_sc/support/openocd.cfg → ...ibresolar/bms_5s50_sc/support/openocd.cfg b/boards/arm/bms_5s50_sc/support/openocd.cfg → ...ibresolar/bms_5s50_sc/support/openocd.cfg
diff --git a/boards/arm/bms_8s50_ic/Kconfig.board → ...ibresolar/bms_8s50_ic/Kconfig.bms_8s50_ic b/boards/arm/bms_8s50_ic/Kconfig.board → ...ibresolar/bms_8s50_ic/Kconfig.bms_8s50_ic
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BMS_8S50_IC
-	bool "Libre Solar BMS 8S50 IC"
-	depends on SOC_STM32L452XX
+	select SOC_STM32L452XX
diff --git a/boards/arm/bms_8s50_ic/Kconfig.defconfig → .../libresolar/bms_8s50_ic/Kconfig.defconfig b/boards/arm/bms_8s50_ic/Kconfig.defconfig → .../libresolar/bms_8s50_ic/Kconfig.defconfig
@@ -1,13 +1,6 @@
 # Copyright (c) The Libre Solar Project Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_BMS_8S50_IC
-
-config BOARD
-	default "bms_8s50_ic"
-
-endif # BOARD_BMS_8S50_IC
-
 if BMS_IC
 
 config BMS_IC_MAX_THERMISTORS

diff --git a/boards/arm/bms_8s50_ic/bms_8s50_ic.dts → ...ds/libresolar/bms_8s50_ic/bms_8s50_ic.dts b/boards/arm/bms_8s50_ic/bms_8s50_ic.dts → ...ds/libresolar/bms_8s50_ic/bms_8s50_ic.dts
@@ -159,7 +159,7 @@ uext_i2c: &i2c1 {
 &can1 {
 	pinctrl-0 = <&can1_rx_pb8 &can1_tx_pb9>;
 	pinctrl-names = "default";
-	bus-speed = <500000>;
+	bitrate = <500000>;
 	phys = <&transceiver0>;
 	status = "okay";
 };

diff --git a/boards/arm/bms_8s50_ic/bms_8s50_ic.yaml → ...s/libresolar/bms_8s50_ic/bms_8s50_ic.yaml b/boards/arm/bms_8s50_ic/bms_8s50_ic.yaml → ...s/libresolar/bms_8s50_ic/bms_8s50_ic.yaml
diff --git a/...ds/arm/bms_8s50_ic/bms_8s50_ic_0_1_0.conf → ...esolar/bms_8s50_ic/bms_8s50_ic_0_1_0.conf b/...ds/arm/bms_8s50_ic/bms_8s50_ic_0_1_0.conf → ...esolar/bms_8s50_ic/bms_8s50_ic_0_1_0.conf
diff --git a/...arm/bms_8s50_ic/bms_8s50_ic_0_1_0.overlay → ...lar/bms_8s50_ic/bms_8s50_ic_0_1_0.overlay b/...arm/bms_8s50_ic/bms_8s50_ic_0_1_0.overlay → ...lar/bms_8s50_ic/bms_8s50_ic_0_1_0.overlay
diff --git a/...ds/arm/bms_8s50_ic/bms_8s50_ic_0_2_0.conf → ...esolar/bms_8s50_ic/bms_8s50_ic_0_2_0.conf b/...ds/arm/bms_8s50_ic/bms_8s50_ic_0_2_0.conf → ...esolar/bms_8s50_ic/bms_8s50_ic_0_2_0.conf
diff --git a/...arm/bms_8s50_ic/bms_8s50_ic_0_2_0.overlay → ...lar/bms_8s50_ic/bms_8s50_ic_0_2_0.overlay b/...arm/bms_8s50_ic/bms_8s50_ic_0_2_0.overlay → ...lar/bms_8s50_ic/bms_8s50_ic_0_2_0.overlay
diff --git a/boards/arm/bms_8s50_ic/bms_8s50_ic_defconfig → ...resolar/bms_8s50_ic/bms_8s50_ic_defconfig b/boards/arm/bms_8s50_ic/bms_8s50_ic_defconfig → ...resolar/bms_8s50_ic/bms_8s50_ic_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32L4X=y
-CONFIG_SOC_STM32L452XX=y
-
 CONFIG_ARM_MPU=y
 
 CONFIG_CLOCK_CONTROL=y

diff --git a/boards/arm/bms_8s50_ic/board.cmake → boards/libresolar/bms_8s50_ic/board.cmake b/boards/arm/bms_8s50_ic/board.cmake → boards/libresolar/bms_8s50_ic/board.cmake
diff --git a/boards/libresolar/bms_8s50_ic/board.yml b/boards/libresolar/bms_8s50_ic/board.yml
@@ -0,0 +1,11 @@
+board:
+  name: bms_8s50_ic
+  vendor: libresolar
+  socs:
+    - name: stm32l452xc
+  revision:
+    format: major.minor.patch
+    default: "0.2.0"
+    revisions:
+    - name: "0.2.0"
+    - name: "0.1.0"
diff --git a/boards/arm/bms_8s50_ic/support/openocd.cfg → ...ibresolar/bms_8s50_ic/support/openocd.cfg b/boards/arm/bms_8s50_ic/support/openocd.cfg → ...ibresolar/bms_8s50_ic/support/openocd.cfg
diff --git a/boards/riscv/bms_c1/Kconfig.board → boards/libresolar/bms_c1/Kconfig.bms_c1 b/boards/riscv/bms_c1/Kconfig.board → boards/libresolar/bms_c1/Kconfig.bms_c1
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BMS_C1
-	bool "Libre Solar BMS C1"
-	depends on SOC_SERIES_ESP32C3
+        select SOC_ESP32C3_MINI_N4
diff --git a/boards/riscv/bms_c1/Kconfig.defconfig → boards/libresolar/bms_c1/Kconfig.defconfig b/boards/riscv/bms_c1/Kconfig.defconfig → boards/libresolar/bms_c1/Kconfig.defconfig
@@ -1,11 +1,6 @@
 # Copyright (c) The Libre Solar Project Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_BMS_C1
-
-config BOARD
-	default "bms_c1" if BOARD_BMS_C1
-
 config ENTROPY_ESP32_RNG
 	default y if ENTROPY_GENERATOR
 
@@ -14,12 +9,6 @@ config HEAP_MEM_POOL_SIZE
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
-endif # BOARD_BMS_C1
-
 if BMS_IC
 
 config BMS_IC_MAX_THERMISTORS

diff --git a/boards/riscv/bms_c1/Kconfig.sysbuild → boards/libresolar/bms_c1/Kconfig.sysbuild b/boards/riscv/bms_c1/Kconfig.sysbuild → boards/libresolar/bms_c1/Kconfig.sysbuild
diff --git a/boards/riscv/bms_c1/bms_c1.dts → boards/libresolar/bms_c1/bms_c1.dts b/boards/riscv/bms_c1/bms_c1.dts → boards/libresolar/bms_c1/bms_c1.dts
@@ -30,6 +30,7 @@
 		zephyr,shell-uart = &usb_serial;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 		thingset,can = &twai;
 		thingset,serial = &uart0;
 	};
@@ -66,10 +67,6 @@
 	};
 };
 
-&cpu0 {
-	clock-frequency = <ESP32_CLK_CPU_160M>;
-};
-
 &uart0 {
 	status = "okay";
 	current-speed = <115200>;
@@ -128,7 +125,7 @@
 	status = "okay";
 	pinctrl-0 = <&twai_default>;
 	pinctrl-names = "default";
-	bus-speed = <500000>;
+	bitrate = <500000>;
 	phys = <&transceiver0>;
 };
 
@@ -191,3 +188,7 @@
 
 	/* see version-specific overlays for I2C */
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/riscv/bms_c1/bms_c1.yaml → boards/libresolar/bms_c1/bms_c1.yaml b/boards/riscv/bms_c1/bms_c1.yaml → boards/libresolar/bms_c1/bms_c1.yaml
diff --git a/boards/riscv/bms_c1/bms_c1_0_3_0.conf → boards/libresolar/bms_c1/bms_c1_0_3_0.conf b/boards/riscv/bms_c1/bms_c1_0_3_0.conf → boards/libresolar/bms_c1/bms_c1_0_3_0.conf
diff --git a/boards/riscv/bms_c1/bms_c1_0_3_0.overlay → ...ds/libresolar/bms_c1/bms_c1_0_3_0.overlay b/boards/riscv/bms_c1/bms_c1_0_3_0.overlay → ...ds/libresolar/bms_c1/bms_c1_0_3_0.overlay
diff --git a/boards/riscv/bms_c1/bms_c1_0_4_0.conf → boards/libresolar/bms_c1/bms_c1_0_4_0.conf b/boards/riscv/bms_c1/bms_c1_0_4_0.conf → boards/libresolar/bms_c1/bms_c1_0_4_0.conf
diff --git a/boards/riscv/bms_c1/bms_c1_0_4_0.overlay → ...ds/libresolar/bms_c1/bms_c1_0_4_0.overlay b/boards/riscv/bms_c1/bms_c1_0_4_0.overlay → ...ds/libresolar/bms_c1/bms_c1_0_4_0.overlay
diff --git a/boards/riscv/bms_c1/bms_c1_defconfig → boards/libresolar/bms_c1/bms_c1_defconfig b/boards/riscv/bms_c1/bms_c1_defconfig → boards/libresolar/bms_c1/bms_c1_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_BOARD_BMS_C1=y
-CONFIG_SOC_SERIES_ESP32C3=y
-
 CONFIG_CLOCK_CONTROL=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 

diff --git a/boards/riscv/bms_c1/board.cmake → boards/libresolar/bms_c1/board.cmake b/boards/riscv/bms_c1/board.cmake → boards/libresolar/bms_c1/board.cmake
diff --git a/boards/libresolar/bms_c1/board.yml b/boards/libresolar/bms_c1/board.yml
@@ -0,0 +1,11 @@
+board:
+  name: bms_c1
+  vendor: libresolar
+  socs:
+    - name: esp32c3
+  revision:
+    format: major.minor.patch
+    default: "0.4.0"
+    revisions:
+    - name: "0.4.0"
+    - name: "0.3.0"
diff --git a/boards/riscv/bms_c1/support/openocd.cfg → boards/libresolar/bms_c1/support/openocd.cfg b/boards/riscv/bms_c1/support/openocd.cfg → boards/libresolar/bms_c1/support/openocd.cfg
diff --git a/boards/riscv/bms_c1/revision.cmake b/boards/riscv/bms_c1/revision.cmake
diff --git a/west.yml b/west.yml
@@ -13,7 +13,7 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject
-      revision: v3.6-branch
+      revision: v3.7-branch
       import:
         name-allowlist:
           - cmsis
@@ -30,3 +30,8 @@ manifest:
         name-allowlist:
           - thingset-node-c
           - zcbor
+    - name: thingset-node-c
+      remote: thingset
+      revision: ecd807b7ab26f3b0fd818b2118b2258736851a22
+      path: modules/thingset-node-c
+      import: true