Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upmerge #2284

Merged
merged 64 commits into from
May 28, 2020
Merged

Upmerge #2284

merged 64 commits into from
May 28, 2020

Conversation

joerchan
Copy link
Contributor

@joerchan joerchan commented May 18, 2020 •
edited
Loading

Things to look out for:

CONFIG_LEGACY_TIMEOUT_API is now in many cases disabled.
Leading to build errors related to k_timeout_t use.

CONFIG_LEGACY_DEVICETREE_MACROS is now disabled.
Leading to build errors related to DT_ macros.

Partition manager patches has been changed.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented May 18, 2020 •
edited
Loading

All checks are passing now.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

@joerchan joerchan force-pushed the upmerge branch 4 times, most recently from 749061d to f69846e Compare May 19, 2020 15:41
@joerchan joerchan marked this pull request as ready for review May 19, 2020 15:49
tejlmand
tejlmand requested changes May 20, 2020
View reviewed changes
Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking, to allow issues from previous upmerge to go in first.
#2261

This is needed for the testers to be able to run a full test against this PR, to ensure this upmerge is not breaking master.

rlubos and others added 26 commits May 28, 2020 16:42
@rlubos @joerchan
samples: nrf9160: lte_ble_gateway: Convert to a new timeout API
bcf9697 
Align with upstream changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos @joerchan
drivers: gps_sim: Convert to a new timeout API
dc0c62d 
Align with upstream changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos @joerchan
lib: lwm2m_carrier: Convert to a new timeout and DT API
0e24251 
Align with upstream changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos @joerchan
samples: nrf9160: mqtt_simple: Convert to a new timeout API
51c7b9b 
Align with upstream changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos @joerchan
samples: serial_lte_modem: Convert to a new timeout and DT API
e09bae1 
Align with upstream changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@rlubos @joerchan
samples: nrf9160: lwm2m_client: Convert to a new timeout API
82228d1 
Align with upstream changes.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
@mbolivar-nordic @joerchan
nfc: convert st25r3911b library and samples to devicetree
2449918 
These samples are using Kconfig to configure a SPI device, instead of
devicetree. Using Kconfig in this way is something Zephyr has started
moving away from, and is now actively discouraging.

To ensure that all users of the library must update, require at least
one node in the devicetree with the appropriate
compatible ("st,st25r3911b") to be defined in order for
CONFIG_ST25R3911B_LIB to be enabled. That way, the Kconfig step of the
build system will scream and die if a user attempts to build the
library with an out-of-date devicetree.

This library is not a true device driver, since there is no NFC API.
Therefore, do not allocate a struct device in st25r3911b_spi.c even
though we are using devicetree.

Update the tag_reader sample overlay to provide the necessary SPI
device nodes.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
@joerchan
samples: nfc: writeable_ndef_msg: Update to new DT macros
a283000 
update NFC writeable ndef message samples to use the new DT macros.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@nordic-auko @joerchan
applications: connectivity_bridge: Update UART name references
2f145af 
Update UART device names to align with DTS changes.

Signed-off-by: Audun Korneliussen <audun.korneliussen@nordicsemi.no>
@doki-nordic @joerchan
drivers: eth_rtt: Upmerge changes
3da2f39 
New zephyr version has small changes in drivers API and
work queue API. This commit adjusts eth_rtt.c to those changes.

Signed-off-by: Dominik Kilian <Dominik.Kilian@nordicsemi.no>
@hakonfam @joerchan
partition_manager: create lowercase alias for partitions
bef8270 
This is done to work with new DT and FLASH_AREA mechanisms.

PM partition names must now align with the DT name.
Change 'settings_storage' to 'storage' in order to
align with the DT name.

Also update direct usage of PM_SETTINGS_STORAGE
to use the new FLASH_AREA api provided in
flash_map.h.

Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
@mbolivar-nordic @joerchan
zigbee: devicetree updates
5f5009e 
Move to the new DT API.

This makes the zigbee samples pass sanitycheck's build tests, but I
don't have enough 52840 or 52833 DK boards on hand to test on
hardware.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
@joerchan
checkpatch: suppress SPDX license line check
02cb4da 
Zephyr has not committed to complying with the Linux requirement
that the SPDX declaration be on the first line of a file.
Disable the warning for nRF Connect SDK as well.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@jtguggedal @joerchan
net: lib: nrf_cloud: Convert to new timeout API
70d4688 
ALign with upstream changes to timeout handling.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
@jtguggedal @joerchan
applications: asset_tracker: Convert to new timeout API
a1e57a0 
Align with upstream changes to timeout handling.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
@jhn-nordic @joerchan
applications: asset_tracker: Convert to new timeout and DT API
fcf9577 
Convert asset tracker application to new timeout and DT API.

