Skip to content

Commit abb5b12

Browse files
authored
Merge branch 'master' into feature/f412xg-crash-ram
2 parents 8c9d38f + ad40b1b commit abb5b12

File tree

6,105 files changed

+454268
-76538
lines changed

Some content is hidden

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

6,105 files changed

+454268
-76538
lines changed

.astyleignore

Lines changed: 0 additions & 29 deletions
This file was deleted.

.codecheckignore

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
^BUILD
2+
^cmsis
3+
^connectivity/drivers/ble
4+
^connectivity/FEATURE_BLE
5+
^connectivity/libraries/mbed-coap
6+
^connectivity/libraries/ppp
7+
^connectivity/drivers/emac
8+
^connectivity/drivers/mbedtls
9+
^connectivity/mbedtls
10+
^features/frameworks
11+
^connectivity/lwipstack/lwip
12+
^connectivity/lwipstack/lwip-sys
13+
^connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
14+
^connectivity/nanostack/sal-stack-nanostack-eventloop
15+
^storage/filesystem/fat/ChaN
16+
^storage/filesystem/littlefs/littlefs/
17+
^storage/filesystem/littlefsv2/littlefs/
18+
^features/unsupported/
19+
^hal/storage_abstraction
20+
^hal/tests/TESTS/mbed_hal/trng/pithy
21+
^hal/tests/TESTS/mbed_hal/trng/pithy
22+
^platform/cxxsupport
23+
^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
24+
^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
25+
^platform/mbed-trace
26+
^platform/randlib
27+
^platform/tests/UNITTESTS
28+
^events/tests/UNITTESTS
29+
^rtos/source/TARGET_CORTEX/rtx4
30+
^rtos/source/TARGET_CORTEX/rtx5
31+
^targets
32+
^tools
33+
^UNITTESTS
34+
^storage/blockdevice/tests/UNITTESTS
35+
^storage/kvstore/tests/UNITTESTS
36+
^drivers/tests/UNITTESTS

.travis.yml

Lines changed: 76 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ dist: xenial
2121

2222
env:
2323
global:
24-
- deps_url="https://mbed-os-ci.s3-eu-west-1.amazonaws.com/jenkins-ci/deps"
24+
- deps_url="https://mbed-os-ci-public.s3-eu-west-1.amazonaws.com/jenkins-ci/deps"
2525
- deps_dir="${HOME}/.cache/deps"
2626

2727
cache:
2828
pip: true
2929
directories:
3030
- ${HOME}/.cache/deps
31+
- ${HOME}/.ccache
3132

3233

3334
before_install:
@@ -43,7 +44,7 @@ after_failure:
4344

