Convert nrf51, nrf52820, nrf52832, nrf52840, nrf5340, nrf9160 boards #4

nordicjm · 2024-01-02T10:20:22Z

tejlmand · 2024-01-05T10:22:56Z

From compliance:

Warning: boards/v2/laird_connect/bl5340_dvk/Kconfig.bl5340_dvk:7 please, no spaces at the start of a line
....

I think those Kconfigs would be nice to address before merging, to minimize number of commits / changes on each file during porting.

get_maintainer.MaintainersError: MAINTAINERS.yml: glob pattern 'boards/arm/qemu_cortex_m0/' in 'files' in area 'ARM arch' does not match any files

Can be ignored, let's make a MAINTAINERS update in the branch when porting has completed.

tejlmand

Generally good looking 👍 .

Noticed a couple of minors which seems to be a repeating pattern, so only mention them once.

Only major that seems to need fixing before merging would be missing handling of board revisions.
The minor can be addressed later (but also done immediately if you like)

tejlmand · 2024-01-05T10:25:00Z

boards/v2/ublox/ubx_bmd300eval/board.yml

+  name: ubx_bmd300eval
+  vendor: U-blox
+  socs:
+  - name: nrf52832


minor, but seems a newline is missing (editor setting ?)

these were generated by the v1 -> v2 bash script :)

(~~editor~~ script setting ?)

Fixed 😆

tejlmand · 2024-01-05T10:28:49Z

boards/v2/ublox/ubx_bmd300eval/Kconfig.ubx_bmd300eval

+config BOARD_UBX_BMD300EVAL
+	bool
+	default y
+	select SOC_SERIES_NRF52X


with soc series no longer a choice we should actually have the soc selecting the series and avoid the need for this selection. (something not possible in old hwm as you cannot select a choice entry in Kconfig)

tejlmand · 2024-01-05T10:34:50Z

boards/v2/ublox/ubx_bmd300eval/Kconfig.ubx_bmd300eval

+	bool
+	default y


not needed, this is done automatically with the benefit that if config BOARD_UBX_BMD300EVAL is mispelled we'll get a Kconfig warning.

Ref: https://github.com/zephyrproject-rtos/zephyr/blob/4a5473603d38877c0fdc54a7b1a5db203a0e0f51/boards/Kconfig.v2#L5-L16

https://github.com/tejlmand/zephyr/blob/3df5cfea48a7be424007de0fd9e1934a78360d76/boards/Kconfig.v2#L5-L16

tejlmand · 2024-01-05T11:01:14Z

boards/v2/nordic_nrf/nrf9160dk/board.yml

@@ -0,0 +1,8 @@
+board:
+  name: nrf9160dk
+  vendor: Nordic Semiconductor


what happened to revisions ?

tejlmand · 2024-01-05T11:08:00Z

boards/v2/raytac/raytac_mdbt53v_db_40/CMakeLists.txt

+if(("${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp" OR "${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp/ns")
+   AND CONFIG_BOARD_ENABLE_CPUNET)


this is board specific CMakeLists.txt, and only sourced when this board is building, so we could reduce check to:

Suggested change

if(("${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp" OR "${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp/ns")

AND CONFIG_BOARD_ENABLE_CPUNET)

if(CONFIG_SOC_NRF5340_CPUAPP_QKAA AND CONFIG_BOARD_ENABLE_CPUNET)

(not required for merging, but could be considered in case file has to be touched for other reasons)
Same comment goes for other cmake files in commit.

tejlmand · 2024-01-05T11:16:00Z

boards/v2/actinius/actinius_icarus/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: actinius_icarus
+  vendor: Actinius


what about revisions ?

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

Moves this SoC over from v1 to v2 so it can be used in HWMv2 Signed-off-by: Jamie McCrae <[email protected]>

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

