Skip to content

Standardize on FLASH_FIRMWARE section name in linker scripts #2817

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

Merged
merged 7 commits into from
Apr 27, 2020

Conversation

jepler
Copy link

@jepler jepler commented Apr 27, 2020

Closes: #2816

This ended up touching stm, i.mx, and litex ports.

I only built, I didn't test on HW.

jepler added 4 commits April 27, 2020 08:07
for compatibility with the build_memory_info script

This change was scripted:
    git grep -l FLASH_TEXT | xargs sed -i s/FLASH_TEXT/FLASH_FIRMWARE/
for compatibility with the build_memory_info script

This change was scripted:
    git grep -l FLASH_TEXT | xargs sed -i s/FLASH_TEXT/FLASH_FIRMWARE/
for compatibility with the build_memory_info script
This led to incorrect results about free memory in the stm and i.mx ports
@jepler jepler requested review from hierophect and dhalbert April 27, 2020 15:22
Copy link
Collaborator

@hierophect hierophect left a comment

Choose a reason for hiding this comment

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

This looks good to me generally, I can't think of any way it could impact actual chip performance but I'll test it anyway when CI is done. I've got two minor style requests.

dhalbert
dhalbert previously approved these changes Apr 27, 2020
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

This OK as is, but fine if you address @hierophect 's style requests and I will re-review.

jepler added 2 commits April 27, 2020 12:47
With "git show -b" you can verify that this is a whitespace only change
because the diff will be empty.
.. intead of just free and total as before.
Comment on lines 10 to 12
FLASH (rx) : ORIGIN = 0x20040000, LENGTH = 0x100000 /* entire flash, 1 MiB */
FLASH_FIRMWARE (rx) : ORIGIN = 0x20040000, LENGTH = 0x100000 /* entire flash, 1 MiB */
RAM (xrw) : ORIGIN = 0x10000000, LENGTH = 0x00020000 /* 128 KiB */
Copy link
Collaborator

Choose a reason for hiding this comment

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

Line up these but otherwise looks great.

hierophect
hierophect previously approved these changes Apr 27, 2020
Copy link
Collaborator

@hierophect hierophect left a comment

Choose a reason for hiding this comment

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

Looks good to me

With "git show -b" you can verify that this is a whitespace only change
because the diff will be empty.
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

Thanks!

@dhalbert dhalbert merged commit faa50df into adafruit:master Apr 27, 2020
@jepler jepler deleted the stm-linker-scripts branch April 27, 2020 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

stm: linker script does not follow convention, reported available flash space incorrect
3 participants