arm: socfpga: stratix10: Add CONFIG_OF_EMBED
PATCH v3 1/1 arm: socfpga: stratix10: Add CONFIG_OF_EMBED
The dtb should be embedded in the u-boot-spl image so that the CONFIG_SPL_TARGET of spl/u-boot-spl.hex includes it.
This also affects the main u-boot image, so adjust CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to u-boot.img which now also includes the dtb.
---
v2:
-> use savedefconfig output for new defconfig -> fix typo in commit message
--- configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
configs/socfpga_stratix10_defconfig +1 -0
@@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y
include/configs/socfpga_stratix10_socdk.h +1 -1
@@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"#endif /* __CONFIG_H */
Signature · 1 line
2.17.1
Marek Vasut
AppliedPATCH v3 1/1 arm: socfpga: stratix10: Add CONFIG_OF_EMBED
Quoted 8 lines · Dalon Westergreen
The dtb should be embedded in the u-boot-spl image so that the
CONFIG_SPL_TARGETof spl/u-boot-spl.hex includes it.This also affects the main u-boot image, so adjust
CONFIG_SPL_FS_LOAD_PAYLOAD_NAMEto u-boot.img which now also includes the dtb.Signed-off-by Dalon Westergreen <[email protected]>
Applied, thanks. I'll run it through CI for a bit.
Quoted 34 lines
---
v2:
-> use savedefconfig output for new defconfig -> fix typo in commit message--- configs/socfpga_stratix10_defconfig | 1 + include/configs/socfpga_stratix10_socdk.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)configs/socfpga_stratix10_defconfig +1
-0@@ -26,6 +26,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=yinclude/configs/socfpga_stratix10_socdk.h +1
-1@@ -216,6 +216,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void);/* SPL SDMMC boot support */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"#endif /* __CONFIG_H */
Signature · 2 lines
Best regards, Marek Vasut