There is a preference to use the "ofnode" API for FDT fixups moving forward. The FDT fixup will usually be for the kernel FDT. To fixup the kernel FDT with the ofnode API, it's required to set the OFNODE_MULTI_TREE option.
To ensure existing users of kaslr fdt fixup are not impacted, Let's modify the default value for OFNODE_MULTI_TREE to ensure it's always set. This will cause a 1007 byte increase in the code size.
Signed-off-by: Sean Edmond seanedmond@microsoft.com Reviewed-by: Simon Glass sjg@chromium.org
---
(no changes since v5)
Changes in v5: - Always enable OFNODE_MULTI_TREE
Changes in v4: - Fix compile issue when CONFIG_OF_CONTROL not set
Changes in v2: - Change default config for OFNODE_MULTI_TREE (y if !OF_LIVE)
drivers/core/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 737d4590d5b..c01a8dc7e0a 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -423,7 +423,8 @@ config DM_DEV_READ_INLINE
config OFNODE_MULTI_TREE bool "Allow the ofnode interface to access any tree" - default y if EVENT && !DM_DEV_READ_INLINE && !DM_INLINE_OFNODE + depends on OF_CONTROL + default y help Normally U-Boot makes use of its control FDT, the one used to bind devices and provide options. In some cases, U-Boot must also process