Signed-off-by: Jon Helge Nistad <jon.helge.nistad@nordicsemi.no>
@MarekPieta @joerchan
applications: nrf_desktop: Update port_state_def.h (nrf52833 DK)
4afbb12 
Change updates port_state_def.h file for nrf52833 to use new DTS
macros.

Jira:DESK-945

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
@joerchan
tests: clock_control: Convert to new DT macros
5572212 
Convert clock control test to use new DT macros.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@joerchan
tests: bootloader: Convert to new DT macros.
9e466cb 
Convert bootloader test bl_validation to new DT macros.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@joerchan
tests: fprotect: Update to use new DT macros
e1916bb 
Update fprotect test 'positive' and 'negative' to use new DT macros.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@joerchan
applications: nrf_desktop: Remove documentation for removed option
57fb93a 
Remove reference in documentation to option CONFIG_ADC_0 that does no
longer exists.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@jhn-nordic @joerchan
applications: asset_tracker: bsec: Fix problem with thread creation.
3b86b8d 
Fixes an issue where asset tracker will not compile if
CONFIG_USE_BME680_BSEC=y

Signed-off-by: Jon Helge Nistad <jon.helge.nistad@nordicsemi.no>
@joerchan
lib: bsdlib: Update to new DT macros
d6dee33 
Update bsdlib libraryr to use the new DT macros.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
@thst-nordic @joerchan
bh1749: fix device struct use
75dd79d 
dev->config->name   changed to dev->name

Signed-off-by: Thomas Stilwell <Thomas.Stilwell@nordicsemi.no>
@thst-nordic @joerchan
ftp_client: use K_SECONDS macro
4804b61 
inside ftp_login()

Signed-off-by: Thomas Stilwell <Thomas.Stilwell@nordicsemi.no>
@trond-snekvik @joerchan
Bluetooth: Mesh: Use callback for bt_enable
2ff0f5c 
Workaround for
zephyrproject-rtos/zephyr#25672

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
@joerchan joerchan merged commit ccd0d64 into nrfconnect:master May 28, 2020
@joerchan joerchan deleted the upmerge branch June 10, 2020 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ru-fu ru-fu ru-fu left review comments

@wiminordic wiminordic wiminordic left review comments

@kapi-no kapi-no kapi-no approved these changes

@rugeGerritsen rugeGerritsen rugeGerritsen left review comments

@mbolivar-nordic mbolivar-nordic mbolivar-nordic approved these changes

@MarekPieta MarekPieta MarekPieta approved these changes

@maciekfabia maciekfabia maciekfabia approved these changes

@trond-snekvik trond-snekvik trond-snekvik approved these changes

@carlescufi carlescufi carlescufi approved these changes

@sigvartmh sigvartmh sigvartmh approved these changes

@tejlmand tejlmand tejlmand approved these changes

@rlubos rlubos rlubos approved these changes

@thst-nordic thst-nordic thst-nordic approved these changes

@MarekPorwisz MarekPorwisz MarekPorwisz approved these changes

@hakonfam hakonfam hakonfam approved these changes

@frkv frkv frkv approved these changes

@torsteingrindvik torsteingrindvik torsteingrindvik approved these changes

@eibe85 eibe85 eibe85 approved these changes

@jhn-nordic jhn-nordic jhn-nordic approved these changes

@nordic-auko nordic-auko nordic-auko approved these changes

@pdunaj pdunaj pdunaj approved these changes

@nvlsianpu nvlsianpu nvlsianpu approved these changes

@anangl anangl Awaiting requested review from anangl

@ioannisg ioannisg Awaiting requested review from ioannisg

@jtguggedal jtguggedal Awaiting requested review from jtguggedal

@lemrey lemrey Awaiting requested review from lemrey

@nordic-krch nordic-krch Awaiting requested review from nordic-krch

@tomchy tomchy Awaiting requested review from tomchy

@grochu grochu Awaiting requested review from grochu

@lmaciejonczyk lmaciejonczyk Awaiting requested review from lmaciejonczyk

@rakons rakons Awaiting requested review from rakons

@wlgrd wlgrd Awaiting requested review from wlgrd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.