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.

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 203330987b..0000000000
--- 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 6da71c116d..0000000000
--- 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 667dc28256..0000000000
--- 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 526fc8888b..0000000000
--- 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 8b542a109b..0000000000
--- 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 0379a07068..0000000000
--- 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 a4f9e05fc0..0000000000
--- 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 91a5deba4a..0000000000
--- 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";
-};