Message ID | 20180912002500.9932-1-dwesterg@gmail.com |
---|---|
State | Accepted |
Commit | f6d600b39bfc9a9402bcb393e706407b109d00e7 |
Delegated to: | Marek Vasut |
Headers | show |
Series | [U-Boot,v3] arm: socfpga: stratix10: Add CONFIG_OF_EMBED | expand |
On 09/12/2018 02:25 AM, 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 <dwesterg@gmail.com> Applied, thanks. I'll run it through CI for a bit. > --- > 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(-) > > diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig > index a8b6f92b3d..d03fe60361 100644 > --- a/configs/socfpga_stratix10_defconfig > +++ b/configs/socfpga_stratix10_defconfig > @@ -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 > 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 */ >
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index a8b6f92b3d..d03fe60361 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -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 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 */
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 <dwesterg@gmail.com> --- 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(-)