Commit eb90b4f8 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'dt/dtc-sync' into dt/next

parents 9183908e ce88c9c7

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
*.c.[012]*.*

*.dt.yaml

*.dtb

*.dtbo

*.dtb.S

*.dwo

*.elf

Makefile

+4 −1
Original line number Diff line number Diff line
@@ -1337,6 +1337,9 @@ ifneq ($(dtstree),) 
%.dtb: include/config/kernel.release scripts_dtc

	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@



%.dtbo: include/config/kernel.release scripts_dtc

	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@



PHONY += dtbs dtbs_install dtbs_check

dtbs: include/config/kernel.release scripts_dtc

	$(Q)$(MAKE) $(build)=$(dtstree)
@@ -1816,7 +1819,7 @@ clean: $(clean-dirs) 
	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \

		\( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \

		-o -name '*.ko.*' \

		-o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \

		-o -name '*.dtb' -o -name '*.dtbo' -o -name '*.dtb.S' -o -name '*.dt.yaml' \

		-o -name '*.dwo' -o -name '*.lst' \

		-o -name '*.su' -o -name '*.mod' \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

scripts/Makefile.dtbinst

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ quiet_cmd_dtb_install = INSTALL $@ 
$(dst)/%.dtb: $(obj)/%.dtb

	$(call cmd,dtb_install)



$(dst)/%.dtbo: $(obj)/%.dtbo

	$(call cmd,dtb_install)



PHONY += $(subdirs)

$(subdirs):

	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)

scripts/Makefile.lib

+5 −0
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ extra-$(CONFIG_OF_ALL_DTBS) += $(dtb-) 


ifneq ($(CHECK_DTBS),)

extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))

extra-y += $(patsubst %.dtbo,%.dt.yaml, $(dtb-y))

extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))

extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtbo,%.dt.yaml, $(dtb-))

endif



# Add subdir path
@@ -327,6 +329,9 @@ cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; 
$(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE

	$(call if_changed_dep,dtc)



$(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE

	$(call if_changed_dep,dtc)



DT_CHECKER ?= dt-validate

DT_BINDING_DIR := Documentation/devicetree/bindings

# DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile

scripts/dtc/Makefile

+7 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# scripts/dtc makefile



hostprogs-always-$(CONFIG_DTC)		+= dtc

hostprogs-always-$(CONFIG_DTC)		+= dtc fdtoverlay

hostprogs-always-$(CHECK_DT_BINDING)	+= dtc



dtc-objs	:= dtc.o flattree.o fstree.o data.o livetree.o treesource.o \

		   srcpos.o checks.o util.o

dtc-objs	+= dtc-lexer.lex.o dtc-parser.tab.o



# The upstream project builds libfdt as a separate library.  We are choosing to

# instead directly link the libfdt object files into fdtoverlay.

libfdt-objs	:= fdt.o fdt_ro.o fdt_wip.o fdt_sw.o fdt_rw.o fdt_strerror.o fdt_empty_tree.o fdt_addresses.o fdt_overlay.o

libfdt		= $(addprefix libfdt/,$(libfdt-objs))

fdtoverlay-objs	:= $(libfdt) fdtoverlay.o util.o



# Source files need to get at the userspace version of libfdt_env.h to compile

HOST_EXTRACFLAGS += -I $(srctree)/$(src)/libfdt