4445
matrix:
4546
include:
46-
47+
4748
### Basic Tests ###
4849
- &basic-vm
4950
stage: "Basic"
@@ -58,35 +59,55 @@ matrix:
5859
language: python
5960
python: 3.6.8 # scancode-toolkit v3.1.1 requires v3.6.8
6061
install:
62+
# workaround for https://github.com/ARMmbed/mbed-os/issues/13322
63+
- pip install pdfminer.six==20200517
6164
- pip install scancode-toolkit==3.1.1
6265
before_script:
6366
- mkdir -p SCANCODE
67+
- mkdir -p SCANCODE_NEW_FILES
6468
# Fetch remaining information needed for branch comparison
6569
- git fetch --all --unshallow --tags
6670
- git fetch origin "${TRAVIS_BRANCH}"
6771
script:
6872
# scancode does not support list of files, only one file or directory
6973
# we use SCANCODE directory for all changed files (their copies with full tree)
7074
- >-
71-
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
75+
git diff --name-only --diff-filter=ad FETCH_HEAD..HEAD \
7276
| ( grep '.\(c\|cpp\|h\|hpp\|py\)$' || true ) \
7377
| ( grep -v '^tools/test/toolchains/api_test.py' || true ) \
7478
| while read file; do cp --parents "${file}" SCANCODE; done
7579
- scancode -l --json-pp scancode.json SCANCODE
7680
- python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json || true
81+
# run the same but for new files. All new files must have SPDX
82+
- >-
83+
git diff --name-only --diff-filter=A FETCH_HEAD..HEAD \
84+
| ( grep '.\(c\|cpp\|h\|hpp\|py\)$' || true ) \
85+
| ( grep -v '^tools/test/toolchains/api_test.py' || true ) \
86+
| while read file; do cp --parents "${file}" SCANCODE_NEW_FILES; done
87+
- scancode -l --json-pp scancode_new_files.json SCANCODE_NEW_FILES
88+
- python ./tools/test/travis-ci/scancode-evaluate.py -f scancode_new_files.json || true
7789
after_success:
7890
- python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json
7991
- cat scancode-evaluate.log
8092
- COUNT=$(cat scancode-evaluate.log | grep 'File:' | wc -l)
93+
- python ./tools/test/travis-ci/scancode-evaluate.py -f scancode_new_files.json
94+
- cat scancode-evaluate.log
95+
- COUNT_NEW_FILES=$(cat scancode-evaluate.log | grep 'File:' | wc -l)
8196
- |
82-
if [ $COUNT == 0 ]; then
97+
if [ $COUNT == 0 ] && [ $COUNT_NEW_FILES == 0 ]; then
8398
echo "License check OK";
8499
STATUSM="All licenses OK";
85100
set_status "success" "$STATUSM";
101+
elif [ $COUNT_NEW_FILES != 0 ]; then
102+
echo "License check failed, files with the license issues found";
103+
STATUSM="Needs review, license issues in modified files: ${COUNT}, new files: ${COUNT_NEW_FILES}";
104+
set_status "failure" "$STATUSM";
105+
false;
86106
else
87-
echo "License check failed, please review license issues found";
107+
echo "License check failed, please review license issues found in modified files";
88108
STATUSM="Needs review, ${COUNT} license issues found";
89109
set_status "success" "$STATUSM";
110+
false;
90111
fi
91112
92113
@@ -98,7 +119,8 @@ matrix:
98119
- |
99120
! git grep '^#include\s["'"']mbed.h['"'"]$' -- '*.c' '*.h' '*.cpp' '*.hpp' \
100121
':!*platform_mbed.h' ':!*TESTS/*' ':!TEST_APPS/' ':!UNITTESTS/' \
101-
':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*'
122+
':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*' \
123+
':!*events/tests/*' ':!*drivers/tests/*'
102124
103125
104126
### Docs Tests ###
@@ -108,7 +130,7 @@ matrix:
108130
env: NAME=astyle
109131
install:
110132
- >-
111-
curl -L0 https://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
133+
curl -L0 https://mbed-os-ci-public.s3-eu-west-1.amazonaws.com/jenkins-ci/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
112134
mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
113135
cd BUILD/astyle/build/gcc;
114136
make;
@@ -122,21 +144,22 @@ matrix:
122144
- >-
123145
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
124146
| ( grep '.*\.\(c\|cpp\|h\|hpp\)$' || true ) \
125-
| ( grep -v -f .astyleignore || true ) \
147+
| ( grep -v -f .codecheckignore || true ) \
126148
| while read file; do astyle -n --options=.astylerc "${file}"; done
127149
- git diff --exit-code --diff-filter=d --color
128-
150+
129151
- <<: *docs-vm
130152
name: "spellcheck"
131153
env: NAME=doxy-spellcheck
132154
install:
133155
- source_pkg aspell
134156
script:
135-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh drivers
136-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform
137-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh events
138-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos
139-
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh features/netsocket
157+
# TODO: run checks on all directories once all mispellings are fixed
158+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh drivers .codecheckignore
159+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform .codecheckignore
160+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh events .codecheckignore
161+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos .codecheckignore
162+
- ./tools/test/travis-ci/doxy-spellchecker/spell.sh connectivity/netsocket .codecheckignore
140163

