[U-Boot] [PATCH] [build] Automatically build the device tree if DEV_TREE_SEPARATE is set

This change makes the u-boot "all" target build the separate device tree if DEV_TREE_SEPARATE is set. This use of DEV_TREE_SEPARATE is consistent with the one other use in the u-boot build system. It's at least expedient and perhaps necessary to build the device tree this way since it's difficult to know the value of $(obj) when invoking make.
Signed-off-by: Gabe Black gabeblack@chromium.org --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile index 294c762..654e07e 100644 --- a/Makefile +++ b/Makefile @@ -371,6 +371,10 @@ $(obj)u-boot.dtb: $(obj)u-boot $(MAKE) -C dts binary mv $(obj)dts/dt.dtb $@
+ifdef DEV_TREE_SEPARATE +all: $(obj)u-boot.dtb +endif + $(obj)u-boot-dtb.bin: $(obj)u-boot.bin $(obj)u-boot.dtb cat $^ >$@

On Tuesday 08 November 2011 04:15:32 Gabe Black wrote:
This change makes the u-boot "all" target build the separate device tree if DEV_TREE_SEPARATE is set. This use of DEV_TREE_SEPARATE is consistent with the one other use in the u-boot build system. It's at least expedient and perhaps necessary to build the device tree this way since it's difficult to know the value of $(obj) when invoking make.
i don't see anyone else using DEV_TREE_SEPARATE. we already have CONFIG_OF_SEPARATE which causes the .dtb to be generated.
Simon: any idea what's up ? -mike

Hi Mike,
On Tue, Nov 8, 2011 at 5:51 AM, Mike Frysinger vapier@gentoo.org wrote:
On Tuesday 08 November 2011 04:15:32 Gabe Black wrote:
This change makes the u-boot "all" target build the separate device tree if DEV_TREE_SEPARATE is set. This use of DEV_TREE_SEPARATE is consistent with the one other use in the u-boot build system. It's at least expedient and perhaps necessary to build the device tree this way since it's difficult to know the value of $(obj) when invoking make.
i don't see anyone else using DEV_TREE_SEPARATE. we already have CONFIG_OF_SEPARATE which causes the .dtb to be generated.
Simon: any idea what's up ? -mike
Yes, in the Chromium tree I put .dtb generation in the Makefile, since it was planned for upstream. It was removed in this change:
https://gerrit.chromium.org/gerrit/#change,4267
So if we ignore that one, I don't think Gabe's change in this email is necessary upstream, but we may need to consider a way to have CONFIG_OF_SEPARATE not build a dtb. Let's see how we go.
Regards, Simon
participants (3)
-
Gabe Black
-
Mike Frysinger
-
Simon Glass