zynq7-mainline-gem.dtsi: Remove

* These changes have been merged into the base dtsi for zynq
* Clean up and remove non-required *-yocto.dts
* Update machine confs

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

10 files changed, 0 insertions, 58 deletions

diff --git a/conf/machine/boards/common/zynq7-mainline-gem.dtsi b/conf/machine/boards/common/zynq7-mainline-gem.dtsi
deleted file mode 100644
index c18e2691..00000000
--- a/conf/machine/boards/common/zynq7-mainline-gem.dtsi
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Zynq 7 Device Tree - Linux Mainline GEM
- * 
- * This dtsi file will configure the ps7_ethernet_* nodes to be compatible with
- * the upstream Cadence GEM driver (macb).
- *
- * To use this dtsi, include it after the base include. e.g.
- *     ...
- *     /include/ "zynq7-base.dtsi"
- *     /include/ "zynq7-mainline-gem.dtsi"
- *     / {
- *     ...
- */
-/ {
-        ps7_axi_interconnect_0: amba@0 {
-                ps7_ethernet_0: ps7-ethernet@e000b000 {
-                        clock-names = "pclk", "hclk", "tx_clk";
-                        clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>;
-                        compatible = "cdns,gem";
-                        reg = <0xe000b000 0x4000>;
-                } ;
-                ps7_ethernet_1: ps7-ethernet@e000c000 {
-                        clock-names = "pclk", "hclk", "tx_clk";
-                        clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>;
-                        compatible = "cdns,gem";
-                        reg = <0xe000c000 0x4000>;
-                } ;
-        } ;
-} ;
diff --git a/conf/machine/boards/qemu/qemuzynq-yocto.dts b/conf/machine/boards/qemu/qemuzynq-yocto.dts
deleted file mode 100644
index e265f1ec..00000000
--- a/conf/machine/boards/qemu/qemuzynq-yocto.dts
+++ /dev/null
@@ -1,6 +0,0 @@
-/dts-v1/;
-/include/ "zynq7-base.dtsi"
-/include/ "zynq7-mainline-gem.dtsi"
-/include/ "qemuzynq-base.dtsi"
-/ {
-} ;
diff --git a/conf/machine/boards/zc702/zc702-zynq7-yocto.dts b/conf/machine/boards/zc702/zc702-zynq7-yocto.dts
deleted file mode 100644
index 9a74ad52..00000000
--- a/conf/machine/boards/zc702/zc702-zynq7-yocto.dts
+++ /dev/null
@@ -1,6 +0,0 @@
-/dts-v1/;
-/include/ "zynq7-base.dtsi"
-/include/ "zynq7-mainline-gem.dtsi"
-/include/ "zc702-zynq7-board.dtsi"
-/ {
-} ;
\ No newline at end of file
diff --git a/conf/machine/boards/zc706/zc706-zynq7-yocto.dts b/conf/machine/boards/zc706/zc706-zynq7-yocto.dts
deleted file mode 100644
index 3b7f9c6c..00000000
--- a/conf/machine/boards/zc706/zc706-zynq7-yocto.dts
+++ /dev/null
@@ -1,6 +0,0 @@
-/dts-v1/;
-/include/ "zynq7-base.dtsi"
-/include/ "zynq7-mainline-gem.dtsi"
-/include/ "zc706-zynq7-board.dtsi"
-/ {
-} ;
\ No newline at end of file
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts b/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts
deleted file mode 100644
index b347c23b..00000000
--- a/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts
+++ /dev/null
@@ -1,6 +0,0 @@
-/dts-v1/;
-/include/ "zynq7-base.dtsi"
-/include/ "zynq7-mainline-gem.dtsi"
-/include/ "zedboard-zynq7-board.dtsi"
-/ {
-} ;
\ No newline at end of file
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index c78f1c13..cfe47043 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -20,5 +20,4 @@ MACHINE_KCONFIG_prepend += "common/linux/${SOC_FAMILY}/defconfig_${@'.'.join(d.g
 # Common Device Tree Includes
 MACHINE_DEVICETREE_append_zynq += " \
                 common/zynq7-base.dtsi \
-                common/zynq7-mainline-gem.dtsi \
                 "
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index 55d44f39..b67cf591 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -13,6 +13,5 @@ SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_DEVICETREE := " \
                 qemu/qemuzynq.dts \
-                qemu/qemuzynq-yocto.dts \
                 qemu/qemuzynq-base.dtsi \
                 "
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index e59cbb65..25bd3385 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -21,7 +21,6 @@ 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 f4c7fce5..7b5123a3 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -21,7 +21,6 @@ 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 a5d5a382..2b5119c2 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -20,5 +20,4 @@ SERIAL_CONSOLE = "115200 ttyPS0"
 MACHINE_DEVICETREE := " \
                 zedboard/zedboard-zynq7-board.dtsi \
                 zedboard/zedboard-zynq7.dts \
-                zedboard/zedboard-zynq7-yocto.dts \
                 "