From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Mon, 09 Jul 2012 09:42:18 +0200 Subject: [U-Boot] [PATCH 1/3] fdt: Add board specific dts inclusion In-Reply-To: <1341433531-18124-1-git-send-email-linz@li-pro.net> References: <1341433531-18124-1-git-send-email-linz@li-pro.net> Message-ID: <4FFA8B5A.9060806@monstr.eu> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 07/04/2012 10:25 PM, Stephan Linz wrote: > Some architectures, for example Microblaze, doesn't need a > splitted device tree because every Microblaze hw design is > different. The individuell Microblaze device tree will be > auto generated by FPGA design tools and could be used directly > with dtc. > > The auto generated dts for Microblaze can not processed by CPP. > Unfortunately that is the default procedure in U-Boot to merge > a splitted device tree (substitution of ARCH_CPU_DTS). > > Microblaze will never use the ARCH_CPU_DTS substitution and we > introduce the new board specific substitution variable BOARD_DTS > that points into vendor/board/dts subdir with the file name > of CONFIG_DEFAULT_DEVICE_TREE. The common dts file in vendor/dts > subdir (defined by CONFIG_DEFAULT_DEVICE_TREE) contain a single > include line that can processed by CPP: > > /include/ BOARD_DTS > > Signed-off-by: Stephan Linz > --- > dts/Makefile | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dts/Makefile b/dts/Makefile > index 914e479..b1f47a1 100644 > --- a/dts/Makefile > +++ b/dts/Makefile > @@ -36,7 +36,8 @@ $(error Your architecture does not have device tree support enabled. \ > Please define CONFIG_ARCH_DEVICE_TREE)) > > # We preprocess the device tree file provide a useful define > -DTS_CPPFLAGS := -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" > +DTS_CPPFLAGS := -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \ > + -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" > > all: $(obj).depend $(LIB) > Ok. Have tested this. Simon can you give your ACK for this patch? Tested-by: Michal Simek I think I can add this one to my microblaze custodian tree. Thanks, Michal -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian