Commit 0d1e8aacb809846dbc0b5ccba425ed53648fd874
Committed by
Tom Rini
1 parent
ed1ca528aa
Exists in
master
and in
49 other branches
kbuild: get back DTB at the top directory
Commit 6ab6b2af deleted ./u-boot.dtb because it was a copy of dts/dt.dtb. But Simon suggested to keep u-boot.dtb at the top directory because it is a build output. After discussions, we agreed on revival of ./u-boot.dtb. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com> Acked-by: Simon Glass <sjg@chromium.org>
Showing 1 changed file with 7 additions and 1 deletions Side-by-side Diff
Makefile
... | ... | @@ -721,7 +721,7 @@ |
721 | 721 | ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin |
722 | 722 | ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img |
723 | 723 | ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin |
724 | -ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.bin | |
724 | +ALL-$(CONFIG_OF_SEPARATE) += u-boot.dtb u-boot-dtb.bin | |
725 | 725 | ifneq ($(CONFIG_SPL_TARGET),) |
726 | 726 | ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) |
727 | 727 | endif |
... | ... | @@ -766,6 +766,12 @@ |
766 | 766 | |
767 | 767 | u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE |
768 | 768 | $(call if_changed,cat) |
769 | + | |
770 | +quiet_cmd_copy = COPY $@ | |
771 | + cmd_copy = cp $< $@ | |
772 | + | |
773 | +u-boot.dtb: dts/dt.dtb | |
774 | + $(call cmd,copy) | |
769 | 775 | |
770 | 776 | OBJCOPYFLAGS_u-boot.hex := -O ihex |
771 | 777 |