Merge branch 'for-next/randconfig'

12 files changed, 26 insertions, 13 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6e9e715433..941a5ec008 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -273,6 +273,7 @@ config AEABI
 config THUMB2_BAREBOX
 	select ARM_ASM_UNIFIED
 	select AEABI
+	depends on !ARCH_TEGRA
 	depends on CPU_V7 && !CPU_32v4T && !CPU_32v5 && !CPU_32v6
 	bool "Compile barebox in thumb-2 mode (read help)"
 	help
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 9981073c40..dc32dd37c2 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1,5 +1,7 @@
 BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME))
+ifneq ($(BUILTIN_DTB),)
 obj-dtb-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o
+endif
 
 # just to build a built-in.o. Otherwise compilation fails when no devicetree is
 # created.
diff --git a/arch/arm/mach-nomadik/clock.c b/arch/arm/mach-nomadik/clock.c
index 5f34a2cd9b..f3ea958aec 100644
--- a/arch/arm/mach-nomadik/clock.c
+++ b/arch/arm/mach-nomadik/clock.c
@@ -22,6 +22,12 @@ unsigned long clk_get_rate(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_get_rate);
 
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+	return 0;
+}
+EXPORT_SYMBOL(clk_set_rate);
+
 /* enable and disable do nothing */
 int clk_enable(struct clk *clk)
 {
diff --git a/arch/arm/pbl/.gitignore b/arch/arm/pbl/.gitignore
index 1b7f618f08..be604a81bf 100644
--- a/arch/arm/pbl/.gitignore
+++ b/arch/arm/pbl/.gitignore
@@ -1,6 +1,8 @@
 piggy.gzip
 piggy.lzo
 piggy.lz4
+piggy.xzkern
+piggy.shipped
 zbarebox
 zbarebox.bin
 zbarebox.lds
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile
index 1741090bf8..1b90b377a6 100644
--- a/arch/arm/pbl/Makefile
+++ b/arch/arm/pbl/Makefile
@@ -2,6 +2,7 @@
 suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip
 suffix_$(CONFIG_IMAGE_COMPRESSION_LZO)	= lzo
 suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4)	= lz4
+suffix_$(CONFIG_IMAGE_COMPRESSION_XZKERN)	= xzkern
 suffix_$(CONFIG_IMAGE_COMPRESSION_NONE)	= shipped
 
 OBJCOPYFLAGS_zbarebox.bin = -O binary
diff --git a/arch/arm/pbl/piggy.xzkern.S b/arch/arm/pbl/piggy.xzkern.S
new file mode 100644
index 0000000000..a7c0259590
--- /dev/null
+++ b/arch/arm/pbl/piggy.xzkern.S
@@ -0,0 +1,6 @@
+	.section .piggydata,#alloc
+	.globl	input_data
+input_data:
+	.incbin	"arch/arm/pbl/piggy.xzkern"
+	.globl	input_data_end
+input_data_end:
diff --git a/commands/Kconfig b/commands/Kconfig
index 2a73bf1f87..509e93512d 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -455,7 +455,7 @@ config CMD_GO
 	  in which case the file is memmapped and executed
 
 config CMD_LOADB
-	depends on !CONSOLE_NONE
+	depends on CONSOLE_FULL
 	select CRC16
 	tristate
 	prompt "loadb"
@@ -471,7 +471,7 @@ config CMD_LOADB
 		  -c	create file if not present
 
 config CMD_LOADS
-	depends on !CONSOLE_NONE
+	depends on CONSOLE_FULL
 	tristate
 	prompt "loads"
 	help
@@ -483,7 +483,7 @@ config CMD_LOADS
 
 config CMD_LOADY
 	select XYMODEM
-	depends on !CONSOLE_NONE
+	depends on CONSOLE_FULL
 	tristate
 	prompt "loady"
 	help
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c
index 7d3f1ffb25..43268b6bbf 100644
--- a/drivers/gpio/gpio-clps711x.c
+++ b/drivers/gpio/gpio-clps711x.c
@@ -10,7 +10,7 @@
 #include <init.h>
 #include <common.h>
 #include <malloc.h>
-
+#include <linux/err.h>
 #include <linux/basic_mmio_gpio.h>
 
 static int clps711x_gpio_probe(struct device_d *dev)
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index a2852ed7af..c1fa1517da 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -32,12 +32,6 @@
 
 #include <asm/mmu.h>
 
-#include <mach/generic.h>
-#include <mach/clock.h>
-#ifndef CONFIG_ARCH_MXS
-# include <mach/iim.h>
-#endif
-
 #include "fec_imx.h"
 
 struct fec_frame {
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index d75f54e67f..5d9158ffae 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -1,5 +1,6 @@
 menuconfig USB_GADGET
 	select USB
+	select POLLER
 	bool "USB gadget support"
 
 if USB_GADGET
@@ -13,7 +14,6 @@ config USB_GADGET_DRIVER_ARC
 	depends on ARCH_IMX || ARCH_MXS
 	default y
 	select USB_GADGET_DUALSPEED
-	select POLLER
 
 config USB_GADGET_DRIVER_AT91
 	bool
@@ -21,7 +21,6 @@ config USB_GADGET_DRIVER_AT91
 	depends on ARCH_AT91
 	default y
 	select USB_GADGET_DUALSPEED
-	select POLLER
 
 config USB_GADGET_DRIVER_PXA27X
 	bool
@@ -29,7 +28,6 @@ config USB_GADGET_DRIVER_PXA27X
 	depends on ARCH_PXA
 	default y
 	select USB_GADGET_DUALSPEED
-	select POLLER
 
 comment "USB Gadget drivers"
 
@@ -46,6 +44,7 @@ config USB_GADGET_SERIAL
 config USB_GADGET_FASTBOOT
 	bool
 	select BANNER
+	depends on COMMAND_SUPPORT
 	prompt "Android Fastboot support"
 
 endif
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 34177b3f08..f096a5456b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -87,6 +87,7 @@ config DRIVER_VIDEO_SIMPLEFB
 	  based on the active barebox framebuffer.
 
 config DRIVER_VIDEO_EDID
+	depends on I2C
 	bool "Add EDID support"
 	help
 	  This enabled support for reading and parsing EDID data from an attached
diff --git a/fs/Kconfig b/fs/Kconfig
index 64fc1176a6..04616b0ddb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -76,6 +76,7 @@ config FS_BPKFS
 
 config FS_UIMAGEFS
 	bool
+	select CRC32
 	prompt "uImage FS support"
 
 endmenu