X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=dts%2FMakefile;h=f10631785010541b2b50720503c7aac277e45f01;hb=778c3cbd857f4abe54773f399204dd86ffe6516c;hp=922c78c1ca497c18916456359950403ac34774b3;hpb=6487d88aaa034e78e9882f7856ba670a8de88b41;p=karo-tx-uboot.git

diff --git a/dts/Makefile b/dts/Makefile
index 922c78c1ca..f106317850 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -1,23 +1,7 @@
 #
 # Copyright (c) 2011 The Chromium OS Authors.
 #
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundatio; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
+# SPDX-License-Identifier:	GPL-2.0+
 #
 
 # This Makefile builds the internal U-Boot fdt if CONFIG_OF_CONTROL is
@@ -27,18 +11,21 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)libdts.o
 
+ifeq ($(DEVICE_TREE),)
 $(if $(CONFIG_DEFAULT_DEVICE_TREE),,\
 $(error Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file))
 DEVICE_TREE = $(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE))
+endif
+
+DTS_INCDIRS =  $(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts
+DTS_INCDIRS += $(SRCTREE)/board/$(VENDOR)/dts
+DTS_INCDIRS += $(SRCTREE)/arch/$(ARCH)/dts
 
-$(if $(CONFIG_ARCH_DEVICE_TREE),,\
-$(error Your architecture does not have device tree support enabled. \
-Please define CONFIG_ARCH_DEVICE_TREE))
+DTS_CPPFLAGS := -x assembler-with-cpp -undef -D__DTS__ \
+		-nostdinc $(addprefix -I,$(DTS_INCDIRS))
 
-# We preprocess the device tree file provide a useful define
-DTS_CPPFLAGS := -x assembler-with-cpp \
-		-DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \
-		-DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\"
+DTC_FLAGS := -R 4 -p 0x1000 \
+	$(addprefix -i ,$(DTS_INCDIRS))
 
 all:	$(obj).depend $(LIB)
 
@@ -48,13 +35,8 @@ all:	$(obj).depend $(LIB)
 DT_BIN	:= $(obj)dt.dtb
 
 $(DT_BIN): $(TOPDIR)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts
-	rc=$$( \
-		cat $< | $(CPP) -P $(DTS_CPPFLAGS) - | \
-		{ { $(DTC) -R 4 -p 0x1000 -O dtb -o ${DT_BIN} - 2>&1 ; \
-		    echo $$? >&3 ; } | \
-		  grep -v '^DTC: dts->dtb  on file' ; \
-	        } 3>&1 1>&2 ) ; \
-	exit $$rc
+	$(CPP) $(DTS_CPPFLAGS) $< -o $(DT_BIN).dts.tmp
+	$(DTC) $(DTC_FLAGS) -O dtb -o ${DT_BIN} $(DT_BIN).dts.tmp
 
 process_lds = \
 	$(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p'
@@ -72,15 +54,15 @@ $(obj)dt.o: $(DT_BIN)
 		oformat=`$(call process_lds,cat $(LDSCRIPT),FORMAT)` && \
 		oarch=`$(call process_lds,cat $(LDSCRIPT),ARCH)` ;\
 	\
-	[ -z $${oformat} ] && \
+	[ -z "$${oformat}" ] && \
 		oformat=`$(call process_lds,$(GET_LDS),FORMAT)` ;\
-	[ -z $${oarch} ] && \
+	[ -z "$${oarch}" ] && \
 		oarch=`$(call process_lds,$(GET_LDS),ARCH)` ;\
 	\
-	[ -z $${oformat} ] && \
+	[ -z "$${oformat}" ] && \
 		echo "Cannot read OUTPUT_FORMAT from lds file $(LDSCRIPT)" && \
 		exit 1 || true ;\
-	[ -z $${oarch} ] && \
+	[ -z "$${oarch}" ] && \
 		echo "Cannot read OUTPUT_ARCH from lds file $(LDSCRIPT)" && \
 		exit 1 || true ;\
 	\