141164
- <<: *docs-vm
142165
name: "doxygen"
@@ -152,6 +175,7 @@ matrix:
152175
make;
153176
sudo make install)
154177
# Create BUILD directory for tests
178+
- ccache -s
155179
- mkdir BUILD
156180
script:
157181
# Assert that the Doxygen build produced no warnings.
@@ -167,13 +191,41 @@ matrix:
167191
find "(" -name "*.a" -or -name "*.ar" ")" -and -not -name "lib*" |
168192
tee BUILD/badlibs |
169193
sed -e "s/^/Bad library name found: /" && [ ! -s BUILD/badlibs ]
170-
# Assert that all assebler files are named correctly
194+
# Assert that all assembler files are named correctly
171195
# The strange command below asserts that there are exactly 0 libraries
172196
# that do end with .s
173197
- >
174198
find -name "*.s" | tee BUILD/badasm |
175199
sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ]
176200
201+
- <<: *docs-vm
202+
name: "Frozen tools check"
203+
env: NAME=frozen_tools_check
204+
script:
205+
# Reject any changes to tools that would require a re-release of the
206+
# tools for the online compiler.
207+
- >-
208+
frozen_files=`\
209+
git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
210+
| egrep \
211+
-e "^tools/build_api*" \
212+
-e "^tools/config*" \
213+
-e "^tools/export*" \
214+
-e "^tools/notifier*" \
215+
-e "^tools/paths*" \
216+
-e "^tools/resources*" \
217+
-e "^tools/targets*" \
218+
-e "^tools/toolchains*" \
219+
-e "^tools/utils*" \
220+
-e "^$"`
221+
if [ -z "$frozen_files" ]; then
222+
echo "Success!";
223+
else
224+
echo -e "Failure: Frozen files were modified\n$frozen_files";
225+
echo -e "Please see https://os.mbed.com/blog/entry/Introducing-the-new-Mbed-Tools/" \
226+
"\nfor why we've frozen the legacy tools.";
227+
false;
228+
fi
177229
178230
### Python Tests ###
179231
- &pytools-vm
@@ -222,7 +274,7 @@ matrix:
222274
env: NAME=tools-py3.7
223275
python: 3.7
224276

225-
277+
226278
### Extended Tests ###
227279
- &extended-vm
228280
stage: "Extended"
@@ -246,14 +298,13 @@ matrix:
246298
# Check that example compiles without rtos
247299
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
248300
- |
249-
rm -r rtos/source/TARGET_CORTEX drivers/source/usb features/cellular features/netsocket features/nanostack \
250-
features/lwipstack features/frameworks/greentea-client \
251-
features/frameworks/utest features/frameworks/unity components BUILD
252-
- python tools/make.py -t GCC_ARM -m NUCLEO_F412ZG --source=. --build=BUILD/NUCLEO_F412ZG/GCC_ARM -j0
253-
# Run local equeue tests
254-
- make -C ${EVENTS}/source test
301+
rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
302+
connectivity/libraries/ppp connectivity/netsocket connectivity/nanostack connectivity/lwipstack features/frameworks/greentea-client \
303+
features/frameworks/utest features/frameworks/unity BUILD
304+
- python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
255305
# Run profiling tests
256-
- make -C ${EVENTS}/source prof | tee prof
306+
- make -C ${EVENTS}/tests/unit prof | tee prof
307+
- ccache -s
257308
after_success:
258309
# Update status, comparing with master if possible.
259310
- |
@@ -271,7 +322,7 @@ matrix:
271322
272323
- <<: *extended-vm
273324
name: "littlefs"
274-
env: NAME=littlefs LITTLEFS=features/storage/filesystem/littlefs
325+
env: NAME=littlefs LITTLEFS=storage/filesystem/littlefs
275326
install:
276327
# Install gcc
277328
- source_pkg gcc
@@ -327,6 +378,7 @@ matrix:
327378
OBJ="$(ls lfs*.o | tr '\n' ' ')"
328379
CFLAGS+="-DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR"
329380
| tee sizes
381+
- ccache -s
330382
after_success:
331383
# Update status, comparing with master if possible.
332384
- |