hci_packet_complete(buf, buf_size) should check whether buf_size is enough. For instance, hci_packet_complete can receive buf with buf_size 1, leading to the buffer overflow in cmd->param_len, which is buf[3]. This can happen when rx_thread() receives two frames in 512 bytes and the first frame size is 511. Then, rx_thread() will call hci_packet_complete() with 1. ==5==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000000ad81c2 at pc 0x0000005279b3 bp 0x7fffe74f5b70 sp 0x7fffe74f5b68 READ of size 2 at 0x000000ad81c2 thread T6 #0 0x5279b2 (/root/zephyr.exe+0x5279b2) #1 0x4d697d (/root/zephyr.exe+0x4d697d) #2 0x7ffff60e5daa (/lib/x86_64-linux-gnu/libc.so.6+0x89daa) (BuildId: 2e01923fea4ad9f7fa50fe24e0f3385a45a6cd1c) 0x000000ad81c2 is located 2 bytes to the right of global variable 'rx_thread.frame' defined in 'zephyr/drivers/bluetooth/hci/userchan.c' (0xad7fc0) of size 512 SUMMARY: AddressSanitizer: global-buffer-overflow (/root/zephyr.exe+0x5279b2) Thread T6 created by T2 here: #0 0x48c17c (/root/zephyr.exe+0x48c17c) #1 0x530192 (/root/zephyr.exe+0x530192) #2 0x4dcc22 (/root/zephyr.exe+0x4dcc22) Thread T2 created by T1 here: #0 0x48c17c (/root/zephyr.exe+0x48c17c) #1 0x530192 (/root/zephyr.exe+0x530192) #2 0x4dcc22 (/root/zephyr.exe+0x4dcc22) Thread T1 created by T0 here: #0 0x48c17c (/root/zephyr.exe+0x48c17c) #1 0x52f36c (/root/zephyr.exe+0x52f36c) #2 0x5371dc (/root/zephyr.exe+0x5371dc) #3 0x5312a6 (/root/zephyr.exe+0x5312a6) #4 0x52ed7b (/root/zephyr.exe+0x52ed7b) #5 0x52eddd (/root/zephyr.exe+0x52eddd) #6 0x7ffff6083c89 (/lib/x86_64-linux-gnu/libc.so.6+0x27c89) (BuildId: 2e01923fea4ad9f7fa50fe24e0f3385a45a6cd1c) ==5==ABORTING Signed-off-by: Sungwoo Kim <[email protected]>

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch 2 times, most recently from b18c88d to 2300fbd Compare January 2, 2024 12:18

nordicjm changed the title ~~Convert nrf52832 boards~~ Convert nrf51, nrf52820, nrf52832, nrf52840 boards Jan 2, 2024

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch from dcef25d to 49b1fc8 Compare January 2, 2024 13:23

nordicjm changed the title ~~Convert nrf51, nrf52820, nrf52832, nrf52840 boards~~ Convert nrf51, nrf52820, nrf52832, nrf52840, nrf9160 boards Jan 4, 2024

nordicjm changed the title ~~Convert nrf51, nrf52820, nrf52832, nrf52840, nrf9160 boards~~ Convert nrf51, nrf52820, nrf52832, nrf52840, nrf5340, nrf9160 boards Jan 4, 2024

tejlmand requested changes Jan 5, 2024

View reviewed changes

tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch 2 times, most recently from 2b6fb63 to ed31c97 Compare January 5, 2024 13:11

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch from f405e1e to 2134889 Compare January 5, 2024 14:59

tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch from ed31c97 to 8487e7f Compare January 8, 2024 09:12

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch from 2134889 to 4ef0f0b Compare January 8, 2024 09:55

tejlmand force-pushed the nrf52_adopt_soc_scheme_v2 branch from 8487e7f to 8034bac Compare January 9, 2024 11:14

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from 8034bac to e6ff528 Compare January 9, 2024 12:28

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch 2 times, most recently from 165f824 to 7efbb6d Compare January 9, 2024 15:42

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch from e6ff528 to 0b7ce66 Compare January 22, 2024 08:18

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch 2 times, most recently from 4f39e87 to 483cffb Compare January 22, 2024 08:40

nordicjm requested a review from tejlmand January 22, 2024 08:45

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2 branch 4 times, most recently from 361a5c6 to cb6a26c Compare January 22, 2024 11:08

nordicjm added 5 commits January 22, 2024 11:13

boards: arm: ubx_bmd300eval_nrf52832: Convert to v2

c33e27c

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: ubx_evkannab1_nrf52832: Convert to v2

2ab2cc5

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: pinetime_devkit0: Convert to v2

eb621d5

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: ruuvi_ruuvitag: Convert to v2

bdd73e5

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf52832_mdk: Convert to v2

5676e67

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

nordicjm added 26 commits January 22, 2024 11:13

boards: arm: nrf51_ble400: Convert to v2

10fe489

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf51_vbluno51: Convert to v2

7e50d55

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf51_blenano: Convert to v2

aead455

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf51dongle_nrf51422: Convert to v2

f011dda

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: rm1xx_dvk: Convert to v2

758560f

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: bbc_microbit: Convert to v2

1c68166

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: qemu_cortex_m0: Convert to v2

aceb81d

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: xiao_ble: Convert to v2

d588f16

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf9160dk_*: Convert to v2

ad1fa97

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: actinius_icarus_som_dk: Convert to v2

95f6eba

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: actinius_icarus_som: Convert to v2

6cdc80f

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: actinius_icarus_bee: Convert to v2

15468af

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: actinius_icarus: Convert to v2

39d3ecf

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: circuitdojo_feather_nrf9160: Convert to v2

cda23a5

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: sparkfun_thing_plus_nrf9160: Convert to v2

5555fa2

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf9160_innblue21: Convert to v2

5a3a40a

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf9160_innblue22: Convert to v2

0fc74e3

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: thingy53_nrf5340: Convert to v2

0ed3518

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf5340_audio_dk_nrf5340: Convert to v2

d23f78e

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: raytac_mdbt53_db_40: Convert to v2

e0637eb

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: raytac_mdbt53v_db_40_nrf5340: Convert to v2

abc86c1

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: bl5340_dvk: Convert to v2

cfc4dde

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf9131ek_nrf9131: Convert to v2

57a78ca

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

soc: nordic_nrf: Migrate nRF9151 to v2

df178e1

Moves this SoC over from v1 to v2 so it can be used in HWMv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf9151dk_nrf9151: Convert to v2

5593c4c

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

boards: arm: nrf9161dk_nrf9161: Convert to v2

fce1f83

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <[email protected]>

nordicjm force-pushed the nrf52_adopt_soc_scheme_v2_more branch from 483cffb to fce1f83 Compare January 22, 2024 11:13

tejlmand merged this pull request into tejlmand:nrf52_adopt_soc_scheme_v2 Jan 23, 2024
8 of 10 checks passed

nordicjm deleted the nrf52_adopt_soc_scheme_v2_more branch January 27, 2025 10:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert nrf51, nrf52820, nrf52832, nrf52840, nrf5340, nrf9160 boards #4

Convert nrf51, nrf52820, nrf52832, nrf52840, nrf5340, nrf9160 boards #4

nordicjm commented Jan 2, 2024 •

edited

Loading

tejlmand commented Jan 5, 2024 •

edited

Loading

tejlmand left a comment •

edited

Loading

tejlmand Jan 5, 2024

nordicjm Jan 5, 2024

tejlmand Jan 8, 2024

tejlmand Jan 5, 2024

tejlmand Jan 5, 2024

tejlmand Jan 5, 2024

tejlmand Jan 5, 2024

tejlmand Jan 5, 2024

		if(("${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp" OR "${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp/ns")
		AND CONFIG_BOARD_ENABLE_CPUNET)

	if(("${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp" OR "${BOARD_IDENTIFIER}" STREQUAL "/nrf5340/cpuapp/ns")
	AND CONFIG_BOARD_ENABLE_CPUNET)
	if(CONFIG_SOC_NRF5340_CPUAPP_QKAA AND CONFIG_BOARD_ENABLE_CPUNET)

Convert nrf51, nrf52820, nrf52832, nrf52840, nrf5340, nrf9160 boards #4

Convert nrf51, nrf52820, nrf52832, nrf52840, nrf5340, nrf9160 boards #4

Conversation

nordicjm commented Jan 2, 2024 • edited Loading

tejlmand commented Jan 5, 2024 • edited Loading

tejlmand left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nordicjm commented Jan 2, 2024 •

edited

Loading

tejlmand commented Jan 5, 2024 •

edited

Loading

tejlmand left a comment •

edited

Loading