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.

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

samples: net: lwm2m_client: build break fixes for k64F and pca10056 #11448

Merged

Conversation

mike-scott
Copy link
Contributor

@mike-scott mike-scott commented Nov 16, 2018

Over the last 2 weeks we've seen several DTS related changes which are causing build breaks when using the modem overlay in the lwm2m_client sample:

  • DT_* changes affected the defines in the generated DTS files
  • Some DTS properties were missed when moving from the soc area to the sample

During the modem overlay move from the K64F board directory to the
LwM2M sample code, 2 DTS entries were dropped:
current-speed = <115200>;
status = "ok";

Without these entries the DTS defines for UART2 and CURRENT_SPEED
are missing from the generated_dts_board.h file.

Signed-off-by: Michael Scott <mike@foundries.io>
@mike-scott mike-scott added bug The issue is a bug, or the PR is fixing a bug area: Devicetree labels Nov 16, 2018
@mike-scott mike-scott added this to the v1.14.0 milestone Nov 16, 2018
@codecov-io
Copy link

codecov-io commented Nov 16, 2018

Codecov Report

Merging #11448 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #11448   +/-   ##
=======================================
  Coverage   48.38%   48.38%           
=======================================
  Files         265      265           
  Lines       42193    42193           
  Branches    10137    10137           
=======================================
  Hits        20413    20413           
  Misses      17703    17703           
  Partials     4077     4077

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fb4cb3a...7b9adeb. Read the comment docs.

When the WNC-14A2A modem binding was originally introduced, I thought
the base_label would shorten the define keeping the result short and
easily portable.  Turns out with the latest changes, it has a side
effect of removing the "DT_*" prefix which is breaking the build.

Let's remove "base_label" from the modem binding and adjust all of
the dts_fixups referring to the WNC14A2A defines.

NOTE: This commit moves the left-over WNC14A2A dts_fixup defines from
the nRF52 soc into samples/net/lwm2m_client as the new values.
They will stay there until the modem can be re-configured as a shield.

Signed-off-by: Michael Scott <mike@foundries.io>
@mike-scott mike-scott changed the title samples: net: lwm2m_client: add "ok" and baud rate to k64f overlay samples: net: lwm2m_client: build break fixes for k64F and pca10056 Nov 16, 2018
Copy link
Collaborator

@galak galak left a comment

Choose a reason for hiding this comment

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

While not technically related, can we fix the fact that the sample only builds for qemu_x86 via sanitycheck.

./scripts/sanitycheck -N -T samples/net/lwm2m_client -l

I think samples/net/lwm2m_client/sample.yaml needs fixing.

@mike-scott
Copy link
Contributor Author

@galak So you're putting my build break patch on hold until I add a feature to the .yaml?

@galak
Copy link
Collaborator

galak commented Nov 16, 2018

@galak So you're putting my build break patch on hold until I add a feature to the .yaml?

Well how is the build breaking? I'm just saying w/o the yaml fix we aren't actually able to regress your fix ;).

@mike-scott
Copy link
Contributor Author

Which targets would we like to test build? I've tested: k64f, BLENano2, reel_board, disco_l475_iot1, nrf52840_pca10056, etc. However, there are often overlays involved (such as overlay-bt.conf).

And of course if we want to test the modem we need k64f or nrf52840_pca10056 w/ overlay-wncm14a2a.conf.

@nashif
Copy link
Member

nashif commented Nov 16, 2018

start with k64f and pca10056

Let's expand the sanity build testing for the lwm2m_client by
doing the following:

- Add variant builds for DTLS, bluetooth and modem
- Check various combinations of hardware across each of these
  variant builds: frdm_k64f, nrf52_pca10040, nrf52840_pca10056,
  disco_l475_iot1

Signed-off-by: Michael Scott <mike@foundries.io>
@mike-scott
Copy link
Contributor Author

I've added sanity testing for all of the various overlays so that we should be covered. If it's too much, let me know.

@galak
Copy link
Collaborator

galak commented Nov 16, 2018

I've added sanity testing for all of the various overlays so that we should be covered. If it's too much, let me know.

Thanks!

@nashif nashif merged commit b010cd7 into zephyrproject-rtos:master Nov 17, 2018
@mike-scott mike-scott deleted the master-fix-k64f-modem-overlay branch December 20, 2018 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Devicetree bug The issue is a bug, or the PR is fixing a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants