riscv: Source flash geometry from Kconfig #97144
Open
+18
−26
Conversation
This file contains hidden or 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
zephyrbot
added
area: Architectures
platform: LiteX
area: Boards/SoCs
area: RISCV
zephyrbot
requested review from
VynDragon,
dcpleung,
edersondisouza,
fkokosinski,
katsuster,
kgugala,
maass-hamburg,
masz-nordic,
mgielda,
nashif,
npitre,
tgorochowik and
ycsin
maass-hamburg
requested changes
Oct 7, 2025
| DT_CHOSEN_FLASH_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE)) | ||
|
|
||
| config FLASH_SIZE | ||
| default $(dt_node_reg_size_int,$(DT_CHOSEN_FLASH_PARENT),9,K) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),$(DT_COMPAT_JEDEC_SPI_NOR))) |
There was a problem hiding this comment.
even tho this soc is the only in tree usage of it, we don't want to break behavior for out of tree boards and socs, therefore this should also be part of the Kconfig of riscv.
There was a problem hiding this comment.
Maybe update arch/riscv/Kconfig like:
DT_CHOSEN_Z_FLASH := zephyr,flash
DT_COMPAT_JEDEC_SPI_NOR := jedec,spi-nor
+DT_COMPAT_LITEX_SPI_LITESPI := litex,spi-litespi
DT_CHOSEN_FLASH_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_FLASH))
DT_CHOSEN_FLASH_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE))
config FLASH_SIZE
default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),soc-nv-flash))
+ default $(dt_node_reg_size_int,$(DT_CHOSEN_FLASH_PARENT),9,K) if (XIP && $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_LITEX_SPI_LITESPI)))
default $(dt_node_reg_size_int,$(DT_CHOSEN_FLASH_PARENT),1,K) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),$(DT_COMPAT_JEDEC_SPI_NOR)))
config FLASH_BASE_ADDRESS
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),soc-nv-flash))
+ default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),9) if (XIP && $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_LITEX_SPI_LITESPI)))
default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),1) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),$(DT_COMPAT_JEDEC_SPI_NOR)))
There was a problem hiding this comment.
modified per the recommendation.
There was a problem hiding this comment.
Isn't this already handled by both of these symbols' default values when used in conjunction with zephyr,flash (with XIP being y-selected) in the chosen node?
fsammoura1980
force-pushed
the
fix_base_address
branch
from
950c7fc to
1a56797
Compare
Move the logic for determining flash base address and size from the RISC-V common linker script to Kconfig. The new Kconfig options CONFIG_FLASH_BASE_ADDRESS and CONFIG_FLASH_SIZE are now the source of truth for the linker script. These options are given default values derived from the devicetree, supporting both "soc-nv-flash", "jedec,spi-nor", and "litex,spi-litespi" flash types. This change simplifies the linker script and consolidates the flash geometry configuration within the Kconfig system. Signed-off-by: Firas Sammoura <[email protected]>
fsammoura1980
force-pushed
the
fix_base_address
branch
from
1a56797 to
a7335a3
Compare
|
fkokosinski
reviewed
Oct 10, 2025
| #endif | ||
|
|
||
| #endif /* DT_NODE_HAS_COMPAT_STATUS */ | ||
| #endif /* ROM_SIZE*/ |
There was a problem hiding this comment.
Looks like this comment is wrong?
Suggested change
| #endif /* ROM_SIZE*/ | |
| #endif /* CONFIG_XIP */ |
maass-hamburg
requested changes
Oct 10, 2025
Comment on lines
+536
to
+543
| default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),soc-nv-flash)) | ||
| default $(dt_node_reg_size_int,$(DT_CHOSEN_FLASH_PARENT),9,K) if (XIP && $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_LITEX_SPI_LITESPI))) | ||
| default $(dt_node_reg_size_int,$(DT_CHOSEN_FLASH_PARENT),1,K) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),$(DT_COMPAT_JEDEC_SPI_NOR))) | ||
|
|
||
| config FLASH_BASE_ADDRESS | ||
| default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),soc-nv-flash)) | ||
| default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),9) if (XIP && $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_LITEX_SPI_LITESPI))) | ||
| default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),1) if (XIP && $(dt_chosen_has_compat,$(DT_CHOSEN_Z_FLASH),$(DT_COMPAT_JEDEC_SPI_NOR))) |
There was a problem hiding this comment.
the reg-name ("flash_mmap") has to be checked. The position is completely irrelevant.
in Litex this changed already a few times and it also depends on the configuration.
Also that prop might not be used drom the litex litespi driver in tree, but out of tree users could have also used it for others.
There was a problem hiding this comment.
was added here: #73482 for more context
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Move the logic for determining flash base address and size from the RISC-V common linker script to Kconfig.
The new Kconfig options CONFIG_FLASH_BASE_ADDRESS and CONFIG_FLASH_SIZE are now the source of truth for the linker script. These options are given default values derived from the devicetree, supporting both "soc-nv-flash" and "jedec,spi-nor" flash types.
SoC-specific defaults for litex_vexriscv with JEDEC SPI NOR flash have also been added.
This change simplifies the linker script and consolidates the flash geometry configuration within the Kconfig system.