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, 19 insertions, 566 deletions

diff --git a/board/samsung/dts/exynos5250-arndale.dts b/board/samsung/dts/exynos5250-arndale.dts
deleted file mode 100644
index 202f2ea..0000000
--- a/board/samsung/dts/exynos5250-arndale.dts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SAMSUNG Arndale board device tree source
- *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
-*/
-
-/dts-v1/;
-#include "exynos5250.dtsi"
-
-/ {
-	model = "SAMSUNG Arndale board based on EXYNOS5250";
-	compatible = "samsung,arndale", "samsung,exynos5250";
-
-	aliases {
-		serial0 = "/serial@12C20000";
-		console = "/serial@12C20000";
-	};
-
-	mmc@12200000 {
-		samsung,bus-width = <8>;
-		samsung,timing = <1 3 3>;
-	};
-
-	mmc@12210000 {
-		status = "disabled";
-	};
-
-	mmc@12220000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-	};
-
-	mmc@12230000 {
-		status = "disabled";
-	};
-};
diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/board/samsung/dts/exynos5250-smdk5250.dts
deleted file mode 100644
index 9020382..0000000
--- a/board/samsung/dts/exynos5250-smdk5250.dts
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * SAMSUNG SMDK5250 board device tree source
- *
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-/dts-v1/;
-/include/ "exynos5250.dtsi"
-
-/ {
-	model = "SAMSUNG SMDK5250 board based on EXYNOS5250";
-	compatible = "samsung,smdk5250", "samsung,exynos5250";
-
-	aliases {
-		i2c0 = "/i2c@12c60000";
-		i2c1 = "/i2c@12c70000";
-		i2c2 = "/i2c@12c80000";
-		i2c3 = "/i2c@12c90000";
-		i2c4 = "/i2c@12ca0000";
-		i2c5 = "/i2c@12cb0000";
-		i2c6 = "/i2c@12cc0000";
-		i2c7 = "/i2c@12cd0000";
-		spi0 = "/spi@12d20000";
-		spi1 = "/spi@12d30000";
-		spi2 = "/spi@12d40000";
-		spi3 = "/spi@131a0000";
-		spi4 = "/spi@131b0000";
-		mmc0 = "/mmc@12200000";
-		mmc1 = "/mmc@12210000";
-		mmc2 = "/mmc@12220000";
-		mmc3 = "/mmc@12230000";
-		serial0 = "/serial@12C30000";
-		console = "/serial@12C30000";
-		i2s = "/sound@3830000";
-	};
-
-	sromc@12250000 {
-		bank = <1>;
-		srom-timing = <1 9 12 1 6 1 1>;
-		width = <2>;
-		lan@5000000 {
-			compatible = "smsc,lan9215", "smsc,lan";
-			reg = <0x5000000 0x100>;
-			phy-mode = "mii";
-		};
-	};
-
-	sound@3830000 {
-		samsung,codec-type = "wm8994";
-	};
-
-	sound@12d60000 {
-		status = "disabled";
-	};
-
-	i2c@12c70000 {
-		soundcodec@1a {
-			reg = <0x1a>;
-			compatible = "wolfson,wm8994-codec";
-		};
-	};
-
-	i2c@12c60000 {
-		pmic@9 {
-			reg = <0x9>;
-			compatible = "maxim,max77686_pmic";
-		};
-	};
-
-	tmu@10060000 {
-		samsung,min-temp	= <25>;
-		samsung,max-temp	= <125>;
-		samsung,start-warning	= <95>;
-		samsung,start-tripping	= <105>;
-		samsung,hw-tripping	= <110>;
-		samsung,efuse-min-value	= <40>;
-		samsung,efuse-value	= <55>;
-		samsung,efuse-max-value	= <100>;
-		samsung,slope		= <274761730>;
-		samsung,dc-value	= <25>;
-	};
-
-	fimd@14400000 {
-		samsung,vl-freq = <60>;
-		samsung,vl-col = <2560>;
-		samsung,vl-row = <1600>;
-		samsung,vl-width = <2560>;
-		samsung,vl-height = <1600>;
-
-		samsung,vl-clkp;
-		samsung,vl-dp;
-		samsung,vl-bpix = <4>;
-
-		samsung,vl-hspw = <32>;
-		samsung,vl-hbpd = <80>;
-		samsung,vl-hfpd = <48>;
-		samsung,vl-vspw = <6>;
-		samsung,vl-vbpd = <37>;
-		samsung,vl-vfpd = <3>;
-		samsung,vl-cmd-allow-len = <0xf>;
-
-		samsung,winid = <3>;
-		samsung,interface-mode = <1>;
-		samsung,dp-enabled = <1>;
-		samsung,dual-lcd-enabled = <0>;
-	};
-
-	dp@145b0000 {
-		samsung,lt-status = <0>;
-
-		samsung,master-mode = <0>;
-		samsung,bist-mode = <0>;
-		samsung,bist-pattern = <0>;
-		samsung,h-sync-polarity = <0>;
-		samsung,v-sync-polarity = <0>;
-		samsung,interlaced = <0>;
-		samsung,color-space = <0>;
-		samsung,dynamic-range = <0>;
-		samsung,ycbcr-coeff = <0>;
-		samsung,color-depth = <1>;
-	};
-
-	mmc@12200000 {
-		samsung,bus-width = <8>;
-		samsung,timing = <1 3 3>;
-		samsung,removable = <0>;
-	};
-
-	mmc@12210000 {
-		status = "disabled";
-	};
-
-	mmc@12220000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-		samsung,removable = <1>;
-	};
-
-	mmc@12230000 {
-		status = "disabled";
-	};
-
-	ehci@12110000 {
-		samsung,vbus-gpio = <&gpio 0x316 0>; /* X26 */
-	};
-};
diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts
deleted file mode 100644
index 9b48a0c..0000000
--- a/board/samsung/dts/exynos5250-snow.dts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * SAMSUNG Snow board device tree source
- *
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-/dts-v1/;
-/include/ "exynos5250.dtsi"
-
-/ {
-	model = "Google Snow";
-	compatible = "google,snow", "samsung,exynos5250";
-
-	aliases {
-		i2c0 = "/i2c@12c60000";
-		i2c1 = "/i2c@12c70000";
-		i2c2 = "/i2c@12c80000";
-		i2c3 = "/i2c@12c90000";
-		i2c4 = "/i2c@12ca0000";
-		i2c5 = "/i2c@12cb0000";
-		i2c6 = "/i2c@12cc0000";
-		i2c7 = "/i2c@12cd0000";
-		spi0 = "/spi@12d20000";
-		spi1 = "/spi@12d30000";
-		spi2 = "/spi@12d40000";
-		spi3 = "/spi@131a0000";
-		spi4 = "/spi@131b0000";
-		mmc0 = "/mmc@12200000";
-		mmc1 = "/mmc@12210000";
-		mmc2 = "/mmc@12220000";
-		mmc3 = "/mmc@12230000";
-		serial0 = "/serial@12C30000";
-		console = "/serial@12C30000";
-		i2s = "/sound@3830000";
-	};
-
-	i2c4: i2c@12ca0000 {
-		cros-ec@1e {
-			reg = <0x1e>;
-			compatible = "google,cros-ec";
-			i2c-max-frequency = <100000>;
-			ec-interrupt = <&gpio 782 1>;
-		};
-
-		power-regulator@48 {
-			compatible = "ti,tps65090";
-			reg = <0x48>;
-		};
-	};
-
-	spi@131b0000 {
-		spi-max-frequency = <1000000>;
-		spi-deactivate-delay = <100>;
-		cros-ec@0 {
-			reg = <0>;
-			compatible = "google,cros-ec";
-			spi-max-frequency = <5000000>;
-			ec-interrupt = <&gpio 782 1>;
-			optimise-flash-write;
-			status = "disabled";
-		};
-	};
-
-	sound@3830000 {
-		samsung,codec-type = "max98095";
-		codec-enable-gpio = <&gpio 0xb7 0>;
-	};
-
-	sound@12d60000 {
-		status = "disabled";
-	};
-
-	i2c@12cd0000 {
-		soundcodec@22 {
-			reg = <0x22>;
-			compatible = "maxim,max98095-codec";
-		};
-	};
-
-	i2c@12c60000 {
-		pmic@9 {
-			reg = <0x9>;
-			compatible = "maxim,max77686_pmic";
-		};
-	};
-
-	mmc@12200000 {
-		samsung,bus-width = <8>;
-		samsung,timing = <1 3 3>;
-		samsung,removable = <0>;
-	};
-
-	mmc@12210000 {
-		status = "disabled";
-	};
-
-	mmc@12220000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-		samsung,removable = <1>;
-	};
-
-	mmc@12230000 {
-		status = "disabled";
-	};
-
-	ehci@12110000 {
-		samsung,vbus-gpio = <&gpio 0x309 0>; /* X11 */
-	};
-
-	xhci@12000000 {
-		samsung,vbus-gpio = <&gpio 0x317 0>; /* X27 */
-	};
-
-	tmu@10060000 {
-		samsung,min-temp	= <25>;
-		samsung,max-temp	= <125>;
-		samsung,start-warning	= <95>;
-		samsung,start-tripping	= <105>;
-		samsung,hw-tripping	= <110>;
-		samsung,efuse-min-value	= <40>;
-		samsung,efuse-value	= <55>;
-		samsung,efuse-max-value	= <100>;
-		samsung,slope		= <274761730>;
-		samsung,dc-value	= <25>;
-	};
-
-	cros-ec-keyb {
-		compatible = "google,cros-ec-keyb";
-		google,key-rows = <8>;
-		google,key-columns = <13>;
-		google,repeat-delay-ms = <240>;
-		google,repeat-rate-ms = <30>;
-		google,ghost-filter;
-		/*
-		 * Keymap entries take the form of 0xRRCCKKKK where
-		 * RR=Row CC=Column KKKK=Key Code
-		 * The values below are for a US keyboard layout and
-		 * are taken from the Linux driver. Note that the
-		 * 102ND key is not used for US keyboards.
-		 */
-		linux,keymap = <
-			/* CAPSLCK F1         B          F10     */
-			0x0001003a 0x0002003b 0x00030030 0x00040044
-			/* N       =          R_ALT      ESC     */
-			0x00060031 0x0008000d 0x000a0064 0x01010001
-			/* F4      G          F7         H       */
-			0x0102003e 0x01030022 0x01040041 0x01060023
-			/* '       F9         BKSPACE    L_CTRL  */
-			0x01080028 0x01090043 0x010b000e 0x0200001d
-			/* TAB     F3         T          F6      */
-			0x0201000f 0x0202003d 0x02030014 0x02040040
-			/* ]       Y          102ND      [       */
-			0x0205001b 0x02060015 0x02070056 0x0208001a
-			/* F8      GRAVE      F2         5       */
-			0x02090042 0x03010029 0x0302003c 0x03030006
-			/* F5      6          -          \       */
-			0x0304003f 0x03060007 0x0308000c 0x030b002b
-			/* R_CTRL  A          D          F       */
-			0x04000061 0x0401001e 0x04020020 0x04030021
-			/* S       K          J          ;       */
-			0x0404001f 0x04050025 0x04060024 0x04080027
-			/* L       ENTER      Z          C       */
-			0x04090026 0x040b001c 0x0501002c 0x0502002e
-			/* V       X          ,          M       */
-			0x0503002f 0x0504002d 0x05050033 0x05060032
-			/* L_SHIFT /          .          SPACE   */
-			0x0507002a 0x05080035 0x05090034 0x050B0039
-			/* 1       3          4          2       */
-			0x06010002 0x06020004 0x06030005 0x06040003
-			/* 8       7          0          9       */
-			0x06050009 0x06060008 0x0608000b 0x0609000a
-			/* L_ALT   DOWN       RIGHT      Q       */
-			0x060a0038 0x060b006c 0x060c006a 0x07010010
-			/* E       R          W          I       */
-			0x07020012 0x07030013 0x07040011 0x07050017
-			/* U       R_SHIFT    P          O       */
-			0x07060016 0x07070036 0x07080019 0x07090018
-			/* UP      LEFT    */
-			0x070b0067 0x070c0069>;
-	};
-};
diff --git a/board/samsung/dts/exynos5420-smdk5420.dts b/board/samsung/dts/exynos5420-smdk5420.dts
deleted file mode 100644
index d739763..0000000
--- a/board/samsung/dts/exynos5420-smdk5420.dts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * SAMSUNG SMDK5420 board device tree source
- *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/dts-v1/;
-/include/ "exynos5420.dtsi"
-
-/ {
-	model = "SAMSUNG SMDK5420 board based on EXYNOS5420";
-	compatible = "samsung,smdk5420", "samsung,exynos5";
-
-	config {
-		hwid = "smdk5420 TEST A-A 9382";
-	};
-
-	aliases {
-		i2c0 = "/i2c@12c60000";
-		i2c1 = "/i2c@12c70000";
-		i2c2 = "/i2c@12c80000";
-		i2c3 = "/i2c@12c90000";
-		i2c4 = "/i2c@12ca0000";
-		i2c5 = "/i2c@12cb0000";
-		i2c6 = "/i2c@12cc0000";
-		i2c7 = "/i2c@12cd0000";
-		i2c8 = "/i2c@12e00000";
-		i2c9 = "/i2c@12e10000";
-		i2c10 = "/i2c@12e20000";
-		spi0 = "/spi@12d20000";
-		spi1 = "/spi@12d30000";
-		spi2 = "/spi@12d40000";
-		spi3 = "/spi@131a0000";
-		spi4 = "/spi@131b0000";
-		mmc0 = "/mmc@12200000";
-		mmc1 = "/mmc@12210000";
-		mmc2 = "/mmc@12220000";
-		xhci0 = "/xhci@12000000";
-		xhci1 = "/xhci@12400000";
-		serial0 = "/serial@12C30000";
-		console = "/serial@12C30000";
-	};
-
-	tmu@10060000 {
-		samsung,min-temp	= <25>;
-		samsung,max-temp	= <125>;
-		samsung,start-warning	= <95>;
-		samsung,start-tripping	= <105>;
-		samsung,hw-tripping	= <110>;
-		samsung,efuse-min-value	= <40>;
-		samsung,efuse-value	= <55>;
-		samsung,efuse-max-value	= <100>;
-		samsung,slope		= <274761730>;
-		samsung,dc-value	= <25>;
-	};
-
-	/* s2mps11 is on i2c bus 4 */
-	i2c@12ca0000 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		pmic@66 {
-			reg = <0x66>;
-			compatible = "samsung,s2mps11-pmic";
-		};
-	};
-
-	spi@12d20000 { /* spi0 */
-		spi-max-frequency = <50000000>;
-		firmware_storage_spi: flash@0 {
-			reg = <0>;
-		};
-	};
-
-	fimd@14400000 {
-		samsung,vl-freq = <60>;
-		samsung,vl-col = <2560>;
-		samsung,vl-row = <1600>;
-		samsung,vl-width = <2560>;
-		samsung,vl-height = <1600>;
-
-		samsung,vl-clkp;
-		samsung,vl-dp;
-		samsung,vl-bpix = <4>;
-
-		samsung,vl-hspw = <32>;
-		samsung,vl-hbpd = <80>;
-		samsung,vl-hfpd = <48>;
-		samsung,vl-vspw = <6>;
-		samsung,vl-vbpd = <37>;
-		samsung,vl-vfpd = <3>;
-		samsung,vl-cmd-allow-len = <0xf>;
-
-		samsung,winid = <3>;
-		samsung,interface-mode = <1>;
-		samsung,dp-enabled = <1>;
-		samsung,dual-lcd-enabled = <0>;
-	};
-
-	sound@3830000 {
-		samsung,codec-type = "wm8994";
-	};
-
-	i2c@12c70000 {
-		soundcodec@1a {
-			reg = <0x1a>;
-			compatible = "wolfson,wm8994-codec";
-		};
-	};
-
-	mmc@12200000 {
-		samsung,bus-width = <8>;
-		samsung,timing = <1 3 3>;
-		samsung,removable = <0>;
-		samsung,pre-init;
-	};
-
-	mmc@12210000 {
-		status = "disabled";
-	};
-
-	mmc@12220000 {
-		samsung,bus-width = <4>;
-		samsung,timing = <1 2 3>;
-		samsung,removable = <1>;
-	};
-
-	mmc@12230000 {
-		status = "disabled";
-	};
-
-	fimd@14400000 {
-		/* sysmmu is not used in U-Boot */
-		samsung,disable-sysmmu;
-	};
-
-	dp@145b0000 {
-		samsung,lt-status = <0>;
-
-		samsung,master-mode = <0>;
-		samsung,bist-mode = <0>;
-		samsung,bist-pattern = <0>;
-		samsung,h-sync-polarity = <0>;
-		samsung,v-sync-polarity = <0>;
-		samsung,interlaced = <0>;
-		samsung,color-space = <0>;
-		samsung,dynamic-range = <0>;
-		samsung,ycbcr-coeff = <0>;
-		samsung,color-depth = <1>;
-	};
-
-	dmc {
-		mem-type = "ddr3";
-	};
-
-	xhci1: xhci@12400000 {
-		compatible = "samsung,exynos5250-xhci";
-		reg = <0x12400000 0x10000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		phy {
-			compatible = "samsung,exynos5250-usb3-phy";
-			reg = <0x12500000 0x100>;
-		};
-	};
-};
diff --git a/board/samsung/origen/Makefile b/board/samsung/origen/Makefile
index e8818bf..1add9fe 100644
--- a/board/samsung/origen/Makefile
+++ b/board/samsung/origen/Makefile
@@ -4,16 +4,19 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifndef CONFIG_SPL_BUILD
-obj-y	+= origen.o
-endif
-
 ifdef CONFIG_SPL_BUILD
