diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:23 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:23 +0200 |
| commit | c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb (patch) | |
| tree | 7c00728aa9d0c4cecf2d9203eebc093dbebbc07a /Makefile | |
| parent | 10dc77716f41979e03baf3b847b97dc7279ef30d (diff) | |
| parent | 9f9d41bad16efe0674257b4efe4db1a399f93643 (diff) | |
| download | blackbird-obmc-uboot-c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb.tar.gz blackbird-obmc-uboot-c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb.zip | |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -752,6 +752,9 @@ ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin ALL-$(CONFIG_OF_SEPARATE) += u-boot.dtb u-boot-dtb.bin +ifeq ($(CONFIG_SPL_FRAMEWORK),y) +ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.img +endif ALL-$(CONFIG_OF_HOSTFILE) += u-boot.dtb ifneq ($(CONFIG_SPL_TARGET),) ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) @@ -854,6 +857,11 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE $(call if_changed,mkimage) +MKIMAGEFLAGS_u-boot-dtb.img = $(MKIMAGEFLAGS_u-boot.img) + +u-boot-dtb.img: u-boot-dtb.bin FORCE + $(call if_changed,mkimage) + u-boot.sha1: u-boot.bin tools/ubsha1 u-boot.bin |
