On 09/12/2018 01:55 AM, Dalon L Westergreen wrote: > On Tue, 2018-09-11 at 23:55 +0200, Marek Vasut wrote: >> On 09/10/2018 07:28 PM, Dalon Westergreen wrote: >> 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. >> >> Signed-off-by: Dalon Westergreen <dwest...@gmail.com >> <mailto:dwest...@gmail.com>> >> --- >> configs/socfpga_stratix10_defconfig | 1 + >> include/configs/socfpga_stratix10_socdk.h | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/configs/socfpga_stratix10_defconfig >> b/configs/socfpga_stratix10_defconfig >> index c27985ad43..b6d804f38e 100644 >> --- a/configs/socfpga_stratix10_defconfig >> +++ b/configs/socfpga_stratix10_defconfig >> @@ -56,3 +56,4 @@ CONFIG_DM_USB=y >> CONFIG_USB_DWC2=y >> CONFIG_USB_STORAGE=y >> CONFIG_USE_TINY_PRINTF=y >> +CONFIG_OF_EMBED=y >> >> Did make savedefconfig put this here ? > > No, i put it there myself
You should always run make savedefconfig to update the defconfig instead of ad-hoc hacking the value at random place. >> I am fine with this patch, but if Simon has any objections, let's hear them. > > great! > >> >> diff --git a/include/configs/socfpga_stratix10_socdk.h >> b/include/configs/socfpga_stratix10_socdk.h >> index 91315a0031..e190b3d988 100644 >> --- a/include/configs/socfpga_stratix10_socdk.h >> +++ b/include/configs/socfpga_stratix10_socdk.h >> @@ -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 */ >> >> >> >> -- Best regards, Marek Vasut _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
