Skip to content

Commit 2c95679

Browse files
tannewttannewt
committed
Start tracking zephyr/main
main is still quite stable but has the latest hardware support and bug fixes.
1 parent 8fb29d9 commit 2c95679

File tree

5 files changed

+49
-36
lines changed

5 files changed

+49
-36
lines changed

‎ports/zephyr-cp/boards/board_aliases.cmake‎

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,46 @@
1-
set(pca10056_BOARD_ALIAS nrf52840dk/nrf52840)
2-
set(adafruit_feather_nrf52840_zephyr_BOARD_ALIAS adafruit_feather_nrf52840/nrf52840/uf2)
3-
set(renesas_ek_ra6m5_BOARD_ALIAS ek_ra6m5)
4-
set(renesas_ek_ra8d1_BOARD_ALIAS ek_ra8d1)
5-
set(renesas_da14695_dk_usb_BOARD_ALIAS da14695_dk_usb)
6-
set(native_native_sim_BOARD_ALIAS native_sim)
7-
set(native_nrf5340bsim_BOARD_ALIAS nrf5340bsim/nrf5340/cpuapp)
8-
set(nordic_nrf54l15dk_BOARD_ALIAS nrf54l15dk/nrf54l15/cpuapp)
9-
set(nordic_nrf54h20dk_BOARD_ALIAS nrf54h20dk/nrf54h20/cpuapp)
10-
set(nordic_nrf5340dk_BOARD_ALIAS nrf5340dk/nrf5340/cpuapp)
11-
set(nordic_nrf7002dk_BOARD_ALIAS nrf7002dk/nrf5340/cpuapp)
12-
set(nxp_frdm_mcxn947_BOARD_ALIAS frdm_mcxn947/mcxn947/cpu0)
13-
set(nxp_frdm_rw612_BOARD_ALIAS frdm_rw612)
14-
set(nxp_mimxrt1170_evk_BOARD_ALIAS mimxrt1170_evk@A/mimxrt1176/cm7)
15-
set(st_stm32h7b3i_dk_BOARD_ALIAS stm32h7b3i_dk)
16-
set(st_stm32wba65i_dk1_BOARD_ALIAS stm32wba65i_dk1)
17-
set(st_nucleo_u575zi_q_BOARD_ALIAS nucleo_u575zi_q/stm32u575xx)
18-
set(st_nucleo_n657x0_q_BOARD_ALIAS nucleo_n657x0_q/stm32n657xx)
1+
# Workaround for Zephyr alias handling with BOARD_QUALIFIERS in newer Zephyr.
2+
#
3+
# Instead of using <alias>_BOARD_ALIAS variables, translate BOARD directly so
4+
# we don't end up with a spurious trailing '/' in BOARD_QUALIFIERS.
5+
macro(cp_board_alias alias target)
6+
if(BOARD STREQUAL "${alias}")
7+
if(NOT "${target}" MATCHES "^([^@/]+)(@[^@/]+)?(/([^@]+))?$")
8+
message(FATAL_ERROR "Invalid alias target '${target}'")
9+
endif()
10+
11+
set(BOARD_ALIAS "${alias}" CACHE STRING "Board alias, provided by user")
12+
set(BOARD "${CMAKE_MATCH_1}")
13+
14+
if(CMAKE_MATCH_2)
15+
string(REPLACE "@" "" _rev "${CMAKE_MATCH_2}")
16+
set(BOARD_REVISION "${_rev}")
17+
else()
18+
unset(BOARD_REVISION)
19+
endif()
20+
21+
if(CMAKE_MATCH_4)
22+
set(BOARD_QUALIFIERS "${CMAKE_MATCH_4}")
23+
else()
24+
unset(BOARD_QUALIFIERS)
25+
endif()
26+
endif()
27+
endmacro()
28+
29+
cp_board_alias(pca10056 nrf52840dk/nrf52840)
30+
cp_board_alias(adafruit_feather_nrf52840_zephyr adafruit_feather_nrf52840/nrf52840/uf2)
31+
cp_board_alias(renesas_ek_ra6m5 ek_ra6m5)
32+
cp_board_alias(renesas_ek_ra8d1 ek_ra8d1)
33+
cp_board_alias(renesas_da14695_dk_usb da14695_dk_usb)
34+
cp_board_alias(native_native_sim native_sim/native)
35+
cp_board_alias(native_nrf5340bsim nrf5340bsim/nrf5340/cpuapp)
36+
cp_board_alias(nordic_nrf54l15dk nrf54l15dk/nrf54l15/cpuapp)
37+
cp_board_alias(nordic_nrf54h20dk nrf54h20dk/nrf54h20/cpuapp)
38+
cp_board_alias(nordic_nrf5340dk nrf5340dk/nrf5340/cpuapp)
39+
cp_board_alias(nordic_nrf7002dk nrf7002dk/nrf5340/cpuapp)
40+
cp_board_alias(nxp_frdm_mcxn947 frdm_mcxn947/mcxn947/cpu0)
41+
cp_board_alias(nxp_frdm_rw612 frdm_rw612)
42+
cp_board_alias(nxp_mimxrt1170_evk mimxrt1170_evk@A/mimxrt1176/cm7)
43+
cp_board_alias(st_stm32h7b3i_dk stm32h7b3i_dk)
44+
cp_board_alias(st_stm32wba65i_dk1 stm32wba65i_dk1)
45+
cp_board_alias(st_nucleo_u575zi_q nucleo_u575zi_q/stm32u575xx)
46+
cp_board_alias(st_nucleo_n657x0_q nucleo_n657x0_q/stm32n657xx)

