Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
448 commits
Select commit Hold shift + click to select a range
683d6aa
Revert "[nrf fromtree] drivers: serial: nrfx_uarte: Fix power managem…
anangl Mar 4, 2021
b79d9f6
Revert "[nrf fromlist] drivers/flash/soc_flash_nrf: suspend POFWARN b…
anangl Mar 4, 2021
dc37827
Revert "[nrf fromlist] drivers/flash/soc_flash_nrf: support in-progre…
anangl Mar 4, 2021
eac9a97
Revert "[nrf fromlist] Kconfig.tfm: Add TFM_CMAKE_BUILD_TYPE config"
anangl Mar 4, 2021
77d1927
Revert "[nrf fromlist] Kconfig.tfm: Add TFM_MCUBOOT_IMAGE_NUMBER config"
anangl Mar 4, 2021
870cf1c
Revert "[nrf fromlist] samples: 802154_rpmsg: Add SL fault handler"
anangl Mar 4, 2021
ceaa486
Revert "[nrf fromlist] samples: 802154_rpmsg: Remove redundant kconfig"
anangl Mar 4, 2021
83ef317
Revert "[nrf fromlist] west.yml: Update hal_nordic revision"
anangl Mar 4, 2021
99722ff
Revert "[nrf fromtree] drivers: sensor: adxl362: Fix unused variable …
anangl Mar 4, 2021
96a050f
Revert "[nrf fromtree]: settings: Handle unhandled error"
anangl Mar 4, 2021
81e83ce
Revert "[nrf fromtree] cmake: modules: remove Zephyr module duplicate…
anangl Mar 4, 2021
dd4b506
Revert "[nrf fromtree] api: remove unnecessary parentheses in DEVICE_…
anangl Mar 4, 2021
2541a50
Revert "[nrf noup] drivers: ieee802154: Fix build error on nRF5340"
anangl Mar 4, 2021
8518701
Revert "[nrf fromlist] drivers: ieee802154: Enable CSMA-CA on seriali…
anangl Mar 4, 2021
d7e5bf4
Revert "[nrf fromlist] modules: Change serialized radio init priority"
anangl Mar 4, 2021
0b9712b
Revert "[nrf fromlist] west.yml: Update hal_nordic revision"
anangl Mar 4, 2021
e963e9d
Revert "[nrf fromlist] nrfx_glue: Reserve PPI/DPPI used by 802.15.4 d…
anangl Mar 4, 2021
ad92d77
Revert "[nrf fromtree] drivers: gpio_nrfx: Allocate GPIOTE channels w…
anangl Mar 4, 2021
14a6c8f
Revert "[nrf fromtree] Bluetooth: host: Fail pairing with identical p…
anangl Mar 4, 2021
0b57258
Revert "[nrf noup] ci: Compliance workflow downstream tweaks"
anangl Mar 4, 2021
eb9c4e3
Revert "[nrf fromtree] ci: compliance: fail on errors"
anangl Mar 4, 2021
004a992
Revert "[nrf fromtree] net: openthread: add SRP Kconfig options"
anangl Mar 4, 2021
77e6222
Revert "[nrf fromtree] net: openthread: configure required masterkey"
anangl Mar 4, 2021
da7f708
Revert "[nrf fromtree] manifest: openthread update with latest upmerge"
anangl Mar 4, 2021
acd12d3
Revert "[nrf fromtree] Revert "boards: arm: nrf5340: default to build…
anangl Mar 4, 2021
a81a6a3
Revert "[nrf fromtree] boards: Fix usage of srec_cat -> ${SREC_CAT} i…
anangl Mar 4, 2021
65a340c
Revert "[nrf fromlist] boards: Clean up signing code for nrf53 and nr…
anangl Mar 4, 2021
216daf9
Revert "[nrf fromtree]: scripts: modules: support west group feature"
anangl Mar 4, 2021
0c2722a
Revert "[nrf toup] drivers: clock_control: nrf: Add assert on unexpec…
anangl Mar 5, 2021
96a80fc
Revert "[nrf toup] clock_control: nrf: modify Kconfig accuracy"
anangl Mar 5, 2021
1709ad0
Revert "[nrf toup] clock_control: nrf: Change CLOCK_CONTROL_NRF_FORCE…
anangl Mar 5, 2021
3127bfb
Revert "[nrf fromtree] drivers: clock_control: Clock calibtration wit…
anangl Mar 4, 2021
e5a129f
Revert "[nrf fromtree] drivers: clock_control: Clock calibration depe…
anangl Mar 4, 2021
816bd59
Revert "[nrf fromtree] doc: supporting module Kconfig code in module …
anangl Mar 4, 2021
eccf469
Revert "[nrf fromtree] samples/subsys/mcumgr/smp_svr: disable log ove…
anangl Mar 4, 2021
07aea52
Revert "[nrf fromtree] include: Add missing extern "C" to spinlock.h"
anangl Mar 4, 2021
c85a142
Revert "[nrf fromtree] scripts: compliance.py updated to support Kcon…
anangl Mar 4, 2021
bda0736
Revert "[nrf fromtree] west.yml: Update hal_nordic revision"
anangl Mar 4, 2021
bccceb4
Revert "[nrf fromtree] Bluetooth: controller: radio: Fix compilation …
anangl Mar 4, 2021
4b0ac82
Revert "[nrf fromtree] include: power: include missing header for slist"
anangl Mar 4, 2021
c04812c
Revert "[nrf fromtree] sensor: nrf5: temp: Allow alternative temp dri…
anangl Mar 4, 2021
4e924b0
Revert "[nrf temphack] Revert "modules: tfm: cleanup redundant Kconfi…
anangl Mar 4, 2021
a7519f3
Revert "[nrf temphack] boards: arm: nrf5340: disable TF-M on non-secu…
anangl Mar 4, 2021
8d4f020
Revert "[nrf temphack] runners: nrfjprog: hackaround NCSDK-7327"
anangl Mar 10, 2021
928b61c
Revert "[nrf noup] drivers: ieee802154: Use nRF Secure Services to re…
anangl Mar 4, 2021
e7e27ec
Revert "[nrf noup] tree-wide: support NCS Partition Manager (PM) defi…
anangl Mar 4, 2021
e417e6f
Revert "[nrf noup] include: net: add NCS extensions"
anangl Mar 4, 2021
3a6c360
Revert "[nrf noup] ci: Add Jenkins-based CI for zephyr"
anangl Mar 4, 2021
864631c
[nrf mergeup] Merge upstream up to commit 7074254937ae20f90174309b930ed
anangl Mar 5, 2021
fdb1a78
[nrf noup] ci: Add Jenkins-based CI for zephyr
thst-nordic Nov 30, 2018
611475c
[nrf noup] include: net: add NCS extensions
Rallare Oct 1, 2018
71911aa
[nrf noup] tree-wide: support NCS Partition Manager (PM) definitions
sigvartmh May 3, 2019
c676aab
[nrf noup] drivers: ieee802154: Use nRF Secure Services to read EUI64
czeslawmakarski Nov 30, 2020
4791346
[nrf temphack] runners: nrfjprog: hackaround NCSDK-7327
mbolivar-nordic Dec 3, 2020
54f8fe7
[nrf temphack] boards: arm: nrf5340: disable TF-M on non-secure builds
de-nordic Jan 5, 2021
13be9e0
[nrf temphack] Revert "modules: tfm: cleanup redundant Kconfig...
hakonfam Jan 6, 2021
3092183
[nrf noup] ci: Compliance workflow downstream tweaks
carlescufi Feb 1, 2021
8fb0ddb
[nrf temphack] modules: tfm: Change name of lib after TFM upmerge
anangl Mar 5, 2021
c11181d
[nrf temphack] modules: tfm: Pass ZEPHYR_BASE to TFM build
anangl Mar 5, 2021
9f56e26
[nrf temphack] samples: tfm_ipc: Disable AUDIT_LOG tests
oyvindronningstad Mar 12, 2021
ad2dbe9
[nrf fromlist] log: Fix defining CONFIG_LOG_STRDUP_MAX_STRING
MarekPieta Mar 11, 2021
7495dfa
[nrf fromtree] Bluetooth: HCI: Add option CONFIG_BT_HCI_ACL_DATA_SIZE
jostn Dec 14, 2020
30414ce
[nrf fromlist] boards: nrf9160dk: Switch to sda-gpios, scl-gpios DT ...
anangl Mar 15, 2021
d09c64a
[nrf fromlist] cmake: make WATCH an optional argument to
tejlmand Mar 16, 2021
5c46f81
[nrf fromlist] cmake: zephyr_file() now accepts BOARD and BOARD_REVISION
tejlmand Mar 16, 2021
ad0e35d
[nrf fromtree] scripts: updated gen_handles.py to take Zephyr base as
tejlmand Mar 12, 2021
f21188c
[nrf fromlist] runners: remove dependencies from runners
tejlmand Mar 17, 2021
662c9c0
[nrf fromlist] tests: bluetooth: tester: Remove assignment to ...
anangl Mar 18, 2021
54dea0b
[nrf fromtree] west.yml: Update hal_nordic revision
nika-nordic Mar 9, 2021
c52737e
Revert "[nrf fromlist] runners: remove dependencies from runners"
tejlmand Mar 26, 2021
e6d5acc
[nrf fromlist] runners: remove dependencies from runners
tejlmand Mar 17, 2021
82b6aab
[nrf fromtree] cmake: allow binary directory to be specified
e-rk Mar 12, 2021
21a4151
[nrf fromtree] modules: hal_nordic: Remove default from SL type choice
e-rk Mar 15, 2021
171d4fd
[nrf fromtree] modules: hal_nordic: add new nrf-802154 glue cmake
e-rk Mar 11, 2021
d5fe6f2
[nrf fromtree] modules: hal_nordic: change the SL type prompt
e-rk Mar 26, 2021
c767fc2
[nrf fromtree] doc: pin sphinx_rtd_theme version
gmarull Apr 7, 2021
7c7c4f7
[nrf fromtree] doc: flexibilize sphinx-rtd-theme allowed versions
gmarull Apr 7, 2021
5dba9cb
[nrf fromtree] doc: remove docutils dependency
gmarull Apr 8, 2021
ca2b2af
[nrf fromtree] doc: allow up to breathe 4.28.x
gmarull Apr 9, 2021
a9d3aef
[nrf fromtree] modules: hal_nordic: nrf_802154: Fix RADIO IRQ ...
Mar 30, 2021
6a1d340
[nrf noup]: Bluetooth: samples: Add dynamic power control
ibaz-nordic Apr 7, 2021
027e622
[nrf fromtree] net: ppp: dialup enablers
jhirsi Mar 25, 2021
b0fc480
[nrf fromtree] net: socket: packet: using pckt sckt for passing the P…
jhirsi Mar 25, 2021
a9423cb
[nrf fromtree] Bluetooth: controller: Fix flash driver sync regression
cvinayak Mar 29, 2021
5d739ce
Revert "[nrf fromtree] Bluetooth: controller: Fix flash driver sync r…
trond-snekvik Apr 20, 2021
c1bcf55
Revert "[nrf fromtree] net: socket: packet: using pckt sckt for passi…
trond-snekvik Apr 20, 2021
c6a384c
Revert "[nrf fromtree] net: ppp: dialup enablers"
trond-snekvik Apr 20, 2021
11fc386
Revert "[nrf noup]: Bluetooth: samples: Add dynamic power control"
trond-snekvik Apr 20, 2021
58a1998
Revert "[nrf fromtree] modules: hal_nordic: nrf_802154: Fix RADIO IRQ…
trond-snekvik Apr 20, 2021
3429117
Revert "[nrf fromtree] doc: allow up to breathe 4.28.x"
trond-snekvik Apr 20, 2021
f059aef
Revert "[nrf fromtree] doc: remove docutils dependency"
trond-snekvik Apr 20, 2021
1b34fd4
Revert "[nrf fromtree] doc: flexibilize sphinx-rtd-theme allowed vers…
trond-snekvik Apr 20, 2021
31b3a2a
Revert "[nrf fromtree] doc: pin sphinx_rtd_theme version"
trond-snekvik Apr 20, 2021
7ca0c4d
Revert "[nrf fromtree] modules: hal_nordic: change the SL type prompt"
trond-snekvik Apr 20, 2021
faadac6
Revert "[nrf fromtree] modules: hal_nordic: add new nrf-802154 glue c…
trond-snekvik Apr 20, 2021
3a51d41
Revert "[nrf fromtree] modules: hal_nordic: Remove default from SL ty…
trond-snekvik Apr 20, 2021
0027b8d
Revert "[nrf fromtree] cmake: allow binary directory to be specified"
trond-snekvik Apr 20, 2021
33507fc
Revert "[nrf fromlist] runners: remove dependencies from runners"
trond-snekvik Apr 20, 2021
16a4d8c
Revert "[nrf fromtree] west.yml: Update hal_nordic revision"
trond-snekvik Apr 20, 2021
c61a76c
Revert "[nrf fromlist] tests: bluetooth: tester: Remove assignment to…
trond-snekvik Apr 21, 2021
170bc69
Revert "[nrf fromtree] scripts: updated gen_handles.py to take Zephyr…
trond-snekvik Apr 21, 2021
6c7f25d
Revert "[nrf fromlist] cmake: zephyr_file() now accepts BOARD and BOA…
trond-snekvik Apr 21, 2021
b6c60f2
Revert "[nrf fromlist] cmake: make WATCH an optional argument to"
trond-snekvik Apr 21, 2021
07f840f
Revert "[nrf fromlist] boards: nrf9160dk: Switch to sda-gpios, scl-gp…
trond-snekvik Apr 21, 2021
c4c2b28
Revert "[nrf fromtree] Bluetooth: HCI: Add option CONFIG_BT_HCI_ACL_D…
trond-snekvik Apr 20, 2021
3d81a6a
Revert "[nrf fromlist] log: Fix defining CONFIG_LOG_STRDUP_MAX_STRING"
trond-snekvik Apr 20, 2021
2020494
Revert "[nrf temphack] samples: tfm_ipc: Disable AUDIT_LOG tests"
trond-snekvik Apr 20, 2021
49ae8d3
Revert "[nrf temphack] modules: tfm: Pass ZEPHYR_BASE to TFM build"
trond-snekvik Apr 21, 2021
a4ac8a5
Revert "[nrf temphack] modules: tfm: Change name of lib after TFM upm…
trond-snekvik Apr 20, 2021
50fdf55
Revert "[nrf temphack] runners: nrfjprog: hackaround NCSDK-7327"
trond-snekvik Apr 20, 2021
1a37c4e
Revert "[nrf noup] tree-wide: support NCS Partition Manager (PM) defi…
trond-snekvik Apr 20, 2021
924ebf7
Revert "[nrf noup] include: net: add NCS extensions"
trond-snekvik Apr 20, 2021
226e8bf
Revert "[nrf noup] ci: Add Jenkins-based CI for zephyr"
trond-snekvik Apr 20, 2021
76694fc
Revert "[nrf noup] doc: Share Kconfig documentation between repos"
trond-snekvik Apr 20, 2021
daf4899
[nrf mergeup] Merge upstream to commit 8e1cfe9a46844041544d1efcc55c59
trond-snekvik Apr 21, 2021
64365f8
[nrf noup] doc: Share Kconfig documentation between repos
ulfalizer Oct 8, 2019
b6f7565
[nrf noup] ci: Add Jenkins-based CI for zephyr
thst-nordic Nov 30, 2018
745826d
[nrf noup] include: net: add NCS extensions
Rallare Oct 1, 2018
c606417
[nrf noup] tree-wide: support NCS Partition Manager (PM) definitions
sigvartmh May 3, 2019
4cd290a
[nrf temphack] modules: tfm: Pass ZEPHYR_BASE to TFM build
anangl Mar 5, 2021
e1de791
[nrf noup]: Bluetooth: samples: Add dynamic power control
ibaz-nordic Apr 7, 2021
f0a5bd5
[nrf fromtree] Bluetooth: host: Fix ECC thread stack size too small
joerchan Apr 16, 2021
b988670
[nrf noup] boards: mps2_an521: Remove depenency on !OPENAMP
trond-snekvik Apr 21, 2021
2294c9a
[nrf fromtree] Bluetooth: host: Fix undefined reference to ...
joerchan Apr 22, 2021
4e5f862
[nrf fromlist] cmake: rework empty zephyr libraries handling.
tejlmand Apr 23, 2021
7a6c08f
[nrf fromtree] logging: Tweaks to speed up compilation
nordic-krch Apr 22, 2021
688e9be
[nrf fromtree] lib: gui: lvgl: Fix logging macro usage
nordic-krch Apr 22, 2021
e688c7f
[nrf fromtree] usb: dfu: convert z_timeout_end_calc to
trond-snekvik Apr 23, 2021
b3de9b0
[nrf noup] boards: don't set BUILD_WITH_TFM default for 91ns
hakonfam Apr 24, 2021
2e6cafe
[nrf fromtree] net: shell: Wrap iface_flags2str in #ifdef to
trond-snekvik Apr 24, 2021
97cb292
[nrf fromlist] logging: Macro cleanup to fix cpp warnings
nordic-krch Apr 23, 2021
466fb1f
[nrf fromlist] lib: os: cbprintf: Prevent using _Generic in C++
nordic-krch Apr 23, 2021
56088bf
[nrf fromlist] logging: Fix casting related C++ warnings
nordic-krch Apr 23, 2021
88bcfca
[nrf fromtree] twister: No skips for integration platforms in ...
PerMac Mar 30, 2021
f891e7d
[nrf fromtree] boards: thingy52_nrf52832: Update gpio-leds binding
MarekPieta Apr 20, 2021
0573b18
[nrf fromtree] drivers: led: Add LED GPIO driver
MarekPieta Apr 20, 2021
ee69258
[nrf fromtree] tests: drivers: Add LED GPIO driver to build_all
MarekPieta Apr 23, 2021
ee366e6
[nrf fromtree] kernel: fix error in synchronous work cancellation
pabigot Apr 16, 2021
bccdaf7
[nrf fromlist] Bluetooth: host: Remove comment providing false
joerchan Apr 29, 2021
90e64e4
[nrf fromlist] Bluetooth: host: Fix buffer leak trying to send when
joerchan Apr 29, 2021
e4f87fb
[nrf fromlist] Bluetooth: tester: fix bt_le_oob_set_legacy_tk excluded
joerchan Apr 30, 2021
aed01ec
[nrf fromlist] samples: boards: nrf: ieee802154: set RTC user channels
e-rk Apr 30, 2021
ced6ab4
Revert "[nrf noup] boards: mps2_an521: Remove depenency on !OPENAMP"
trond-snekvik May 4, 2021
403e821
[nrf fromtree] boards: mps2_an521: add an mps2_an521_remote target
ioannisg Apr 26, 2021
51a0cb8
[nrf fromtree] boards: mps2_an521: remove dependencies for
ioannisg Apr 26, 2021
7d9b291
[nrf fromtree] samples: openamp: use mps2_an521_remote target for
ioannisg Apr 26, 2021
352366f
[nrf fromtree] samples: rpmsg_service: use mps2_an521_remote target
ioannisg Apr 26, 2021
e711e7b
[nrf noup] codeowners: Remove .known-issues
trond-snekvik May 4, 2021
cf5367f
[nrf temphack] tests: libcxx: skip on mps2 to avoid timeout
trond-snekvik May 4, 2021
5585355
[nrf fromtree] boards: mps2_an521: remove dependencies for
ioannisg Apr 26, 2021
7de47f0
[nrf fromlist] drivers: ieee802154: Udpate nRF IEEE 802.15.4 radio dr…
Apr 21, 2021
f725ac7
[nrf noup] include: net: add AI_PDNSERV flag
lemrey Mar 10, 2021
bb144c5
[nrf fromtree] boards: nordic: Add support for Thingy:53 as ...
Mar 30, 2021
c6f9da0
[nrf fromtree] boards: nordic: cmake build warnings exception for Thi…
Mar 30, 2021
9536955
[nrf fromtree] samples: sensor: Align bmm150 sensor name
Apr 15, 2021
4d068de
[nrf fromtree] boards: thingy53_nrf5340: Add brief doc
pdunaj May 4, 2021
85b40d7
[nrf fromtree] cmake: tfm: support for custom CMake args when building
tejlmand Mar 3, 2021
c5feda0
[nrf temphack]: Adding TF-M Kconfig fragment for echo_server
frkv Apr 26, 2021
a409bc7
[nrf fromlist] net: sockets: tls: Use secure random generator from Ze…
rlubos May 11, 2021
56673cc
Revert "[nrf fromtree] cmake: tfm: support for custom CMake args when…
nvlsianpu May 12, 2021
dc3fd8e
Revert "[nrf fromtree] boards: thingy53_nrf5340: Add brief doc"
nvlsianpu May 12, 2021
8248a00
Revert "[nrf fromtree] samples: sensor: Align bmm150 sensor name"
nvlsianpu May 12, 2021
ec48a8d
Revert "[nrf fromtree] boards: nordic: cmake build warnings exception…
nvlsianpu May 12, 2021
b3fe800
Revert "[nrf fromlist] drivers: ieee802154: Udpate nRF IEEE 802.15.4 …
nvlsianpu May 12, 2021
7c5daf5
Revert "[nrf fromtree] boards: mps2_an521: add an mps2_an521_remote t…
nvlsianpu May 12, 2021
79ed16a
Revert "[nrf fromtree] tests: drivers: Add LED GPIO driver to build_all"
nvlsianpu May 12, 2021
371d2ec
Revert "[nrf fromtree] drivers: led: Add LED GPIO driver"
nvlsianpu May 12, 2021
b81d639
Revert "[nrf fromtree] boards: thingy52_nrf52832: Update gpio-leds bi…
nvlsianpu May 12, 2021
5ee8450
Revert "[nrf fromlist] logging: Fix casting related C++ warnings"
nvlsianpu May 12, 2021
2c91020
Revert "[nrf fromlist] lib: os: cbprintf: Prevent using _Generic in C++"
nvlsianpu May 12, 2021
b178f78
Revert "[nrf fromlist] logging: Macro cleanup to fix cpp warnings"
nvlsianpu May 12, 2021
7aae92b
Revert "[nrf fromtree] lib: gui: lvgl: Fix logging macro usage"
nvlsianpu May 12, 2021
31b0f92
Revert "[nrf fromtree] logging: Tweaks to speed up compilation"
nvlsianpu May 12, 2021
ef6e9cc
Revert "[nrf fromlist] cmake: rework empty zephyr libraries handling."
nvlsianpu May 12, 2021
ffb216c
Revert "[nrf fromtree] Bluetooth: host: Fix ECC thread stack size too…
nvlsianpu May 12, 2021
22d84e0
Revert "[nrf fromlist] Bluetooth: host: Fix buffer leak trying to sen…
nvlsianpu May 12, 2021
a014b88
Revert "[nrf fromtree] kernel: fix error in synchronous work cancella…
nvlsianpu May 12, 2021
1e02fab
Revert "[nrf fromtree] Bluetooth: host: Fix undefined reference to ..."
nvlsianpu May 14, 2021
b0be313
Revert "[nrf fromtree] usb: dfu: convert z_timeout_end_calc to"
nvlsianpu May 14, 2021
b0849d3
Revert "[nrf temphack] modules: tfm: Pass ZEPHYR_BASE to TFM build"
nvlsianpu May 12, 2021
4afc21f
Revert "[nrf fromtree] net: shell: Wrap iface_flags2str in #ifdef to"
nvlsianpu May 14, 2021
6285427
Revert "[nrf fromtree] twister: No skips for integration platforms in…
nvlsianpu May 14, 2021
e2cadfe
Revert "[nrf noup] doc: Share Kconfig documentation between repos"
nvlsianpu May 12, 2021
50aa15f
Revert "[nrf temphack] Revert "modules: tfm: cleanup redundant Kconfi…
nvlsianpu May 12, 2021
1ca277f
Revert "[nrf temphack] tests: libcxx: skip on mps2 to avoid timeout"
nvlsianpu May 12, 2021
8b156fb
Revert "[nrf fromlist] Bluetooth: host: Remove comment providing false"
nvlsianpu May 14, 2021
70059b6
Revert "[nrf fromlist] Bluetooth: tester: fix bt_le_oob_set_legacy_tk…
nvlsianpu May 14, 2021
17ef028
Revert "[nrf fromtree] boards: mps2_an521: remove dependencies for"
nvlsianpu May 14, 2021
333e846
Revert "[nrf fromtree] samples: openamp: use mps2_an521_remote target…
nvlsianpu May 14, 2021
29c2b00
Revert "[nrf fromtree] samples: rpmsg_service: use mps2_an521_remote …
nvlsianpu May 14, 2021
ad0154f
Revert "[nrf fromtree] boards: mps2_an521: remove dependencies for"
nvlsianpu May 14, 2021
c70be16
Revert "[nrf fromtree] boards: nordic: Add support for Thingy:53 as ..."
nvlsianpu May 14, 2021
15b773c
[nrf mergeup] Merge upstream to v2.6.0-rc1 tag
nvlsianpu May 14, 2021
b88e9b1
[nrf temphack] Revert "modules: tfm: cleanup redundant Kconfig...
hakonfam Jan 6, 2021
4a156b9
[nrf noup] doc: Share Kconfig documentation between repos
ulfalizer Oct 8, 2019
408a4c0
[nrf temphack] modules: tfm: Pass ZEPHYR_BASE to TFM build
anangl Mar 5, 2021
88a5765
[nrf fromtree] kernel: work: fix race condition with cancel before wo…
pabigot May 12, 2021
9a3b6bb
[nrf fromtree] boards: thingy53: Fix building issue with NS image.
May 19, 2021
8de6fe4
[nrf fromlist] logging: Add missing initialization of structure fields
nordic-krch May 20, 2021
4d0e578
[nrf fromlist] lib: os: cbprintf: Add missing initialization of struc…
nordic-krch May 20, 2021
0a399df
[nrf fromlist] lib: os: cbprintf: Add ARG_UNUSED to unused arguments
nordic-krch May 20, 2021
7a2d69d
[nrf fromtree] drivers: led_pwm: Update pm_control function
MarekPieta May 19, 2021
8867251
[nrf fromtree] net: tcp: Change locking order in connection establish…
jukkar May 19, 2021
4cd0487
[nrf fromtree] adc_emul: case can not run on native_posix board
hakehuang May 11, 2021
b54109c
[nrf fromtree] tests: interrupt: refine the offload case not rely on …
May 14, 2021
51f28cb
[nrf fromtree] samples: pm: Fix device pm sample
May 17, 2021
6a72957
[nrf fromtree] pm: device: check for ENOSYS
gmarull May 12, 2021
0b5e5e5
[nrf fromtree] drivers: timer: sys_clock: return -ENOSYS if not imple…
gmarull May 12, 2021
14f3d8d
[nrf fromtree] doc: scripts: gen_kconfig_rest: add workaround for pag…
gmarull May 17, 2021
827d165
[nrf fromtree] doc: scripts: gen_kconfig_rest: fix rendering issues
gmarull May 20, 2021
b27c339
[nrf fromtree] doc: make some Sphinx config path absolute
gmarull May 19, 2021
4c36444
[nrf fromtree] doc: conf: remove unused breathe project
gmarull May 19, 2021
c112541
[nrf fromtree] doc: remove redundant breathe project
gmarull May 19, 2021
b2025ef
[nrf fromtree] doc: doxygen: make relative paths absolute
gmarull May 18, 2021
0c6b447
[nrf fromtree] doc: doxygen: do not use separate member pages
gmarull May 17, 2021
af84c1a
[nrf fromtree] doc: warnings: make expressions more generic
gmarull May 17, 2021
346567c
[nrf fromtree] drivers: display: fix doxygen issues
gmarull May 17, 2021
f6e7fa3
[nrf fromtree] doc: enable members option by default when using breathe
gmarull May 17, 2021
8a89b54
[nrf fromtree] doc: extensions: doxyrunner: make html output optional
gmarull May 11, 2021
6fd6538
[nrf fromtree] drivers: serial: nrf_uarte: Fix power management trans…
nordic-krch May 18, 2021
06b8191
[nrf fromtree] drivers: serial: nrf_uarte: Fix uart_callback_set unsu…
nordic-krch May 18, 2021
f7fc83a
[nrf fromtree] tests: drivers: uart: Add test for uart power management
nordic-krch May 18, 2021
410b807
[nrf fromtree] net: enable TX thread if USB device support is enabled
jfischer-no May 18, 2021
c836cb4
[nrf fromtree] drivers: eth_enc424j600: terminate driver thread only …
jfischer-no May 19, 2021
1c6eaa2
[nrf fromtree] drivers: eth_enc424j600: explicitly disable INTIE afte…
jfischer-no May 18, 2021
0c0114d
[nrf fromtree] doc: kernel: thread stack is not the same as stack object
nashif May 17, 2021
d571a5f
[nrf fromtree] kernel: move thread_stack.h to include/kernel
nashif May 17, 2021
98e6dec
[nrf fromtree] drivers: serial: nrf uarte: Fix for the RX byte counter
tomchy Jun 4, 2020
c882d93
[nrf fromtree] drivers: serial: nrf_uart: Disable uart when fifo_fill…
nordic-krch May 10, 2021
6b4398d
[nrf fromtree] drivers: serial: nrf_uarte: Add missing check for asyn…
nordic-krch May 10, 2021
ad4687c
[nrf fromtree] drivers: serial: nrf_uarte: Fix checkpatch issues
nordic-krch May 10, 2021
117abc2
[nrf fromtree] soc: nrf9160: Remove incorrect indication of SWO avail…
anangl May 11, 2021
6254b02
[nrf fromtree] Bluetooth: controller: Fix PPIs use for nRF52805 SoC
cvinayak May 12, 2021
b8ad3c4
[nrf fromtree] tfm: cmake: added CMAKE_ARGS as argument to
tejlmand May 18, 2021
3b005f0
[nrf fromtree] Bluetooth: host: Remove cancel sync from database hash…
joerchan May 18, 2021
530be40
[nrf fromlist] ipc: rpmsg_service: Add missing log_strdup
nordic-krch May 25, 2021
27ed099
[nrf fromtree] drivers: flash: nrf_qspi_nor: Fix no multithreading co…
nordic-krch May 25, 2021
aa8079c
[nrf fromlist] arch: arm: Fix build warning
MarekPieta May 19, 2021
1bc04cf
[nrf fromlist] tests/logging/log_backend_fs: Fix test failed on dirty…
de-nordic May 18, 2021
c293a3c
[nrf fromtree] tracing: fix conflict with RTT locking
nashif May 20, 2021
ca25289
[nrf fromtree] drivers: console: rtt: Add no multithreading support
nordic-krch May 26, 2021
410a57b
[nrf fromtree] manifest: update segger
nordic-krch May 26, 2021
b11db21
[nrf fromtree] logging: backend_rtt: Align to changes in RTT_LOCK/UNLOCK
nordic-krch May 26, 2021
b19b187
[nrf fromtree] doc: improve installing dependencies
May 27, 2021
3b75639
[nrf fromtree] doc: improve doc processor installation
May 27, 2021
0abce66
[nrf fromtree] drivers: flash: nrf_qspi_nor: Fix no multithreading co…
nordic-krch May 28, 2021
6d2b8c7
[nrf fromtree] Bluetooth: Mesh: Pass correct pointer to publish_sent
PavelVPV May 14, 2021
a7b8cb1
Update clang.yaml
PerMac Jan 12, 2022
f4d444b
Update clang.yaml
PerMac Jan 12, 2022
76466b9
Update sample.yaml
PerMac Jan 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Backport
on:
pull_request_target:
pull_request:
types:
- closed
- labeled
Expand All @@ -12,8 +12,11 @@ jobs:
runs-on: ubuntu-18.04
name: Backport
steps:
- name: Backport
uses: zephyrproject-rtos/action-backport@v1.1.1-1
- name: Backport Bot
uses: Gaurav0/backport@v1.0.24
with:
bot_username: NordicBuilder
bot_token: 151a9b45052f9ee8be5a59963d31ad7b92c3ecb5
bot_token_key: 67bb1f1f998d546859786a4088917c65415c0ebd
github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
issue_labels: backport
12 changes: 11 additions & 1 deletion .github/workflows/clang.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build with Clang/LLVM

