boot/uboot: Generate BOOT.BIN file when building for Xilinx Zynq

This commit integrates generation of a bootable image
for Xilinx Zynq. The generation is independent on Xilinx
flow and utilizes the host-zynq-boot-bin package. The only
required step is to generate a proper U-Boot SPL (instead
of the FSBL).

The SPL generation might work when providing the working
ps7_init.c file to U-Boot. However, from U-Boot 2015.07
a set of generic ps7_init.c files is included and used to
build the U-Boot SPL for various boards. The ps7_init.c file
has been released under GNU/GPL license for this purpose.
For details, see

http://lists.denx.de/pipermail/u-boot/2015-April/210664.html

The SPL searchs for u-boot-dtb.img when booting so we
enforce using of the BR2_TARGET_UBOOT_FORMAT_DTB_IMG format.

[Thomas: remove select of BR2_PACKAGE_HOST_ZYNQ_BOOT_BIN, since this
option no longer exists.]

Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index f0c00946908d8f6fde8c650e70f1d279e0f90dca..6d8fa6aff3ac3632378e64deeebbeb36efab572d 100644 (file)
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -272,6 +272,18 @@ config BR2_TARGET_UBOOT_SPL_NAME
          u-boot build. For most platform it is spl/u-boot-spl.bin
          but not always. It is MLO on OMAP for example.
 
+config BR2_TARGET_UBOOT_ZYNQ_IMAGE
+       bool "Generate image for Xilinx Zynq"
+       depends on BR2_arm
+       depends on BR2_TARGET_UBOOT_SPL
+       depends on BR2_TARGET_UBOOT_FORMAT_DTB_IMG
+       help
+        Generate the BOOT.BIN file from U-Boot's SPL. The image
+        boots the Xilinx Zynq chip without any FPGA bitstream.
+        A bitstream can be loaded by the U-Boot. The SPL searchs
+        for u-boot-dtb.img file so this U-Boot format is required
+        to be set.
+
 menuconfig BR2_TARGET_UBOOT_ENVIMAGE
        bool "Environment image"
        help

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 805367807d5361b482917f092f845fc8486826b3..042e066a21f164e90ab6e320cc076a2e99648ebd 100644 (file)
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -182,6 +182,16 @@ UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
 UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y)
+define UBOOT_GENERATE_ZYNQ_IMAGE
+       $(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/zynq-boot-bin.py \
+               -u $(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))     \
+               -o $(BINARIES_DIR)/BOOT.BIN
+endef
+UBOOT_DEPENDENCIES += host-zynq-boot-bin
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE
+endif
+
 ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y)
 ifeq ($(BR_BUILDING),y)
 ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),)