On Tue, Jun 4, 2019 at 1:57 AM Dalon Westergreen <dalon.westergr...@linux.intel.com> wrote: > > From: Dalon Westergreen <dalon.westergr...@intel.com> > > CONFIG_OF_EMBED was primarily enabled to support the stratix10 > spl hex file requirements. Since this option now produces a > warning during build, and the spl hex can be created using > alternate methods, CONFIG_OF_EMBED is no longer needed. > > Signed-off-by: Dalon Westergreen <dalon.westergr...@intel.com> > > --- > Changes in v2: > -> Change CONFIG_SPL_TARGET back to u-boot-spl.hex > --- > configs/socfpga_stratix10_defconfig | 1 - > include/configs/socfpga_stratix10_socdk.h | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/configs/socfpga_stratix10_defconfig > b/configs/socfpga_stratix10_defconfig > index fbab388b43..f27180385d 100644 > --- a/configs/socfpga_stratix10_defconfig > +++ b/configs/socfpga_stratix10_defconfig > @@ -26,7 +26,6 @@ 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 > diff --git a/include/configs/socfpga_stratix10_socdk.h > b/include/configs/socfpga_stratix10_socdk.h > index 39d757d737..66855ff0d8 100644 > --- a/include/configs/socfpga_stratix10_socdk.h > +++ b/include/configs/socfpga_stratix10_socdk.h > @@ -210,6 +210,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.img" > +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
Is that really necessary? I don't have the aarch64 compiler at hand, but when compiling a gen5 board, "u-boot.img" and "u-boot-dtb.img" are the same. Changing to "u-boot-dtb.img" here only complicates things for the user, I think. Regards, Simon > > #endif /* __CONFIG_H */ > -- > 2.21.0 > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
