diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-03-31 09:50:35 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-04-02 10:45:35 +0200 |
| commit | e64348f5eb4aef7e119a46b97bdba2cc9cb15fc5 (patch) | |
| tree | c09c153778e922eda568f68a78a8dac0a4589cb5 | |
| parent | bb2637be096b842ee25b96c7cfe4f26e55fb7026 (diff) | |
imx: add rules for U-Boot DTB support
Signed-off-by: Stefano Babic <sbabic@denx.de>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | arch/arm/config.mk | 4 | ||||
| -rw-r--r-- | arch/arm/imx-common/Makefile | 8 |
3 files changed, 15 insertions, 3 deletions
@@ -757,6 +757,9 @@ dtbs dts/dt.dtb: checkdtc u-boot u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE $(call if_changed,cat) +%.imx: %.bin + $(Q)$(MAKE) $(build)=arch/arm/imx-common $@ + quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ @@ -810,9 +813,6 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(CONFIG_SYS_FSL_PBL_RCW) \ u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE $(call if_changed,mkimage) -u-boot.imx: u-boot.bin - $(Q)$(MAKE) $(build)=arch/arm/imx-common $@ - u-boot.sha1: u-boot.bin tools/ubsha1 u-boot.bin diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 17b7408835..5bd39617bb 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -119,6 +119,10 @@ ifndef CONFIG_SPL_BUILD ALL-y += SPL endif else +ifeq ($(CONFIG_OF_SEPARATE),y) +ALL-y += u-boot-dtb.imx +else ALL-y += u-boot.imx endif endif +endif diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 16809fee5f..025cfed84a 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -42,6 +42,14 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \ u-boot.imx: u-boot.bin $(IMX_CONFIG) FORCE $(call if_changed,mkimage) +ifeq ($(CONFIG_OF_SEPARATE),y) +MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \ + -e $(CONFIG_SYS_TEXT_BASE) + +u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) FORCE + $(call if_changed,mkimage) +endif + MKIMAGEFLAGS_SPL = -n $(filter-out $< $(PHONY),$^) -T imximage \ -e $(CONFIG_SPL_TEXT_BASE) |