DOXYGEN_FRONTPAGE.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# mbed OS code base
1+
# Mbed OS code base
22

3-
This is the code documentation for mbed OS.
3+
This is the code documentation for Mbed OS.
44

5-
For more information, please see:
6-
7-
* [The mbed OS API References](https://docs.mbed.com/docs/mbed-os-api-reference/)
8-
* [The mbed OS Handbook](https://docs.mbed.com/docs/mbed-os-handbook/)
5+
For more information, please see [the Mbed OS API references](https://os.mbed.com/docs/mbed-os/latest/apis/index.html) and [the full list of tutorials and examples](https://os.mbed.com/docs/mbed-os/latest/tutorials/index.html).

LICENSE.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@ as can be found in: LICENSE-apache-2.0.txt
44
Folders containing files under different permissive license than Apache 2.0 are listed below. Each folder should contain its own README file with license specified for its files. The original license text is included in those source files.
55

66
- [cmsis](./cmsis) - MIT, BSD-3-Clause
7-
- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
7+
- [connectivity/drivers/802.15.4_RF/mcr20a-rf-driver](./connectivity/drivers/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
8+
- [connectivity/drivers/emac](./connectivity/drivers/emac) - BSD-style
89
- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License
910
- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL
1011
- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style
1112
- [features/FEATURE_PSA/FEATURE_TFM](./features/FEATURE_PSA/FEATURE_TFM) - BSD-3-Clause
1213
- [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation) - BSD-3-Clause
1314
- [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause
14-
- [features/lorawan](./features/lorawan) - Revised BSD
15-
- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
16-
- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
17-
- [features/storage](./features/storage) - BSD-style, MIT
18-
- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
15+
- [connectivity/lorawan](./connectivity/lorawan) - Revised BSD
16+
- [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style
17+
- [connectivity/nanostack/sal-stack-nanostack](./connectivity/nanostack/sal-stack-nanostack) - BSD-3-Clause
1918
- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
2019
- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
20+
- [storage/blockdevice](./storage/blockdevice) - Apache 2.0, MIT
21+
- [storage/filesystem/littlefs](.storage/filesystem/littlefs) - [BSD-3-Clause](https://github.com/ARMmbed/littlefs/blob/master/LICENSE.md)
22+
- [storage/filesystem/fat/ChaN](.storage/filesystem/fat/ChaN) - BSD-style, 1 clause, [Copyright ChaN](http://www.elm-chan.org/fsw/ff/doc/appnote.html)
2123
- [rtos](./rtos) - MIT
2224
- [drivers](./drivers) - MIT
2325
- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause

TESTS/configs/baremetal.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
"psa",
88
"psa-services",
99
"mbedtls",
10+
"mbedtls-stm",
11+
"mbedtls-nuvoton",
1012
"psa-compliance-framework",
1113
"filesystem",
1214
"littlefs",
1315
"littlefs2",
14-
"mbed-trace",
1516
"device_key",
1617
"storage_tdb_internal",
1718
"storage_filesystem",
@@ -22,15 +23,12 @@
2223
"network-emac",
2324
"flashiap-block-device",
2425
"system-storage",
25-
"filesystemstore",
2626
"SecureStore",
2727
"storage",
28-
"kv-map",
28+
"kv-global-api",
2929
"direct-access-devicekey",
30-
"tdbstore",
3130
"kv-config",
3231
"events",
33-
"kv-global-api",
3432
"sd",
3533
"qspif",
3634
"spif-driver",
@@ -39,7 +37,6 @@
3937
],
4038
"target_overrides": {
4139
"*": {
42-
"mbed-trace.fea-ipv6": false,
4340
"target.c_lib": "small"
4441
}
4542
}

0 commit comments

Comments
 (0)