[U-Boot] [PATCH] Ensure device tree DTS is compiled
Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image.
Signed-off-by: James Balean james@balean.com.au --- dts/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/dts/Makefile b/dts/Makefile index c4ac153..6dfaf57 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -12,10 +12,14 @@ ifeq ($(DEVICE_TREE),) DEVICE_TREE := unset endif
+ARCH_PATH := arch/$(ARCH)/dts +dtb_depends := arch-dtbs + ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else -DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb +DTB := $(ARCH_PATH)/dts/$(DEVICE_TREE).dtb +dtb_depends += $(DTB:.dtb=.dts) endif
$(obj)/dt.dtb: $(DTB) FORCE @@ -23,7 +27,10 @@ $(obj)/dt.dtb: $(DTB) FORCE
targets += dt.dtb
-$(DTB): arch-dtbs +$(DTB): $(dtb_depends) +ifeq ($(EXT_DTB),) + $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@ +endif $(Q)test -e $@ || ( \ echo >&2; \ echo >&2 "Device Tree Source is not correctly specified."; \ @@ -33,7 +40,7 @@ $(DTB): arch-dtbs /bin/false)
arch-dtbs: - $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs + $(Q)$(MAKE) $(build)=$(ARCH_PATH)/dts dtbs
.SECONDARY: $(obj)/dt.dtb.S
On Tue, Mar 14, 2017 at 7:38 AM, James Balean james@balean.com.au wrote:
Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image.
+ARCH_PATH := arch/$(ARCH)/dts
+DTB := $(ARCH_PATH)/dts/$(DEVICE_TREE).dtb
dts/dts ?
$(Q)$(MAKE) $(build)=$(ARCH_PATH)/dts dtbs
Ditto.
On Wed, 15 Mar 2017 at 03:41, Andy Shevchenko andy.shevchenko@gmail.com wrote:
dts/dts ?
You're right. Thank you for identifying my clumsy commit error, Andy.
-- James Balean
Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image.
Signed-off-by: James Balean james@balean.com.au Cc: Andy Shevchenko andriy.shevchenko@linux.intel.com Cc: Simon Glass sjg@chromium.org --- Changes for v2: - Removed trailing '/dts' from paths containing ARCH_PATH
dts/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/dts/Makefile b/dts/Makefile index c4ac153..6dfaf57 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -12,10 +12,14 @@ ifeq ($(DEVICE_TREE),) DEVICE_TREE := unset endif
+ARCH_PATH := arch/$(ARCH)/dts +dtb_depends := arch-dtbs + ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else -DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb +DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb +dtb_depends += $(DTB:.dtb=.dts) endif
$(obj)/dt.dtb: $(DTB) FORCE @@ -23,7 +27,10 @@ $(obj)/dt.dtb: $(DTB) FORCE
targets += dt.dtb
-$(DTB): arch-dtbs +$(DTB): $(dtb_depends) +ifeq ($(EXT_DTB),) + $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@ +endif $(Q)test -e $@ || ( \ echo >&2; \ echo >&2 "Device Tree Source is not correctly specified."; \ @@ -33,7 +40,7 @@ $(DTB): arch-dtbs /bin/false)
arch-dtbs: - $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs + $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs
.SECONDARY: $(obj)/dt.dtb.S
On 15 March 2017 at 22:11, James Balean james@balean.com.au wrote:
Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image.
Signed-off-by: James Balean james@balean.com.au Cc: Andy Shevchenko andriy.shevchenko@linux.intel.com Cc: Simon Glass sjg@chromium.org
Changes for v2:
- Removed trailing '/dts' from paths containing ARCH_PATH
dts/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
Applied to u-boot-dm, thanks!
2017-03-27 11:27 GMT+09:00 Simon Glass sjg@chromium.org:
On 15 March 2017 at 22:11, James Balean james@balean.com.au wrote:
Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image.
Signed-off-by: James Balean james@balean.com.au Cc: Andy Shevchenko andriy.shevchenko@linux.intel.com Cc: Simon Glass sjg@chromium.org
Changes for v2:
- Removed trailing '/dts' from paths containing ARCH_PATH
dts/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
Applied to u-boot-dm, thanks! _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Since this patch was applied, I see annoying "is up to date" log every time.
grep __rel_dyn_end | cut -f 1 -d ' '); tools/relocate-rela u-boot-nodtb.bin 0x84000000 $start $end DTC arch/arm/dts/uniphier-ld11-ref.dtb DTC arch/arm/dts/uniphier-ld20-ref.dtb make[2]: `arch/arm/dts/uniphier-ld11-ref.dtb' is up to date. SHIPPED dts/dt.dtb CAT u-boot-dtb.bin COPY u-boot.bin SYM u-boot.sym MKIMAGE u-boot.img COPY u-boot.dtb MKIMAGE u-boot-dtb.img CFGCHK u-boot.cfg
I could not understand what you wanted to achieve with this patch.
Could you explain?
Hi Masahiro,
On 25 April 2017 at 19:02, Masahiro Yamada yamada.masahiro@socionext.com wrote:
2017-03-27 11:27 GMT+09:00 Simon Glass sjg@chromium.org:
On 15 March 2017 at 22:11, James Balean james@balean.com.au wrote:
Enables custom DTS files, or those not associated with a specific target, to be compiled into a boot image.
Signed-off-by: James Balean james@balean.com.au Cc: Andy Shevchenko andriy.shevchenko@linux.intel.com Cc: Simon Glass sjg@chromium.org
Changes for v2:
- Removed trailing '/dts' from paths containing ARCH_PATH
dts/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
Applied to u-boot-dm, thanks! _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Since this patch was applied, I see annoying "is up to date" log every time.
grep __rel_dyn_end | cut -f 1 -d ' '); tools/relocate-rela u-boot-nodtb.bin 0x84000000 $start $end DTC arch/arm/dts/uniphier-ld11-ref.dtb DTC arch/arm/dts/uniphier-ld20-ref.dtb make[2]: `arch/arm/dts/uniphier-ld11-ref.dtb' is up to date. SHIPPED dts/dt.dtb CAT u-boot-dtb.bin COPY u-boot.bin SYM u-boot.sym MKIMAGE u-boot.img COPY u-boot.dtb MKIMAGE u-boot-dtb.img CFGCHK u-boot.cfg
I could not understand what you wanted to achieve with this patch.
Could you explain?
I have not seen any followup on this thread.
Feel free to send a revert if you think that is warranted.
Regards, Simon
participants (5)
-
Andy Shevchenko -
James -
James Balean
-
Masahiro Yamada -
Simon Glass