Skip to content

Commit 73d5b4d

Browse files
ahjusahjus
authored
Merge branch 'nrfconnect:main' into main
2 parents fe1b5ae + c21cc96 commit 73d5b4d

File tree

1,278 files changed

+19623
-5948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,278 files changed

+19623
-5948
lines changed

‎.github/workflows/twister_tests_blackbox.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
4545
west init -l . || true
4646
# we do not depend on any hals, tools or bootloader, save some time and space...
47-
west config manifest.group-filter -- -hal,-tools,-bootloader
47+
west config manifest.group-filter -- -hal,-tools,-bootloader,-babblesim
48+
west config manifest.project-filter -- -nrf_hw_models
4849
west config --global update.narrow true
4950
west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
5051
west forall -c 'git reset --hard HEAD'

‎MAINTAINERS.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2185,7 +2185,7 @@ Release Notes:
21852185
collaborators:
21862186
- sachinthegreen
21872187
files:
2188-
- drivers/wifi/nrfwifi/
2188+
- drivers/wifi/nrf_wifi/
21892189
- dts/bindings/wifi/nordic,nrf70.yaml
21902190
- dts/bindings/wifi/nordic,nrf70-qspi.yaml
21912191
- dts/bindings/wifi/nordic,nrf70-spi.yaml
@@ -4980,6 +4980,16 @@ West:
49804980
labels:
49814981
- "area: native port"
49824982

4983+
"West project: nrf_wifi":
4984+
status: maintained
4985+
maintainers:
4986+
- krish2718
4987+
- sachinthegreen
4988+
files:
4989+
- modules/nrf_wifi/
4990+
labels:
4991+
- "area: Wi-Fi"
4992+
49834993
"West project: open-amp":
49844994
status: odd fixes
49854995
collaborators:

‎arch/arm/core/cortex_a_r/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ config CPU_CORTEX_R7
9393
help
9494
This option signifies the use of a Cortex-R7 CPU
9595

96+
config CPU_CORTEX_R8
97+
bool
98+
select CPU_AARCH32_CORTEX_R
99+
select ARMV7_R
100+
select ARMV7_R_FP if CPU_HAS_FPU
101+
help
102+
This option signifies the use of a Cortex-R8 CPU
103+
96104
config CPU_CORTEX_R52
97105
bool
98106
select CPU_AARCH32_CORTEX_R

‎boards/01space/esp32c3_042_oled/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: esp32c3_042_oled
3+
full_name: ESP32C3 0.42 OLED
34
vendor: 01space
45
socs:
56
- name: esp32c3

‎boards/96boards/aerocore2/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: 96b_aerocore2
3+
full_name: Aerocore2
34
vendor: 96boards
45
socs:
56
- name: stm32f427xx

‎boards/96boards/argonkey/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: 96b_argonkey
3+
full_name: Argonkey
34
vendor: 96boards
45
socs:
56
- name: stm32f412cx

‎boards/96boards/avenger96/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: 96b_avenger96
3+
full_name: Avenger96
34
vendor: 96boards
45
socs:
56
- name: stm32mp157cxx

‎boards/96boards/carbon/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: 96b_carbon
3+
full_name: Carbon
34
vendor: 96boards
45
socs:
56
- name: stm32f401xe

‎boards/96boards/meerkat96/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: 96b_meerkat96
3+
full_name: Meerkat96
34
vendor: 96boards
45
socs:
56
- name: mcimx7d

‎boards/96boards/neonkey/board.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board:
22
name: 96b_neonkey
3+
full_name: Neonkey
34
vendor: 96boards
45
socs:
56
- name: stm32f411xe

0 commit comments

Comments
 (0)