[U-Boot] [PATCH 2/4] zynq: load u-boot-dtb.img for SD boot

[Michal Simek]

On 05/14/2014 02:55 PM, Masahiro Yamada wrote:
> Because Zynq enables CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE
> by default, CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME should be
> "u-boot-dtb.img", not "u-boot.img".
> 
> Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
> Cc: Michal Simek <michal.simek at xilinx.com>
> ---
> 
>  include/configs/zynq-common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 731e69b..38e3d54 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -253,7 +253,7 @@
>  #define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION    1
>  #define CONFIG_SPL_LIBDISK_SUPPORT
>  #define CONFIG_SPL_FAT_SUPPORT
> -#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot.img"
> +#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot-dtb.img"

Here should be just for sure.
#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_OF_SEPARATE)
# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot-dtb.img"
#else
# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME     "u-boot.img"
#endif

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140514/ab9e25f6/attachment.pgp>