This reverts commit 9e644284ab812f2db23f6185af77c0e771b0be73. --- drivers/core/ofnode.c | 2 +- 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 21a233f90f..cc2029e62d 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -1485,7 +1485,7 @@ bool ofnode_pre_reloc(ofnode node) */ if (ofnode_read_bool(node, "bootph-pre-ram") || ofnode_read_bool(node, "bootph-pre-sram")) - return gd->flags & GD_FLG_RELOC; + return true;
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 5795115c49..5f1c8c2787 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -1254,15 +1254,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 phase + * - bootph-some-ram: U-Boot proper pre-relocation only * - 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 phase - * - bootph-pre-sram: TPL phase + * - bootph-pre-ram: SPL and U-Boot pre-relocation + * - bootph-pre-sram: TPL and U-Boot pre-relocation * * @node: node to check - * Return: true if node should be or was bound, false otherwise + * Return: true if node is needed in SPL/TL, false otherwise */ bool ofnode_pre_reloc(ofnode node);