History

kbuild: consolidate Devicetree dtb build rules

There is nothing arch specific about building dtb files other than their location under /arch/*/boot/dts/. Keeping each arch aligned is a pain. The dependencies and supported targets are all slightly different. Also, a cross-compiler for each arch is needed, but really the host compiler preprocessor is perfectly fine for building dtbs. Move the build rules to a common location and remove the arch specific ones. This is done in a single step to avoid warnings about overriding rules. The build dependencies had been a mixture of 'scripts' and/or 'prepare'. These pull in several dependencies some of which need a target compiler (specifically devicetable-offsets.h) and aren't needed to build dtbs. All that is really needed is dtc, so adjust the dependencies to only be dtc. This change enables support 'dtbs_install' on some arches which were missing the target.

Rob Herring committed 8 years ago

Commit 37c8a5f1 parent be7cd2d17 files · +48 −101Browse files

Showing the changes to scripts (3 of 17 files). Show all

Unified · Split

3 files
  1. scripts/Makefile +1 −2
  2. scripts/Makefile.lib +1 −1
  3. scripts/dtc/Makefile +1 −1
scripts/Makefile+1−2
@@ -39,8 +39,7 @@ build_unifdef: $(obj)/unifdef · 38 unmodified lines
3939 subdir-$(CONFIG_MODVERSIONS) += genksyms
4040 subdir-y += mod
4141 subdir-$(CONFIG_SECURITY_SELINUX) += selinux
42−subdir-$(CONFIG_DTC) += dtc
4342 subdir-$(CONFIG_GDB_SCRIPTS) += gdb
4443
4544 # Let clean descend into subdirs
46−subdir- += basic kconfig package gcc-plugins
45+subdir- += basic dtc kconfig package gcc-plugins
scripts/Makefile.lib+1−1
@@ -283,7 +283,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE · 282 unmodified lines
283283
284284 quiet_cmd_dtc = DTC $@
285285 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
286− $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
286+ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
287287 $(DTC) -O dtb -o $@ -b 0 \
288288 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
289289 -d $(depfile).dtc.tmp $(dtc-tmp) ; \
scripts/dtc/Makefile+1−1
@@ -1,7 +1,7 @@
11 # SPDX-License-Identifier: GPL-2.0
22 # scripts/dtc makefile
33
4−hostprogs-y := dtc
4+hostprogs-$(CONFIG_DTC) := dtc
55 always := $(hostprogs-y)
66
77 dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \