diff options
| author | Jonas Karlman <jonas@kwiboo.se> | 2023-08-20 22:03:18 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-09-23 12:31:25 -0600 |
| commit | 9e644284ab812f2db23f6185af77c0e771b0be73 (patch) | |
| tree | 5d0da06f16449be8a130301b008676fa59ffd83a | |
| parent | b05a184379631d13c4a49e423aa1324dc1ae6158 (diff) | |
| download | u-boot-9e644284ab812f2db23f6185af77c0e771b0be73.zip u-boot-9e644284ab812f2db23f6185af77c0e771b0be73.tar.gz u-boot-9e644284ab812f2db23f6185af77c0e771b0be73.tar.bz2 | |
dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation
Nodes with bootph-pre-sram/ram props are bound in multiple phases:
1. At TPL (bootph-pre-sram) or SPL (bootph-pre-ram) phase
2. At U-Boot proper pre-relocation phase
3. At U-Boot proper normal phase
However the binding and U-Boot Driver Model documentation indicate that
only nodes marked with bootph-all or bootph-some-ram should be bound in
the U-Boot proper pre-relocation phase.
Change ofnode_pre_reloc to report a node with bootph-pre-ram/sram prop
with a pre-reloc status only after U-Boot proper pre-relocation phase.
Also update the ofnode_pre_reloc documentation to closer reflect the
binding and driver model documentation.
This changes behavior of what nodes are bound in the U-Boot proper
pre-relocation phase. Change to bootph-all or add bootph-some-ram prop
to restore prior behavior.
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/ofnode.c | 2 | ||||
| -rw-r--r-- | include/dm/ofnode.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index ff0a5b5..2cafa7b 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -1383,7 +1383,7 @@ bool ofnode_pre_reloc(ofnode node) */ if (ofnode_read_bool(node, "bootph-pre-ram") || ofnode_read_bool(node, "bootph-pre-sram")) - return true; + return gd->flags & GD_FLG_RELOC; if (IS_ENABLED(CONFIG_OF_TAG_MIGRATE)) { /* detect and handle old tags */ diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 06ea68e..06c969c 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -1211,15 +1211,15 @@ int ofnode_read_simple_size_cells(ofnode node); * determine if a node was bound in one of SPL/TPL stages. * * There are 4 settings currently in use - * - bootph-some-ram: U-Boot proper pre-relocation only + * - bootph-some-ram: U-Boot proper pre-relocation phase * - bootph-all: all phases * Existing platforms only use it to indicate nodes needed in * SPL. Should probably be replaced by bootph-pre-ram for new platforms. - * - bootph-pre-ram: SPL and U-Boot pre-relocation - * - bootph-pre-sram: TPL and U-Boot pre-relocation + * - bootph-pre-ram: SPL phase + * - bootph-pre-sram: TPL phase * * @node: node to check - * Return: true if node is needed in SPL/TL, false otherwise + * Return: true if node should be or was bound, false otherwise */ bool ofnode_pre_reloc(ofnode node); |