linker: aarch32: simplify memory region generation #34185
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JordanYates
requested review from
andyross,
bwitherspoon,
dcpleung,
erwango,
galak,
ioannisg,
MaureenHelm and
nashif
as code owners
github-actions
bot
added
area: API
Adds a public macro for creating memory regions from devicetree nodes. `DT_REGION_FROM_NODE_STATUS_OKAY` declares the memory regions for consumption by ld, assuming the node exists and has `status = "okay"`. Signed-off-by: Jordan Yates <[email protected]>
erwango
requested changes
Apr 12, 2021
added 4 commits
April 12, 2021 19:33
Simplify the linker script by using the helper macros introduced in <linker/devicetree_regions.h>. The conditional checks on the Kconfig symbols are discarded as their default values are typically set via the status="okay" property of the nodes, and hence the behaviour doesn't change. Signed-off-by: Jordan Yates <[email protected]>
Move the definition of the two IPC RAM blocks from `#define`'s in family linker scripts to proper devicetree nodes. Use the devicetree nodes to generate the memory regions. Signed-off-by: Jordan Yates <[email protected]>
Define the FLASH_CCFG memory region from a devicetree partition instead of from math in the linker file. Removing the special math case results in the FLASH_CCFG region overlapping the FLASH region, but the linker accepts this until the FLASH region actually starts placing variables in the FLASH_CCFG region. As a result, applications that don't fit in (FLASH_SIZE - 88) bytes will still fail to link, just with an overlapping memory region error instead of an overflow error. Signed-off-by: Jordan Yates <[email protected]>
Move the TI_CCFG linker section code into a dedicated snippet in the soc directory. Signed-off-by: Jordan Yates <[email protected]>
erwango
approved these changes
Apr 12, 2021
tejlmand
approved these changes
Apr 14, 2021
MaureenHelm
approved these changes
Apr 14, 2021
carlescufi
approved these changes
Apr 15, 2021
|
Nice work here - sorry I had no chance to review this. |
|
Turns out this broke code relocation to these regions, as the relocation script expects |
|
@MaureenHelm is there a sample which produces the error, or can be modified to produce it? |
|
@JordanYates the relocate script uses the |
|
@pdgendt thanks for that link, can you provide a board & sample which fails to build? |
|
@JordanYates you can build |
MaureenHelm
pushed a commit
that referenced
this pull request
Apr 16, 2021
With the addition of #34185, it is not longer gauranteed that for a memory region `NAME` there exists a symbol `NAME_ADDR`. Use the linker builtin function `ORIGIN` to instead directly get the start address of the selected memory region. Signed-off-by: Jordan Yates <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Generating linker memory regions from devicetree nodes is a common pattern in the linker script. This PR adds a macro which automatically generates a region given a devicetree node. The macro is then used in the linker script to cleanup definitions.
Dedicated devicetree nodes are created for SRAM1 and SRAM2 for the STM32WB family to facilitate macro usage.
The TI_CCFG registers are redefined as a partition on
flash0to enable more cleanup.