on: pull_request_target
on: pull_request

jobs:
clang-build-cancel:
Expand Down Expand Up @@ -38,6 +38,16 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0

- name: Set repo directory
run: |
# fix for the directory name (nrfconnect repo specific)
current_dir=${PWD##*/}
if [ ${current_dir} != "zephyr" ]
then
echo "curr dir ${current_dir} was not equal to zephyr"
mv ../${current_dir} ../zephyr
fi

- name: west setup
run: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
git remote -v
# Sauce tag checks before rebasing
git log --oneline --first-parent origin/${BASE_REF}..HEAD | grep -E -v "\[nrf (mergeup|fromlist|toup|noup|temphack|fromtree)\]" && { echo 'Sauce tag missing'; exit 1; }
git rebase origin/${BASE_REF}
# debug
git log --pretty=oneline | head -n 10
Expand All @@ -53,7 +55,7 @@ jobs:
# debug
ls -la
git log --pretty=oneline | head -n 10
./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m Kconfig -c origin/${BASE_REF}..
./scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m KconfigBasic -c origin/${BASE_REF}..

- name: upload-results
uses: actions/upload-artifact@master
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,10 @@ set(logical_target_for_zephyr_elf ${logical_target_for_zephyr_elf} PARENT_SCOPE)
# 2. it can be defined in Kconfig
set_target_properties(${logical_target_for_zephyr_elf} PROPERTIES OUTPUT_NAME ${KERNEL_NAME})

if (ZEPHYR_NRF_MODULE_DIR)
include(${ZEPHYR_NRF_MODULE_DIR}/cmake/s1.cmake)
endif()

set(post_build_commands "")
set(post_build_byproducts "")

Expand Down
4 changes: 2 additions & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
# Do not use wildcard on all source yet
# * @galak @nashif

/.github/ @nashif
/.github/workflows/ @galak @nashif
/.github/ @thst-nordic
/.buildkite/ @galak
/MAINTAINERS.yml @ioannisg @MaureenHelm
/arch/arc/ @abrodkin @ruuddw @evgeniy-paltsev
Expand Down Expand Up @@ -492,6 +491,7 @@
/include/toolchain.h @dcpleung @andyross @nashif
/include/toolchain/ @dcpleung @nashif @andyross
/include/zephyr.h @dcpleung @nashif @andyross
/Jenkinsfile @thst-nordic
/kernel/ @dcpleung @nashif @andyross
/lib/util/ @carlescufi @jakub-uC
/lib/util/fnmatch/ @carlescufi @jakub-uC
Expand Down
5 changes: 5 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@Library("CI_LIB") _

def pipeline = new ncs.sdk_zephyr.Main()

pipeline.run(JOB_NAME)
4 changes: 1 addition & 3 deletions Kconfig.zephyr
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@ config FLASH_LOAD_SIZE
endif # HAS_FLASH_LOAD_OFFSET

config ROM_START_OFFSET
hex
prompt "ROM start offset" if !BOOTLOADER_MCUBOOT
default 0x200 if BOOTLOADER_MCUBOOT
hex "ROM start offset"
default 0
help
If the application is built for chain-loading by a bootloader this
Expand Down
5 changes: 4 additions & 1 deletion boards/arm/nrf5340dk_nrf5340/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ config BOARD
# force building with TF-M as the Secure Execution Environment.

config BUILD_WITH_TFM
default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS
# Temporarily disable building Non-Secure images with TF-M support by
# default.
# default y if BOARD_NRF5340DK_NRF5340_CPUAPPNS
default n

if BUILD_WITH_TFM

Expand Down
6 changes: 0 additions & 6 deletions boards/arm/nrf9160dk_nrf9160/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ if BOARD_NRF9160DK_NRF9160 || BOARD_NRF9160DK_NRF9160NS
config BOARD
default "nrf9160dk_nrf9160"

# By default, if we build for a Non-Secure version of the board,
# force building with TF-M as the Secure Execution Environment.

config BUILD_WITH_TFM
default y if BOARD_NRF9160DK_NRF9160NS

if BUILD_WITH_TFM

# By default, if we build with TF-M, instruct build system to
Expand Down
2 changes: 2 additions & 0 deletions boards/arm/thingy53_nrf5340/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ LOG_MODULE_REGISTER(thingy53_board_init);
* introduced in the board start up file. Below asserts ensure correct initialization order:
* on board regulators, board init (this), sensors init.
*/
#if !defined(CONFIG_TRUSTED_EXECUTION_SECURE)
BUILD_ASSERT(CONFIG_THINGY53_INIT_PRIORITY > CONFIG_REGULATOR_FIXED_INIT_PRIORITY,
"CONFIG_THINGY53_INIT_PRIORITY must be higher than CONFIG_REGULATOR_FIXED_INIT_PRIORITY");
#endif /* !CONFIG_TRUSTED_EXECUTION_SECURE */
#if defined(CONFIG_SENSOR)
BUILD_ASSERT(CONFIG_THINGY53_INIT_PRIORITY < CONFIG_SENSOR_INIT_PRIORITY,
"CONFIG_THINGY53_INIT_PRIORITY must be less than CONFIG_SENSOR_INIT_PRIORITY");
Expand Down
4 changes: 4 additions & 0 deletions cmake/app/boilerplate.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,10 @@ set_property(TARGET app PROPERTY ARCHIVE_OUTPUT_DIRECTORY app)

add_subdirectory(${ZEPHYR_BASE} ${__build_dir})

if(ZEPHYR_NRF_MODULE_DIR)
include(${ZEPHYR_NRF_MODULE_DIR}/cmake/partition_manager.cmake)
endif()

# Link 'app' with the Zephyr interface libraries.
#
# NB: This must be done in boilerplate.cmake because 'app' can only be
Expand Down
13 changes: 12 additions & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,14 @@ set(SPHINX_BUILD_HTML_COMMAND
ZEPHYR_BASE=${ZEPHYR_BASE}
ZEPHYR_BUILD=${CMAKE_CURRENT_BINARY_DIR}
DOXYGEN_EXECUTABLE=${DOXYGEN_EXECUTABLE}

# nRF-specific hack to pass these through to nrf/doc/zephyr/conf.py (the
# Sphinx configuration file). We use it for Intersphinx. See
# nrf/doc/CMakeLists.txt.
ZEPHYR_OUTPUT=${SPHINX_OUTPUT_DIR}
ZEPHYR_RST_SRC=${RST_OUT}/doc
KCONFIG_OUTPUT=${KCONFIG_OUTPUT}

${SPHINXBUILD} -W -N -t ${DOC_TAG} -b html ${ALLSPHINXOPTS} ${RST_OUT}/doc ${SPHINX_OUTPUT_DIR_HTML})

# The sphinx-html target is provided as a convenience for incremental
Expand Down Expand Up @@ -380,7 +388,10 @@ endif()
#
# Dependencies and final targets
#
add_dependencies(html content kconfig devicetree)

# nRF-specific: No 'kconfig' dependency here, because we use a shared Kconfig
# documentation set instead
add_dependencies(html content devicetree)

add_custom_target(
htmldocs
Expand Down
10 changes: 8 additions & 2 deletions doc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ described in :ref:`getting_started`. Then install additional tools
that are only required to generate the documentation,
as described below:

.. doc_processors_installation_start

.. tabs::

.. group-tab:: Linux
Expand Down Expand Up @@ -96,6 +98,8 @@ as described below:

.. group-tab:: macOS

Use ``brew`` and ``tlmgr`` to install the tools:

.. code-block:: console

brew install doxygen mactex librsvg
Expand All @@ -104,7 +108,7 @@ as described below:

.. group-tab:: Windows

Run in an Administrator ``cmd.exe`` prompt:
Open a ``cmd.exe`` window as **Administrator** and run the following command:

.. code-block:: console

Expand All @@ -113,10 +117,12 @@ as described below:
.. note::
On Windows, the Sphinx executable ``sphinx-build.exe`` is placed in
the ``Scripts`` folder of your Python installation path.
Dependending on how you have installed Python, you may need to
Dependending on how you have installed Python, you might need to
add this folder to your ``PATH`` environment variable. Follow
the instructions in `Windows Python Path`_ to add those if needed.

.. doc_processors_installation_end

Documentation presentation theme
********************************

Expand Down
22 changes: 12 additions & 10 deletions doc/_extensions/zephyr/doxyrunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,24 +238,26 @@ def sync_doxygen(doxyfile: str, new: Path, prev: Path) -> None:
prev: Previous Doxygen build output directory.
"""

html_output = get_doxygen_option(doxyfile, "HTML_OUTPUT")
if not html_output:
raise ValueError("No HTML_OUTPUT set in Doxyfile")
generate_html = get_doxygen_option(doxyfile, "GENERATE_HTML")
if generate_html == "YES":
html_output = get_doxygen_option(doxyfile, "HTML_OUTPUT")
if not html_output:
raise ValueError("No HTML_OUTPUT set in Doxyfile")

new_htmldir = new / html_output[0]
prev_htmldir = prev / html_output[0]

if prev_htmldir.exists():
shutil.rmtree(prev_htmldir)
new_htmldir.rename(prev_htmldir)

xml_output = get_doxygen_option(doxyfile, "XML_OUTPUT")
if not xml_output:
raise ValueError("No XML_OUTPUT set in Doxyfile")

new_htmldir = new / html_output[0]
prev_htmldir = prev / html_output[0]

new_xmldir = new / xml_output[0]
prev_xmldir = prev / xml_output[0]

if prev_htmldir.exists():
shutil.rmtree(prev_htmldir)
new_htmldir.rename(prev_htmldir)

if prev_xmldir.exists():
dcmp = filecmp.dircmp(new_xmldir, prev_xmldir)

Expand Down
41 changes: 27 additions & 14 deletions doc/_scripts/gen_kconfig_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,30 @@
from operator import attrgetter
import os
import pathlib
import re
import sys
import textwrap

import kconfiglib

import gen_helpers

NO_MAX_WIDTH = """

.. raw:: html

<!--
FIXME: do not limit page width until content uses another representation
format other than tables
-->
<style>.wy-nav-content { max-width: none; !important }</style>

"""

def escape_inline_rst(text):
# Escape reStructuredText inline markup characters
return re.sub(r"(\*|_|`)", r"\\\1", text)

def rst_link(sc):
# Returns an RST link (string) for the symbol/choice 'sc', or the normal
# Kconfig expression format (e.g. just the name) for 'sc' if it can't be
Expand Down Expand Up @@ -318,6 +335,7 @@ def write_main_index_page():
index_header(title="All Configuration Options",
link="configuration_options_all",
desc_path=None) +
NO_MAX_WIDTH +
sym_table_rst("Configuration Options",
kconf.unique_defined_syms))

Expand All @@ -332,6 +350,7 @@ def write_main_index_page():
""" + "\n".join(" index-" + suffix for _, suffix, _, _, in modules)

if not separate_all_index:
rst += NO_MAX_WIDTH
# Put index of all symbols in index.rst
rst += sym_table_rst("All configuration options",
kconf.unique_defined_syms)
Expand Down Expand Up @@ -359,6 +378,7 @@ def write_module_index_pages():
link="configuration_options_" + suffix,
desc_path=desc_path)

rst += NO_MAX_WIDTH
rst += sym_table_rst("Configuration Options",
module2syms[title])

Expand All @@ -379,7 +399,7 @@ def sym_table_rst(title, syms):
:widths: auto

* - Symbol name
- Help/prompt
- Prompt
"""

for sym in sorted(syms, key=attrgetter("name")):
Expand All @@ -394,15 +414,9 @@ def sym_table_rst(title, syms):
def sym_index_desc(sym):
# Returns the description used for 'sym' on the index page

# Use the first help text, if available
for node in sym.nodes:
if node.help is not None:
return node.help.replace("\n", "\n ")

# If there's no help, use the first prompt string
for node in sym.nodes:
if node.prompt:
return node.prompt[0]
return escape_inline_rst(node.prompt[0])

# No help text or prompt
return ""
Expand Down Expand Up @@ -532,7 +546,7 @@ def choice_header_rst(choice):
def prompt_rst(sc):
# Returns RST that lists the prompts of 'sc' (symbol or choice)

return "\n\n".join(f"*{node.prompt[0]}*"
return "\n\n".join(f"*{escape_inline_rst(node.prompt[0])}*"
for node in sc.nodes if node.prompt) \
or "*(No prompt -- not directly user assignable.)*"

Expand All @@ -548,7 +562,8 @@ def help_rst(sc):
if node.help is not None:
rst += "Help\n" \
"====\n\n" \
f"{node.help}\n\n"
".. code-block:: none\n\n" \
f"{textwrap.indent(node.help, 4 * ' ')}\n\n"

return rst

Expand Down Expand Up @@ -721,15 +736,13 @@ def menu_path(node):
if len(sc.nodes) > 1: heading += "s"
rst = f"{heading}\n{len(heading)*'='}\n\n"

rst += ".. highlight:: kconfig"

for node in sc.nodes:
rst += "\n\n" \
f"At ``{strip_module_path(node.filename)}:{node.linenr}``\n\n" \
f"{include_path(node)}" \
f"Menu path: {menu_path(node)}\n\n" \
".. parsed-literal::\n\n" \
f"{textwrap.indent(node.custom_str(rst_link), 4*' ')}"
".. code-block:: kconfig\n\n" \
f"{textwrap.indent(str(node), 4*' ')}"

# Not the last node?
if node is not sc.nodes[-1]:
Expand Down
Loading