Merge branch 'for-next/misc'

Conflicts:
	scripts/Makefile

10 files changed, 11 insertions, 8 deletions

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index c405b2703d..3a1089f0ed 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -185,8 +185,6 @@ if IMX_MULTI_BOARDS
 config MACH_EFIKA_MX_SMARTBOOK
 	bool "Efika MX smartbook"
 	select ARCH_IMX51
-	select HAVE_DEFAULT_ENVIRONMENT_NEW
-	select HAVE_PBL_MULTI_IMAGES
 	help
 	  Choose this to compile barebox for the Efika MX Smartbook
 
@@ -216,8 +214,6 @@ config MACH_DFI_FS700_M60
 config MACH_REALQ7
 	bool "DataModul i.MX6Q Real Qseven Board"
 	select ARCH_IMX6
-	select HAVE_DEFAULT_ENVIRONMENT_NEW
-	select HAVE_PBL_MULTI_IMAGES
 
 config MACH_GK802
 	bool "Zealz GK802 Mini PC"
@@ -266,7 +262,6 @@ config MACH_IMX21ADS
 	  Say Y here if you are using the Freescale i.MX21ads board equipped
 	  with a Freescale i.MX21 Processor
 
-
 # ----------------------------------------------------------
 
 comment "i.MX25 Boards"
@@ -580,7 +575,7 @@ config ARCH_IMX_USBLOADER
 
 config IMX_IIM
 	tristate "IIM fusebox device"
-	depends on !ARCH_IMX21 && !ARCH_IMX21
+	depends on !ARCH_IMX21
 	help
 	  Device driver for the IC Identification Module (IIM) fusebox. Use the
 	  regular md/mw commands to program and read the fusebox.
diff --git a/arch/arm/mach-imx/clk-imx5.c b/arch/arm/mach-imx/clk-imx5.c
index 8c7ed1cbe5..f389653315 100644
--- a/arch/arm/mach-imx/clk-imx5.c
+++ b/arch/arm/mach-imx/clk-imx5.c
@@ -11,6 +11,7 @@
 #include <driver.h>
 #include <linux/clk.h>
 #include <io.h>
+#include <of.h>
 #include <linux/clkdev.h>
 #include <linux/err.h>
 #include <mach/imx51-regs.h>
diff --git a/arch/arm/mach-imx/clk-imx6.c b/arch/arm/mach-imx/clk-imx6.c
index 4639c0b71b..c32b6ccb56 100644
--- a/arch/arm/mach-imx/clk-imx6.c
+++ b/arch/arm/mach-imx/clk-imx6.c
@@ -15,6 +15,7 @@
 #include <driver.h>
 #include <linux/clk.h>
 #include <io.h>
+#include <of.h>
 #include <linux/clkdev.h>
 #include <linux/err.h>
 #include <mach/imx6-regs.h>
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index c04af630c3..dc29d200c0 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -29,6 +29,7 @@
 #include <init.h>
 #include <clock.h>
 #include <errno.h>
+#include <of.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <notifier.h>
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index e2025b3327..3ac4075a48 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -18,6 +18,7 @@
 
 #include <common.h>
 #include <io.h>
+#include <errno.h>
 #include <sizes.h>
 #include <init.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index 938c3f377d..dccaaa9e9a 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -24,7 +24,7 @@
 #include <param.h>
 #include <fcntl.h>
 #include <malloc.h>
-
+#include <of.h>
 #include <io.h>
 
 #include <mach/iim.h>
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index a96b11044e..9861c0782b 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -360,7 +360,8 @@ static void imx_bbu_internal_v2_init_flash_header(struct bbu_handler *handler, s
 	flash_header->self = imx_handler->app_dest + flash_header_offset;
 
 	flash_header->boot_data.start = imx_handler->app_dest;
-	flash_header->boot_data.size = ALIGN(imx_pre_image_size + data->len, 4096);;
+	flash_header->boot_data.size = ALIGN(imx_pre_image_size +
+			data->len, 4096);
 
 	if (imx_handler->dcdsize) {
 		flash_header->dcd.header.tag = DCD_HEADER_TAG;
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index be44339f7d..07d7ba1be7 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <of.h>
 #include <init.h>
 #include <mach/revision.h>
 #include <mach/generic.h>
diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h
index 077133a352..3cd3b1e4cf 100644
--- a/arch/arm/mach-imx/include/mach/bbu.h
+++ b/arch/arm/mach-imx/include/mach/bbu.h
@@ -2,6 +2,7 @@
 #define __MACH_BBU_H
 
 #include <bbu.h>
+#include <errno.h>
 
 struct imx_dcd_entry;
 struct imx_dcd_v2_entry;
diff --git a/arch/arm/mach-imx/ocotp.c b/arch/arm/mach-imx/ocotp.c
index 04feb84731..e36b484e27 100644
--- a/arch/arm/mach-imx/ocotp.c
+++ b/arch/arm/mach-imx/ocotp.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <net.h>
 #include <io.h>
+#include <of.h>
 
 /*
  * a single MAC address reference has the form