Skip to content

Commit b07254f

Browse files
committed
merge: 'upstream' into pst-v4.2.99 zephyrproject-rtos#72
# Conflicts: # drivers/gpio/gpio_nxp_siul2.c # drivers/gpio/gpio_stm32.c # drivers/i2c/i2c_ll_stm32_v2.c # include/zephyr/kernel.h # subsys/sd/sd.c # subsys/sd/sdio.c # subsys/sd/sdmmc.c
2 parents 7e535ae + 6221251 commit b07254f

File tree

435 files changed

+12738
-4199
lines changed

Some content is hidden

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

435 files changed

+12738
-4199
lines changed

.github/workflows/codecov.yaml

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
name: Code Coverage with codecov
22

33
on:
4-
schedule:
5-
- cron: '25 06,18 * * *'
4+
push:
5+
branches:
6+
- main
7+
- v*-branch
8+
- collab-*
69

710
permissions:
811
contents: read
@@ -112,6 +115,24 @@ jobs:
112115
-T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano \
113116
--timeout-multiplier 2
114117
118+
- name: Build Doxygen Coverage
119+
if: matrix.platform == 'unit_testing'
120+
run: |
121+
pip install -r doc/requirements.txt --require-hashes
122+
sudo apt-get update
123+
sudo apt-get install -y graphviz # dot is needed but currently missing from the Docker image
124+
cmake -B doc/_build -S doc
125+
cmake --build doc/_build --target doxygen-coverage
126+
127+
- name: Upload Doxygen Coverage Results
128+
if: matrix.platform == 'unit_testing'
129+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
130+
with:
131+
name: doxygen-coverage-results
132+
path: |
133+
doc/_build/new.info
134+
doc/_build/coverage-report
135+
115136
- name: Print ccache stats
116137
if: always()
117138
run: |
@@ -230,7 +251,7 @@ jobs:
230251
coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.json
231252
coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.xlsx
232253
233-
- name: Upload coverage to Codecov
254+
- name: Upload test coverage to Codecov
234255
if: always()
235256
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
236257
with:
@@ -240,3 +261,15 @@ jobs:
240261
token: ${{ secrets.CODECOV_TOKEN }}
241262
files: coverage/reports/merged.xml
242263
flags: unittests-coverage
264+
265+
- name: Upload Doxygen coverage to Codecov
266+
if: always()
267+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
268+
with:
269+
env_vars: OS,PYTHON
270+
fail_ci_if_error: false
271+
verbose: true
272+
token: ${{ secrets.CODECOV_TOKEN }}
273+
files: coverage/reports/doxygen-coverage-results/new.info
274+
disable_search: true
275+
flags: doxygen-coverage

.github/workflows/doc-build.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,6 @@ jobs:
164164
name: api-coverage
165165
path: zephyr/api-coverage.tar.xz
166166

167-
- name: Upload Doxygen coverage to Codecov
168-
if: github.event_name == 'schedule'
169-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
170-
with:
171-
env_vars: OS,PYTHON
172-
fail_ci_if_error: false
173-
verbose: true
174-
token: ${{ secrets.CODECOV_TOKEN }}
175-
working-directory: zephyr
176-
files: new.info
177-
disable_search: true
178-
flags: doxygen-coverage
179167

180168
- name: process-pr
181169
if: github.event_name == 'pull_request'

boards/acrn/acrn/acrn.dts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
model = "ACRN";
1818
compatible = "acrn";
1919

20+
cpus {
21+
cpu@1 {
22+
device_type = "cpu";
23+
compatible = "intel,x86_64";
24+
d-cache-line-size = <64>;
25+
reg = <1>;
26+
};
27+
};
28+
2029
aliases {
2130
uart-0 = &uart0;
2231
uart-1 = &uart1;
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright (c) 2025 Jonas Berg
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config BOARD_ADAFRUIT_FEATHER_RFM95_RP2040
5+
select RP2_FLASH_W25Q080
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright (c) 2025 Jonas Berg
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
config BOARD_ADAFRUIT_FEATHER_RFM95_RP2040
5+
select SOC_RP2040
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Copyright (c) 2022 Peter Johanson
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
if BOARD_ADAFRUIT_FEATHER_RFM95_RP2040
5+
6+
if I2C_DW
7+
8+
config I2C_DW_CLOCK_SPEED
9+
default 125
10+
11+
endif # I2C_DW
12+
13+
config USB_SELF_POWERED
14+
default n
15+
16+
endif # BOARD_ADAFRUIT_FEATHER_RFM95_RP2040
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Copyright (c) 2025 Jonas Berg
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include <dt-bindings/pinctrl/rpi-pico-rp2040-pinctrl.h>
8+
9+
&pinctrl {
10+
uart0_default: uart0_default {
11+
group1 {
12+
pinmux = <UART0_TX_P0>;
13+
};
14+
15+
group2 {
16+
pinmux = <UART0_RX_P1>;
17+
input-enable;
18+
};
19+
};
20+
21+
i2c1_default: i2c1_default {
22+
group1 {
23+
pinmux = <I2C1_SDA_P2>;
24+
input-enable;
25+
};
26+
27+
group2 {
28+
pinmux = <I2C1_SCL_P3>;
29+
input-enable;
30+
};
31+
};
32+
33+
spi1_default: spi1_default {
34+
group1 {
35+
/* Pin GPIO16 is used as CS (no pinmux available) */
36+
pinmux = <SPI1_TX_P15>, <SPI1_SCK_P14>;
37+
};
38+
39+
group2 {
40+
pinmux = <SPI1_RX_P8>;
41+
input-enable;
42+
};
43+
};
44+
45+
adc_default: adc_default {
46+
group1 {
47+
pinmux = <ADC_CH0_P26>, <ADC_CH1_P27>, <ADC_CH2_P28>, <ADC_CH3_P29>;
48+
input-enable;
49+
};
50+
};
51+
52+
ws2812_pio0_default: ws2812_pio0_default {
53+
group1 {
54+
pinmux = <PIO0_P4>;
55+
};
56+
};
57+
};

0 commit comments

Comments
 (0)