3 files changed, 2 insertions, 101 deletions

diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index acac58f1..188c5c5d 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -23,11 +23,11 @@ EXTRA_IMAGEDEPENDS += " \
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
+KERNEL_DEVICETREE = "zynq-microzed.dtb"
 
 IMAGE_BOOT_FILES += " \
                 boot.bin \
-                devicetree/${MACHINE}.dtb \
+                zynq-microzed.dtb \
                 uEnv.txt \
                 "
 
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
index cf38c6ce..81965c13 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
@@ -20,9 +20,6 @@ SRC_URI_append_zynq = " file://zynq-7000-qspi-dummy.dtsi"
 COMPATIBLE_MACHINE_picozed-zynq7 = ".*"
 SRC_URI_append_picozed-zynq7 = " file://picozed-zynq7.dts"
 
-COMPATIBLE_MACHINE_microzed-zynq7 = ".*"
-SRC_URI_append_microzed-zynq7 = " file://microzed-zynq7.dts"
-
 COMPATIBLE_MACHINE_qemu-zynq7 = ".*"
 SRC_URI_append_qemu-zynq7 = " file://qemu-zynq7.dts"
 
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/microzed-zynq7.dts b/meta-xilinx-bsp/recipes-bsp/device-tree/files/microzed-zynq7.dts
deleted file mode 100644
index b9376a49..00000000
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/microzed-zynq7.dts
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2011 - 2014 Xilinx
- * Copyright (C) 2016 Jagan Teki <jteki@openedev.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
-/dts-v1/;
-/include/ "zynq-7000.dtsi"
-
-/ {
-        model = "Zynq MicroZED Development Board";
-        compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
-
-        aliases {
-                ethernet0 = &gem0;
-                serial0 = &uart1;
-        };
-
-        memory {
-                device_type = "memory";
-                reg = <0x0 0x40000000>;
-        };
-
-        chosen {
-                bootargs = "earlycon";
-                stdout-path = "serial0:115200n8";
-        };
-
-        usb_phy0: phy0 {
-                compatible = "usb-nop-xceiv";
-                #phy-cells = <0>;
-        };
-};
-
-&clkc {
-        ps-clk-frequency = <33333333>;
-};
-
-&gem0 {
-        status = "okay";
-        phy-mode = "rgmii-id";
-        phy-handle = <&ethernet_phy>;
-
-        ethernet_phy: ethernet-phy@0 {
-                reg = <0>;
-        };
-};
-
-&sdhci0 {
-        status = "okay";
-};
-
-&uart1 {
-        status = "okay";
-};
-
-&usb0 {
-        status = "okay";
-        dr_mode = "host";
-        usb-phy = <&usb_phy0>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_usb0_default>;
-};
-
-&pinctrl0 {
-        pinctrl_usb0_default: usb0-default {
-                mux {
-                        groups = "usb0_0_grp";
-                        function = "usb0";
-                };
-
-                conf {
-                        groups = "usb0_0_grp";
-                        slew-rate = <0>;
-                        io-standard = <1>;
-                };
-
-                conf-rx {
-                        pins = "MIO29", "MIO31", "MIO36";
-                        bias-high-impedance;
-                };
-
-                conf-tx {
-                        pins = "MIO28", "MIO30", "MIO32", "MIO33", "MIO34",
-                               "MIO35", "MIO37", "MIO38", "MIO39";
-                        bias-disable;
-                };
-        };
-};