diff options
author | Tom Rini <trini@ti.com> | 2014-05-24 06:34:08 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-05-24 06:34:08 -0400 |
commit | 9665fa8f9e1488209d5e01d0792c243e0a220c5a (patch) | |
tree | 5b13beefbc83e8576ad97a810cbf9c49d78d7af7 /Makefile | |
parent | e75e73dd5f280b91f5bfc0a76a0fd09b6eba1c66 (diff) | |
parent | 33144ea443c298ac9d6f04926a02881a5bae91a3 (diff) | |
download | u-boot-imx-9665fa8f9e1488209d5e01d0792c243e0a220c5a.zip u-boot-imx-9665fa8f9e1488209d5e01d0792c243e0a220c5a.tar.gz u-boot-imx-9665fa8f9e1488209d5e01d0792c243e0a220c5a.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -753,6 +753,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:"%"=%) @@ -855,6 +858,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 |