Skip to content

Conversation

@melka
Copy link

@melka melka commented Jan 28, 2022

When building for ESP32, the linker scripts were not loaded by zephyr_linker_sources.
This PR fixes that and allows custom linker scripts to be added to the build.

Shoutout to Sylvio on Zephyr discord for the solution.

Signed-off-by: Kamel Makhloufi [email protected]

@dcpleung dcpleung requested a review from sylvioalves January 28, 2022 17:50
@sylvioalves sylvioalves self-assigned this Jan 28, 2022
@sylvioalves sylvioalves added the bug The issue is a bug, or the PR is fixing a bug label Jan 28, 2022
@sylvioalves sylvioalves modified the milestones: v3.0.0-rc1, v3.0.0 Jan 28, 2022
Copy link
Contributor

@sylvioalves sylvioalves left a comment

Choose a reason for hiding this comment

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

@melka, sorry. Code is correct but you have to fix the commits. Please, squash them all in a single one. Also, start with soc: esp32: in the commit title. The middle one is correct: 893cb20

Copy link
Member

@uLipe uLipe left a comment

Choose a reason for hiding this comment

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

Aside the comments, LGTM

When building for ESP32, the linker scripts were not loaded by zephyr_linker_sources.
This PR fixes that and allows custom linker scripts to be added to the build.

Thanks to @sylvioalves for the solution.

Signed-off-by: Kamel Makhloufi [email protected]
@melka
Copy link
Author

melka commented Jan 30, 2022

Hey @sylvioalves, I tried to do the requested changes but I am bad at git commits and PR requests, so let me know if I should redo it again. Sorry for the inconvenience, not used to working on big projects like this one.

@melka melka changed the title esp32: Added rodata injection to esp32 build soc: esp32: Added rodata injection to esp32 build Jan 30, 2022
@sylvioalves
Copy link
Contributor

sylvioalves commented Jan 30, 2022

Hey @sylvioalves, I tried to do the requested changes but I am bad at git commits and PR requests, so let me know if I should redo it again. Sorry for the inconvenience, not used to working on big projects like this one.

You can check current errors in here: https://github.com/zephyrproject-rtos/zephyr/runs/4997252486?check_suite_focus=true

  1. Both description lines are too big. Break them. (max 75 chars in a single line).
  2. As from guidelines, sign-off is required in every commit message. Use git commit -s to add it next time. In your case, I guess your Signed-off-by is missing < and > surrounding the email.

@sylvioalves
Copy link
Contributor

Merged #43725

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

3 participants