| Message ID | 1460584346-5200-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 7f307d93ed147fc831425189463d92e50d5c7566 |
| Headers | show |
Hi Michal, Does this patch look good? or does it have impact on your customers? 2016-04-14 6:52 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device > tree"), u-boot-dtb.img is identical to u-boot.img, so SPL can always > load u-boot.img whether CONFIG_OF_SEPARATE is defined or not. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > include/configs/zynq-common.h | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h > index 49d9fd0..3b5cd5b 100644 > --- a/include/configs/zynq-common.h > +++ b/include/configs/zynq-common.h > @@ -339,11 +339,7 @@ > #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 > #define CONFIG_SPL_LIBDISK_SUPPORT > #define CONFIG_SPL_FAT_SUPPORT > -#ifdef CONFIG_OF_SEPARATE > -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" > -#else > -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" > -#endif > +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" > #endif > > /* Disable dcache for SPL just for sure */ > -- > 1.9.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot -- Best Regards Masahiro Yamada _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 49d9fd0..3b5cd5b 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -339,11 +339,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#ifdef CONFIG_OF_SEPARATE -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" -#else -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#endif +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif /* Disable dcache for SPL just for sure */
Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree"), u-boot-dtb.img is identical to u-boot.img, so SPL can always load u-boot.img whether CONFIG_OF_SEPARATE is defined or not. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- include/configs/zynq-common.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot