Skip to content

Commit 8d5147c

Browse files
mbolivar-nordicmbolivar-nordic
committed
[nrf mergeup] merge upstream 4ef29b3
Bring in changes up to a post-v2.3.0 Zephyr commit from today's master branch. Signed-off-by: Martí Bolívar <[email protected]>
2 parents 5197386 + 4ef29b3 commit 8d5147c

File tree

4,344 files changed

+83821
-47693
lines changed

Some content is hidden

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

4,344 files changed

+83821
-47693
lines changed

‎.buildkite/daily.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
steps:
2+
- command:
3+
- .buildkite/run.sh
4+
env:
5+
ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
6+
ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3"
7+
parallelism: 120
8+
timeout_in_minutes: 150
9+
retry:
10+
manual: true
11+
plugins:
12+
- docker#v3.5.0:
13+
image: "zephyrprojectrtos/ci:v0.11.8"
14+
propagate-environment: true
15+
volumes:
16+
- "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
17+
- "/var/lib/buildkite-agent/zephyr-module-cache:/var/lib/buildkite-agent/zephyr-module-cache"
18+
- "/var/lib/buildkite-agent/zephyr-ccache:/root/.ccache"
19+
workdir: "/workdir/zephyr"
20+
agents:
21+
- "queue=default"
22+
23+
- wait: ~
24+
continue_on_failure: true
25+
26+
- plugins:
27+
- junit-annotate#v1.7.0:
28+
artifacts: sanitycheck-*.xml
29+
30+
notify:
31+
- email: "[email protected]"
32+
if: build.state != "passed"

‎.buildkite/hooks/post-command

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
# Copyright (c) 2020 Linaro Limited
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
6+
# report disk usage:
7+
echo "--- $0 disk usage"
8+
df -h

‎.buildkite/hooks/pre-command

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
# Copyright (c) 2020 Linaro Limited
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
6+
# Save off where we started so we can go back there
7+
WORKDIR=${PWD}
8+
9+
if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
10+
git fetch -v origin ${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
11+
git checkout FETCH_HEAD
12+
git config --local user.email "[email protected]"
13+
git config --local user.name "Zephyr CI"
14+
git merge --no-edit "${BUILDKITE_COMMIT}" || {
15+
local merge_result=$?
16+
echo "Merge failed: ${merge_result}"
17+
git merge --abort
18+
exit $merge_result
19+
}
20+
fi
21+
22+
mkdir -p /var/lib/buildkite-agent/zephyr-ccache/
23+
24+
# create cache dirs, no-op if they already exist
25+
mkdir -p /var/lib/buildkite-agent/zephyr-module-cache/modules
26+
mkdir -p /var/lib/buildkite-agent/zephyr-module-cache/tools
27+
mkdir -p /var/lib/buildkite-agent/zephyr-module-cache/bootloader
28+
29+
# Clean cache - if it already exists
30+
cd /var/lib/buildkite-agent/zephyr-module-cache
31+
find -type f -not -path "*/.git/*" -not -name ".git" -delete
32+
33+
# Remove any stale locks
34+
find -name index.lock -delete
35+
36+
# return from where we started so we can find pipeline files from
37+
# git repo
38+
cd ${WORKDIR}

‎.buildkite/pipeline.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
steps:
2+
- command:
3+
- .buildkite/run.sh
4+
env:
5+
ZEPHYR_TOOLCHAIN_VARIANT: "zephyr"
6+
ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.11.3"
7+
parallelism: 20
8+
timeout_in_minutes: 120
9+
retry:
10+
manual: true
11+
plugins:
12+
- docker#v3.5.0:
13+
image: "zephyrprojectrtos/ci:v0.11.8"
14+
propagate-environment: true
15+
volumes:
16+
- "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors"
17+
- "/var/lib/buildkite-agent/zephyr-module-cache:/var/lib/buildkite-agent/zephyr-module-cache"
18+
- "/var/lib/buildkite-agent/zephyr-ccache:/root/.ccache"
19+
workdir: "/workdir/zephyr"
20+
agents:
21+
- "queue=default"
22+
23+
- wait: ~
24+
continue_on_failure: true
25+
26+
- plugins:
27+
- junit-annotate#v1.7.0:
28+
artifacts: sanitycheck-*.xml

‎.buildkite/run.sh

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#!/bin/bash
2+
# Copyright (c) 2020 Linaro Limited
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
6+
echo "--- run $0"
7+
8+
git log -n 5 --oneline --decorate --abbrev=12
9+
10+
# Setup module cache
11+
cd /workdir
12+
ln -s /var/lib/buildkite-agent/zephyr-module-cache/modules
13+
ln -s /var/lib/buildkite-agent/zephyr-module-cache/tools
14+
ln -s /var/lib/buildkite-agent/zephyr-module-cache/bootloader
15+
cd /workdir/zephyr
16+
17+
export JOB_NUM=$((${BUILDKITE_PARALLEL_JOB}+1))
18+
19+
# ccache stats
20+
echo ""
21+
echo "--- ccache stats at start"
22+
ccache -s
23+
24+
if [ -n "${DAILY_BUILD}" ]; then
25+
SANITYCHECK_OPTIONS=" --inline-logs -N --build-only --all --retry-failed 3 -v "
26+
echo "--- DAILY BUILD"
27+
west init -l .
28+
west update 1> west.update.log
29+
west forall -c 'git reset --hard HEAD'
30+
source zephyr-env.sh
31+
./scripts/sanitycheck --subset ${JOB_NUM}/${BUILDKITE_PARALLEL_JOB_COUNT} ${SANITYCHECK_OPTIONS}
32+
else
33+
if [ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" ]; then
34+
./scripts/ci/run_ci.sh -c -b ${BUILDKITE_PULL_REQUEST_BASE_BRANCH} -r origin \
35+
-m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT} -p ${BUILDKITE_PULL_REQUEST}
36+
else
37+
./scripts/ci/run_ci.sh -c -b ${BUILDKITE_BRANCH} -r origin \
38+
-m ${JOB_NUM} -M ${BUILDKITE_PARALLEL_JOB_COUNT};
39+
fi
40+
fi
41+
42+
SANITY_EXIT_STATUS=$?
43+
44+
# Rename sanitycheck junit xml for use with junit-annotate-buildkite-plugin
45+
# create dummy file if sanitycheck did nothing
46+
if [ ! -f sanity-out/sanitycheck.xml ]; then
47+
touch sanity-out/sanitycheck.xml
48+
fi
49+
mv sanity-out/sanitycheck.xml sanitycheck-${BUILDKITE_JOB_ID}.xml
50+
buildkite-agent artifact upload sanitycheck-${BUILDKITE_JOB_ID}.xml
51+
52+
# ccache stats
53+
echo "--- ccache stats at finish"
54+
ccache -s
55+
56+
# disk usage
57+
echo "--- disk usage at finish"
58+
df -h
59+
60+
exit ${SANITY_EXIT_STATUS}

‎.checkpatch.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
--ignore SPLIT_STRING
1111
--ignore VOLATILE
1212
--ignore CONFIG_EXPERIMENTAL
13+
--ignore PREFER_KERNEL_TYPES
1314
--ignore AVOID_EXTERNS
1415
--ignore NETWORKING_BLOCK_COMMENT_STYLE
1516
--ignore DATE_TIME
1617
--ignore MINMAX
1718
--ignore CONST_STRUCT
1819
--ignore FILE_PATH_CHANGES
1920
--ignore SPDX_LICENSE_TAG
21+
--ignore C99_COMMENT_TOLERANCE
2022
--exclude ext

‎.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,11 @@ indent_style = tab
6565
[*.{dts,dtsi,overlay}]
6666
indent_style = tab
6767
indent_size = 8
68+
69+
# Git commit messages
70+
[COMMIT_EDITMSG]
71+
max_line_length = 72
72+
73+
# Kconfig
74+
[Kconfig*]
75+
indent_style=tab

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ A clear and concise description of what you expected to happen.
2424
**Impact**
2525
What impact does this issue have on your progress (e.g., annoyance, showstopper)
2626

27-
**Screenshots or console output**
28-
If applicable, add a screenshot (drag-and-drop an image), or console logs
29-
(cut-and-paste text and put a code fence (\`\`\`) before and after, to help
30-
explain the issue.
27+
**Logs and console output**
28+
If applicable, add console logs or other types of debug information
29+
e.g Wireshark capture or Logic analyzer capture (upload in zip archive).
30+
copy-and-paste text and put a code fence (\`\`\`) before and after, to help
31+
explain the issue. (if unable to obtain text log, add a screenshot)
3132

3233
**Environment (please complete the following information):**
3334
- OS: (e.g. Linux, MacOS, Windows)

‎.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Enhancement
33
about: Suggest enhancements to existing features
44
title: ''
5-
labels: enhancement
5+
labels: Enhancement
66
assignees: ''
77

88
---

‎.github/ISSUE_TEMPLATE/hardware_support.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Hardware Support
3+
about: Suggest adding hardware support
4+
title: ''
5+
labels: Hardware Support
6+
assignees: ''
7+
8+
---
9+
10+
**Is this request related to a missing driver support for a particular hardware platform, SoC or board? Please describe.**
11+
Describe in details the hardware support being requested and why this support benefits Zephyr.
12+
13+
**Describe why you are asking for this support?**
14+
Describe why you are asking for this support instead of contributing it directly to the tree
15+
16+
If this is a new board or SoC, please state whether you are willing to maintain the Zephyr support for it if it is included in the main tree
17+
18+
**Additional context**
19+
Add any other context or graphics (drag-and-drop an image) about the hardware here.

‎.github/ISSUE_TEMPLATE/rfc---proposal.md renamed to ‎.github/ISSUE_TEMPLATE/rfc-proposal.md

File renamed without changes.

‎.github/labeler.yml

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
"area: Modem":
2+
- "drivers/modem/**/*"
3+
"area: PWM":
4+
- "drivers/pwm/**/*"
5+
"area: Watchdog":
6+
- "drivers/watchdog/**/*"
7+
"area: Sensors":
8+
- "drivers/sensors/**/*"
9+
"area: ADC":
10+
- "drivers/adc/**/*"
11+
"area: Counter":
12+
- "drivers/counter/**/*"
13+
"area: CAN":
14+
- "include/drivers/can.h"
15+
- "include/canbus/*/**"
16+
- "drivers/can/**/*"
17+
- "subsys/canbus/*/**"
18+
"area: EEPROM":
19+
- "include/drivers/eeprom.h"
20+
- "drivers/eeprom/**/*"
21+
"area: Timer":
22+
- "drivers/timer/**/*"
23+
"area: I2S":
24+
- "drivers/i2s/**/*"
25+
"area: C Library":
26+
- "lib/libc/**/*"
27+
"area: Devicetree":
28+
- "dts/**/*"
29+
- "!dts/bindings/**/*"
30+
- "**/*.dts"
31+
- "**/*.dtsi"
32+
- "include/devicetree.h"
33+
- "include/devicetree/*"
34+
- "doc/guides/dts/**/*"
35+
"area: Devicetree Binding":
36+
- "include/dt-bindings/**/*"
37+
- "dts/bindings/**/*"
38+
"area: Devicetree Tooling":
39+
- "scripts/dts/**/*"
40+
"area: I2C":
41+
- "drivers/i2c/**/*"
42+
"area: SPI":
43+
- "drivers/spi/**/*"
44+
"area: Boards":
45+
- "boards/**/*"
46+
"area: POSIX":
47+
- "lib/posix/**/*"
48+
"area: native port":
49+
- "arch/posix/**/*"
50+
- "include/arch/posix/**/*"
51+
- "soc/posix/**/*"
52+
- "**/*native_posix*"
53+
"area: X86":
54+
- "arch/x86/**/*"
55+
- "include/arch/x86/**/*"
56+
"area: ARM":
57+
- "arch/arm/**/*"
58+
- "include/arch/arm/**/*"
59+
"area: NIOS2":
60+
- "arch/nios2/**/*"
61+
- "include/arch/nios2/**/*"
62+
"area: Xtensa":
63+
- "arch/xtensa/**/*"
64+
- "include/arch/xtensa/**/*"
65+
"area: RISCv32/64":
66+
- "arch/risv/**/*"
67+
- "include/arch/riscv/**/*"
68+
"area: ARC":
69+
- "arch/arc/**/*"
70+
- "include/arch/arc/**/*"
71+
"area: Networking":
72+
- "subsys/net/**/*"
73+
- "samples/net/**/*"
74+
- "tests/net/**/*"
75+
- "include/net/**/*"
76+
- "include/drivers/ieee802154/**/*"
77+
- "drivers/ethernet/**/*"
78+
- "drivers/ieee802154/**/*"
79+
- "drivers/wifi/**/*"
80+
- "drivers/ptp_clock/**/*"
81+
- "drivers/net/**/*"
82+
"area: Logging":
83+
- "subsys/logging/**/*"
84+
"area: Shell":
85+
- "subsys/shell/**/*"
86+
"area: Console":
87+
- "subsys/console/**/*"
88+
"area: Test Framework":
89+
- "subsys/testsuite/**/*"
90+
"area: Settings":
91+
- "subsys/settings/**/*"
92+
"area: File System":
93+
- "subsys/fs/**/*"
94+
"area: Storage":
95+
- "subsys/storage/**/*"
96+
"area: Bluetooth":
97+
- "subsys/bluetooth/**/*"
98+
- "**/*bluetooth*"
99+
"area: Bluetooth Mesh":
100+
- "subsys/bluetooth/mesh/**/*"
101+
"area: API":
102+
- "include/**/*"
103+
"area: Samples":
104+
- "samples/**/*"
105+
"area: Tests":
106+
- "tests/**/*"
107+
"area: Kernel":
108+
- "kernel/**/*"
109+
- "tests/kernel/**/*"
110+
"area: Documentation":
111+
- "**/*.rst"
112+
- "**/*.md"
113+
"area: Build System":
114+
- "cmake/**/*"
115+
- "CmakeLists.txt"
116+
"area: Kconfig":
117+
- "scripts/kconfig/**/*"
118+
- "Kconfig"
119+
- "Kconfig.zephyr"
120+
"area: Sanitycheck":
121+
- "scripts/sanitycheck"
122+
- "scripts/sanity_chk/**/*"
123+
"area: Modules":
124+
- "west.yml"
125+
- "modules/**/*"
126+
"area: Shields":
127+
- "boards/shields/**"
128+
- "samples/shields/**"
129+
"platform: NXP":
130+
- "boards/arm/frdm*/**"
131+
- "boards/arm/hexiwear*/**"
132+
- "boards/arm/lpcxpresso*/**"
133+
- "boards/arm/*imx*/**"
134+
- "drivers/**/*imx*"
135+
- "drivers/**/*mcux*"
136+
- "dts/arm/nxp/*/*"
137+
- "dts/bindings/**/nxp*"
138+
- "soc/arm/nxp*/**"
139+
"platform: STM32":
140+
- "boards/arm/nucleo_*/**"
141+
- "boards/arm/*stm32*/**"
142+
- "drivers/**/*stm32*"
143+
- "dts/arm/st/*/*"
144+
- "include/drivers/*/*stm32*"
145+
- "soc/arm/st_stm32/**"
146+
"platform: SiLabs":
147+
- "boards/arm/efr32_*/**/*"
148+
- "boards/arm/efm32_*/**/*"
149+
- "drivers/**/*gecko*"
150+
- "dts/arm/silabs/**/*"
151+
- "dts/bindings/**/silabs,gecko*"
152+
- "soc/arm/silabs_exx32/**/*"

0 commit comments

Comments
 (0)