-all: $(OBJTREE)/tools/mk$(BOARD)spl
-endif
+# necessary to create built-in.o
+obj- := __dummy__.o
 
-# Fix ME after we implement hostprogs-y.
-ifdef CONFIG_SPL_BUILD
-$(OBJTREE)/tools/mk$(BOARD)spl:	tools/mkv310_image.c
-	$(HOSTCC) tools/mkv310_image.c -o $(OBJTREE)/tools/mk$(BOARD)spl
+hostprogs-y := tools/mkorigenspl
+always := $(hostprogs-y)
+
+# omit -O2 option to suppress
+#   warning: dereferencing type-punned pointer will break strict-aliasing rules
+#
+# TODO:
+# Fix the root cause in tools/mkorigenspl.c and delete the following work-around
+$(obj)/tools/mkorigenspl: HOSTCFLAGS:=$(filter-out -O2,$(HOSTCFLAGS))
+else
+obj-y	+= origen.o
 endif
diff --git a/board/samsung/origen/tools/mkv310_image.c b/board/samsung/origen/tools/mkorigenspl.c
index 3ed20ef..3ed20ef 100644
--- a/board/samsung/origen/tools/mkv310_image.c
+++ b/board/samsung/origen/tools/mkorigenspl.c
diff --git a/board/samsung/smdkv310/Makefile b/board/samsung/smdkv310/Makefile
index dbc621b..de0da16 100644
--- a/board/samsung/smdkv310/Makefile
+++ b/board/samsung/smdkv310/Makefile
@@ -4,16 +4,12 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifndef CONFIG_SPL_BUILD
-obj-y	+= smdkv310.o
-endif
-
 ifdef CONFIG_SPL_BUILD
-all: $(OBJTREE)/tools/mk$(BOARD)spl
-endif
+# necessary to create built-in.o
+obj- := __dummy__.o
 
-# Fix ME after we implement hostprogs-y.
-ifdef CONFIG_SPL_BUILD
-$(OBJTREE)/tools/mk$(BOARD)spl:	tools/mkv310_image.c
-	$(HOSTCC) tools/mkv310_image.c -o $(OBJTREE)/tools/mk$(BOARD)spl
+hostprogs-y := tools/mksmdkv310spl
+always := $(hostprogs-y)
+else
+obj-y	+= smdkv310.o
 endif
diff --git a/board/samsung/smdkv310/tools/mkv310_image.c b/board/samsung/smdkv310/tools/mksmdkv310spl.c
index 9a64ca6..9a64ca6 100644
--- a/board/samsung/smdkv310/tools/mkv310_image.c
+++ b/board/samsung/smdkv310/tools/mksmdkv310spl.c