From ee5920bec14133d427f09f75b32cae355d436d6e Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 7 Apr 2014 18:01:10 +1000 Subject: machine: Fix inclusion of dtsi's for *-yocto devicetrees * Fix inclusion of zynq-7-mainline-gem.dtsi so that nodes properties in the board level are not overwritten * Add the *-yocto.dts to the machine configurations Signed-off-by: Nathan Rossi --- conf/machine/boards/zc702/zc702-zynq7-board.dtsi | 1 - conf/machine/boards/zc702/zc702-zynq7-yocto.dts | 3 ++- conf/machine/boards/zc702/zc702-zynq7.dts | 1 + conf/machine/boards/zc706/zc706-zynq7-board.dtsi | 1 - conf/machine/boards/zc706/zc706-zynq7-yocto.dts | 3 ++- conf/machine/boards/zc706/zc706-zynq7.dts | 1 + conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi | 1 - conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts | 3 ++- conf/machine/boards/zedboard/zedboard-zynq7.dts | 1 + conf/machine/zc702-zynq7.conf | 1 + conf/machine/zc706-zynq7.conf | 1 + conf/machine/zedboard-zynq7.conf | 1 + 12 files changed, 12 insertions(+), 6 deletions(-) diff --git a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi index dfc453d5..14ab2819 100644 --- a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi +++ b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi @@ -2,7 +2,6 @@ * ZC702 DTS file header for generic boot. */ -/include/ "zynq-7-base.dtsi" / { model = "Xilinx ZC702"; chosen { diff --git a/conf/machine/boards/zc702/zc702-zynq7-yocto.dts b/conf/machine/boards/zc702/zc702-zynq7-yocto.dts index db9c460f..44bb3fb3 100644 --- a/conf/machine/boards/zc702/zc702-zynq7-yocto.dts +++ b/conf/machine/boards/zc702/zc702-zynq7-yocto.dts @@ -1,5 +1,6 @@ /dts-v1/; -/include/ "zc702-zynq7-board.dtsi" +/include/ "zynq-7-base.dtsi" /include/ "zynq-7-mainline-gem.dtsi" +/include/ "zc702-zynq7-board.dtsi" / { } ; \ No newline at end of file diff --git a/conf/machine/boards/zc702/zc702-zynq7.dts b/conf/machine/boards/zc702/zc702-zynq7.dts index 6dea1a53..dd179e98 100644 --- a/conf/machine/boards/zc702/zc702-zynq7.dts +++ b/conf/machine/boards/zc702/zc702-zynq7.dts @@ -1,4 +1,5 @@ /dts-v1/; +/include/ "zynq-7-base.dtsi" /include/ "zc702-zynq7-board.dtsi" / { } ; \ No newline at end of file diff --git a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi index ff473e1b..43ae601a 100644 --- a/conf/machine/boards/zc706/zc706-zynq7-board.dtsi +++ b/conf/machine/boards/zc706/zc706-zynq7-board.dtsi @@ -2,7 +2,6 @@ * ZC706 DTS file header for generic boot. */ -/include/ "zynq-7-base.dtsi" / { model = "Xilinx ZC706"; chosen { diff --git a/conf/machine/boards/zc706/zc706-zynq7-yocto.dts b/conf/machine/boards/zc706/zc706-zynq7-yocto.dts index 9ccd97dc..38eedc29 100644 --- a/conf/machine/boards/zc706/zc706-zynq7-yocto.dts +++ b/conf/machine/boards/zc706/zc706-zynq7-yocto.dts @@ -1,5 +1,6 @@ /dts-v1/; -/include/ "zc706-zynq7-board.dtsi" +/include/ "zynq-7-base.dtsi" /include/ "zynq-7-mainline-gem.dtsi" +/include/ "zc706-zynq7-board.dtsi" / { } ; \ No newline at end of file diff --git a/conf/machine/boards/zc706/zc706-zynq7.dts b/conf/machine/boards/zc706/zc706-zynq7.dts index 8d0ee781..3dfd136c 100644 --- a/conf/machine/boards/zc706/zc706-zynq7.dts +++ b/conf/machine/boards/zc706/zc706-zynq7.dts @@ -1,4 +1,5 @@ /dts-v1/; +/include/ "zynq-7-base.dtsi" /include/ "zc706-zynq7-board.dtsi" / { } ; \ No newline at end of file diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi index fb4a0594..f839c76e 100644 --- a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi +++ b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi @@ -2,7 +2,6 @@ * ZedBoard DTS file header for generic boot. */ -/include/ "zynq-7-base.dtsi" / { model = "ZedBoard"; chosen { diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts b/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts index c667bb3c..f025bbd9 100644 --- a/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts +++ b/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts @@ -1,5 +1,6 @@ /dts-v1/; -/include/ "zedboard-zynq7-board.dtsi" +/include/ "zynq-7-base.dtsi" /include/ "zynq-7-mainline-gem.dtsi" +/include/ "zedboard-zynq7-board.dtsi" / { } ; \ No newline at end of file diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dts b/conf/machine/boards/zedboard/zedboard-zynq7.dts index 2874837d..de37b687 100644 --- a/conf/machine/boards/zedboard/zedboard-zynq7.dts +++ b/conf/machine/boards/zedboard/zedboard-zynq7.dts @@ -1,4 +1,5 @@ /dts-v1/; +/include/ "zynq-7-base.dtsi" /include/ "zedboard-zynq7-board.dtsi" / { } ; \ No newline at end of file diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf index 5500e1f8..a6537ac3 100644 --- a/conf/machine/zc702-zynq7.conf +++ b/conf/machine/zc702-zynq7.conf @@ -20,6 +20,7 @@ SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_DEVICETREE := " \ zc702/zc702-zynq7-board.dtsi \ zc702/zc702-zynq7.dts \ + zc702/zc702-zynq7-yocto.dts \ " MACHINE_KCONFIG := "common/linux/rtc.cfg" diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf index f2a50bb3..27d1cf54 100644 --- a/conf/machine/zc706-zynq7.conf +++ b/conf/machine/zc706-zynq7.conf @@ -20,6 +20,7 @@ SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_DEVICETREE := " \ zc706/zc706-zynq7-board.dtsi \ zc706/zc706-zynq7.dts \ + zc706/zc706-zynq7-yocto.dts \ " MACHINE_KCONFIG := "common/linux/rtc.cfg" diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf index 6b313cfb..16888543 100644 --- a/conf/machine/zedboard-zynq7.conf +++ b/conf/machine/zedboard-zynq7.conf @@ -19,4 +19,5 @@ SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_DEVICETREE := " \ zedboard/zedboard-zynq7-board.dtsi \ zedboard/zedboard-zynq7.dts \ + zedboard/zedboard-zynq7-yocto.dts \ " -- cgit v1.2.3-54-g00ecf