[PATCH] [sim,moxie] Fix DTB generation mechanism and build failure

Luis Machado luis.machado@linaro.org
Wed Apr 7 19:39:29 GMT 2021


I ran into a build failure with --enable-targets=all due to the fact that
the moxie sim expects to be able to use the dtc tool.  If it isn't available,
the builds fails.

Given the device tree compiler (dtc) is not available everywhere, it seems
fair to only generate the DTB file on the spot if we have such a tool.  For
those who don't have the tool available, we can use a prebuilt version of the
DTB available in the repository.

The DTS file hasn't changed since ~2009, so it seems pretty safe to assume
a prebuilt version is suitable to be used.

I also checked that the DTB file generated on an x86_64-Linux machine is the
the same as the one generated on an AArch64-Linux machine.

Tested by running make/make install with/without the dtc tool.
---
 sim/moxie/Makefile.in   |  12 ++++++++++--
 sim/moxie/moxie-gdb.dtb | Bin 0 -> 519 bytes
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 sim/moxie/moxie-gdb.dtb

diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index ee513867290..65c41e6c2ac 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -17,6 +17,8 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
+DTC = @DTC@
+
 dtbdir = @datadir@/gdb/dtb
 
 SIM_OBJS = \
@@ -33,8 +35,14 @@ SIM_EXTRA_CFLAGS = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\""
 all: moxie-gdb.dtb
 
 moxie-gdb.dtb: moxie-gdb.dts
-	dtc -O dtb -o moxie-gdb.dtb ${srcdir}/moxie-gdb.dts
+	if test "x$(DTC)" != x; then \
+	  $(DTC) -O dtb -o moxie-gdb.dtb ${srcdir}/moxie-gdb.dts ; \
+	fi ;
 
 install-dtb: moxie-gdb.dtb
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(dtbdir)
-	$(INSTALL_DATA) moxie-gdb.dtb $(DESTDIR)$(dtbdir)/moxie-gdb.dtb
+	if test "x$(DTC)" = x; then \
+	  $(INSTALL_DATA) $(srcdir)/moxie-gdb.dtb $(DESTDIR)$(dtbdir)/moxie-gdb.dtb ; \
+	else \
+	  $(INSTALL_DATA) moxie-gdb.dtb $(DESTDIR)$(dtbdir)/moxie-gdb.dtb ; \
+	fi ;
diff --git a/sim/moxie/moxie-gdb.dtb b/sim/moxie/moxie-gdb.dtb
new file mode 100644
index 0000000000000000000000000000000000000000..4c7e4570438a62b81df2021bb4c955d9888d2a8b
GIT binary patch
literal 519
zcmZ8d%}T^D5T34riikhgUWA3kLo4;>f(v``<U>fCjx~}tA<2sM>|^;5zKE|N&LrtB
z8ko*}U%r{nm#>qbZ-ChW0Nes(pOmjC&MD3)_&gB*5z9Z{ETKKh`>AGb!lzVE_=4)Z
zYn!6iZxTyXPbHz)#QH;ug-7S*&@r3!*lRnkt8|!S9q(DhJEj81y|nvwi5Zodc-9UF
zW`icDe5cII>V^hh3OzWjaD}y1qeEK-UF<U(7tqcJ!^sExy#I&UC!b81%{q<>|KvB!
zgWu%3x?V1WayPr69;VpaF~uV4x60`)gFm|G9j7>&*KKRjxl*7~4(3k2W2%MjP3>i)
d5PIFBf)-z;z(+qC1dAOsTKn2|)I}RO_yq~^OHTj*

literal 0
HcmV?d00001

-- 
2.25.1



More information about the Gdb-patches mailing list