summaryrefslogtreecommitdiff
path: root/board/xilinx
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-20 13:16:05 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-02-20 13:16:05 +0100
commit3e11350255d9c5d4bd03c2a65769da84c05d3294 (patch)
tree2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa /board/xilinx
parente7538fee991308c16f76f7eca2517089f2a30ff4 (diff)
parent0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff)
downloadu-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.zip
u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.gz
u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.bz2
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: Makefile drivers/net/npe/Makefile These two conflicts arise from commit 0b2d3f20 ("ARM: NET: Remove the IXP NPE ethernet driver") and are resolved by deleting the drivers/net/npe/Makefile file and removing the CONFIG_IXP4XX_NPE line from Makefile.
Diffstat (limited to 'board/xilinx')
-rw-r--r--board/xilinx/dts/microblaze-generic.dts7
-rw-r--r--board/xilinx/dts/zynq-microzed.dts14
-rw-r--r--board/xilinx/dts/zynq-zc702.dts14
-rw-r--r--board/xilinx/dts/zynq-zc706.dts14
-rw-r--r--board/xilinx/dts/zynq-zc770-xm010.dts14
-rw-r--r--board/xilinx/dts/zynq-zc770-xm012.dts14
-rw-r--r--board/xilinx/dts/zynq-zc770-xm013.dts14
-rw-r--r--board/xilinx/dts/zynq-zed.dts14
8 files changed, 0 insertions, 105 deletions
diff --git a/board/xilinx/dts/microblaze-generic.dts b/board/xilinx/dts/microblaze-generic.dts
deleted file mode 100644
index 2033309..0000000
--- a/board/xilinx/dts/microblaze-generic.dts
+++ /dev/null
@@ -1,7 +0,0 @@
-/dts-v1/;
-/ {
- #address-cells = <1>;
- #size-cells = <1>;
- aliases {
- } ;
-} ;
diff --git a/board/xilinx/dts/zynq-microzed.dts b/board/xilinx/dts/zynq-microzed.dts
deleted file mode 100644
index 6da71c1..0000000
--- a/board/xilinx/dts/zynq-microzed.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx MicroZED board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq MicroZED Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
-};
diff --git a/board/xilinx/dts/zynq-zc702.dts b/board/xilinx/dts/zynq-zc702.dts
deleted file mode 100644
index 667dc28..0000000
--- a/board/xilinx/dts/zynq-zc702.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx ZC702 board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq ZC702 Board";
- compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
-};
diff --git a/board/xilinx/dts/zynq-zc706.dts b/board/xilinx/dts/zynq-zc706.dts
deleted file mode 100644
index 526fc88..0000000
--- a/board/xilinx/dts/zynq-zc706.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx ZC706 board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq ZC706 Board";
- compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
-};
diff --git a/board/xilinx/dts/zynq-zc770-xm010.dts b/board/xilinx/dts/zynq-zc770-xm010.dts
deleted file mode 100644
index 8b542a1..0000000
--- a/board/xilinx/dts/zynq-zc770-xm010.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx ZC770 XM010 board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq ZC770 XM010 Board";
- compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
-};
diff --git a/board/xilinx/dts/zynq-zc770-xm012.dts b/board/xilinx/dts/zynq-zc770-xm012.dts
deleted file mode 100644
index 0379a07..0000000
--- a/board/xilinx/dts/zynq-zc770-xm012.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx ZC770 XM012 board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq ZC770 XM012 Board";
- compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
-};
diff --git a/board/xilinx/dts/zynq-zc770-xm013.dts b/board/xilinx/dts/zynq-zc770-xm013.dts
deleted file mode 100644
index a4f9e05..0000000
--- a/board/xilinx/dts/zynq-zc770-xm013.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx ZC770 XM013 board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq ZC770 XM013 Board";
- compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
-};
diff --git a/board/xilinx/dts/zynq-zed.dts b/board/xilinx/dts/zynq-zed.dts
deleted file mode 100644
index 91a5deb..0000000
--- a/board/xilinx/dts/zynq-zed.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Xilinx ZED board DTS
- *
- * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-/dts-v1/;
-#include "zynq-7000.dtsi"
-
-/ {
- model = "Zynq ZED Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
-};