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

Fixes monolithic builds #1340

Merged
merged 1 commit into from May 30, 2017

Conversation

@avtolstoy
Copy link
Member

commented May 27, 2017

Problem

Fixes monolithic builds on:

  • Electron (mainly broken by #1184) Fixes #1339
  • Photon (broken in feature/photon/wiced-3.7.0-7 branch due to WICED upgrade and an oversight)

Solution

  • Use tls function callbacks on Photon/P1 only with modular builds
  • Use cellular HAL NET callbacks on Electron only in modular builds
  • Change preprocessor #if MODULAR_FIRMWARE checks to #if defined(MODULAR_FIRMWARE) && MODULAR_FIRMWARE, to avoid triggering an error with -Wundef which is now always enabled
  • Link HAL with Lib_crypto_open.a on Photon/P1 in monolithic builds
  • Weaken sha4 functions in Lib_crypto_open.a
  • Restore monolithic WICED linker files which were lost during an upgrade to WICED 3.7.0-7

Steps to Test

Build Photon and Electron firmware in modular and monolithic.

Example App

N/A


Completeness

  • User is totes amazing for contributing!
  • Contributor has signed CLA (Info here)
  • Problem and Solution clearly stated
  • Run unit/integration/application tests on device
  • Added documentation
  • Added to CHANGELOG.md after merging (add links to docs and issues)

Bug fix

  • [PR #1340] [Electron] Fixes the monolithic build

@avtolstoy avtolstoy added this to the 0.7.0 milestone May 27, 2017

@sergeuz sergeuz self-requested a review May 27, 2017

@sergeuz
Copy link
Member

left a comment

Tested modular and non-modular builds on Photon and Electron, both devices connect to the cloud normally 👍

@sergeuz sergeuz merged commit 6dc7ef2 into feature/photon/wiced-3.7.0-7 May 30, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@technobly technobly deleted the fix/monolithic-build branch May 30, 2017

@technobly technobly added the bug label May 30, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.