‎ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ CONFIG_GPIO=y
66
# Enable Bluetooth stack - bsim is for BT simulation
77
CONFIG_BT=y
88
CONFIG_BT_HCI=y
9-
CONFIG_BT_HCI_IPC=y
109
CONFIG_BT_OBSERVER=y
1110
CONFIG_BT_BROADCASTER=y
1211

1312
CONFIG_BT_DEVICE_NAME_DYNAMIC=y
1413
CONFIG_BT_DEVICE_NAME_MAX=28
1514

16-
# So we can test safe mode
17-
CONFIG_NATIVE_SIM_REBOOT=y
18-
1915
# Ensure the network core image starts when using native simulator
2016
CONFIG_NATIVE_SIMULATOR_AUTOSTART_MCU=y
2117

‎ports/zephyr-cp/prj.conf‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
CONFIG_SYS_HEAP_RUNTIME_STATS=n
22
CONFIG_FLASH=y
33
CONFIG_FLASH_MAP=y
4-
CONFIG_STD_C23=y
54

65
CONFIG_DYNAMIC_INTERRUPTS=y
76
CONFIG_UART_INTERRUPT_DRIVEN=y
87

98
CONFIG_FLASH_MAP_LABELS=y
109
CONFIG_MAIN_STACK_SIZE=24288
11-
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
12-
CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
1310

1411
CONFIG_THREAD_STACK_INFO=y
1512
CONFIG_STACK_SENTINEL=n
1613
CONFIG_DEBUG_THREAD_INFO=n
17-
CONFIG_DEBUG_INFO=n
1814
CONFIG_EXCEPTION_STACK_TRACE=n
1915

2016
CONFIG_USB_DEVICE_STACK_NEXT=y
2117
CONFIG_USBD_CDC_ACM_CLASS=y
22-
CONFIG_USBD_MAX_SPEED=1
2318
CONFIG_USBD_MSC_STACK_SIZE=1536
2419
CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=n
2520

@@ -44,13 +39,8 @@ CONFIG_SPI_ASYNC=y
4439

4540
CONFIG_LOG=y
4641
CONFIG_LOG_MAX_LEVEL=2
47-
CONFIG_HW_STACK_PROTECTION=y
4842
CONFIG_FRAME_POINTER=n
4943

50-
CONFIG_BT_BUF_ACL_TX_COUNT=7
51-
CONFIG_BT_HCI_ERR_TO_STR=y
52-
5344
CONFIG_NET_HOSTNAME_ENABLE=y
5445
CONFIG_NET_HOSTNAME_DYNAMIC=y
5546
CONFIG_NET_HOSTNAME="circuitpython"
56-
CONFIG_NET_MGMT_EVENT_INFO=y

‎ports/zephyr-cp/socs/nrf5340_cpuapp.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11

2-
CONFIG_NRFX_UARTE0=y
3-
CONFIG_NRFX_UARTE1=y
2+
CONFIG_NRFX_UARTE=y
43
CONFIG_NRFX_POWER=y

‎ports/zephyr-cp/zephyr-config/west.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ manifest:
44
projects:
55
- name: nrf_hw_models
66
url: https://github.com/tannewt/ext_nRF_hw_models
7-
revision: bb351cef9e5ab4d175fe3cb7c4d6761d837bac20
7+
revision: c2927847bdf2ee0af9c5459f4155c67f39f6837a
88
path: modules/bsim_hw_models/nrf_hw_models
99
- name: zephyr
1010
url: https://github.com/adafruit/zephyr
11-
revision: 8801b409ec554cfd217c159c00f91280ea1331db
11+
revision: 5351284ac926b1352ab98f5ae692a21f38068beb
1212
clone-depth: 100
1313
import: true

0 commit comments

Comments
 (0)