Merge branch 'pu/warnings'

13 files changed, 32 insertions, 35 deletions

diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c
index 669de95b37..77581f668f 100644
--- a/arch/arm/boards/chumby_falconwing/falconwing.c
+++ b/arch/arm/boards/chumby_falconwing/falconwing.c
@@ -284,7 +284,7 @@ static void falconwing_init_usb(void)
 
 static int falconwing_devices_init(void)
 {
-	int i, rc;
+	int i;
 
 	/* initizalize gpios */
 	for (i = 0; i < ARRAY_SIZE(pad_setup); i++)
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
index 337433856d..e6ebe82076 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
@@ -116,7 +116,7 @@ mem_initcall(cfa10036_mem_init);
 
 static int cfa10036_devices_init(void)
 {
-	int i, ret;
+	int i;
 
 	/* initizalize muxing */
 	for (i = 0; i < ARRAY_SIZE(cfa10036_pads); i++)
diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index 3d466047b0..6346c25369 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -115,8 +115,7 @@ static void olinuxino_init_usb(void)
 
 static int imx23_olinuxino_devices_init(void)
 {
-	int i, rc;
-
+	int i;
 
 	/* initizalize gpios */
 	for (i = 0; i < ARRAY_SIZE(pad_setup); i++)
diff --git a/arch/arm/configs/friendlyarm_mini2440_defconfig b/arch/arm/configs/friendlyarm_mini2440_defconfig
index acd5e42da2..6cbafef4b1 100644
--- a/arch/arm/configs/friendlyarm_mini2440_defconfig
+++ b/arch/arm/configs/friendlyarm_mini2440_defconfig
@@ -7,36 +7,33 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_TEXT_BASE=0x33e00000
 CONFIG_BROKEN=y
 CONFIG_PROMPT="mini2440:"
-CONFIG_LONGHELP=y
 CONFIG_GLOB=y
-CONFIG_HUSH_GETOPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/friendlyarm-mini2440/env"
 CONFIG_DEBUG_INFO=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_LOADENV=y
+CONFIG_LONGHELP=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_PARTITION=y
 CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
 CONFIG_CMD_GLOBAL=y
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
 CONFIG_CMD_TFTP=y
-CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_CRC=y
 CONFIG_CMD_CRC_CMP=y
 CONFIG_CMD_FLASH=y
-CONFIG_CMD_RESET=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_TIMEOUT=y
-CONFIG_CMD_PARTITION=y
 CONFIG_CMD_GPIO=y
 CONFIG_NET=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-CONFIG_FS_TFTP=y
 CONFIG_DRIVER_NET_DM9K=y
 # CONFIG_SPI is not set
 CONFIG_USB=y
diff --git a/arch/mips/configs/dlink-dir-320_defconfig b/arch/mips/configs/dlink-dir-320_defconfig
index 2ff9dd7f4c..ab29cf31be 100644
--- a/arch/mips/configs/dlink-dir-320_defconfig
+++ b/arch/mips/configs/dlink-dir-320_defconfig
@@ -49,11 +49,7 @@ CONFIG_CMD_OF_PROPERTY=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
 CONFIG_NET=y
-CONFIG_CMD_DHCP=y
 CONFIG_NET_NFS=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-CONFIG_FS_TFTP=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_RESOLV=y
 CONFIG_OFDEVICE=y
diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
index 3ee89247e0..348b81426b 100644
--- a/arch/mips/dts/Makefile
+++ b/arch/mips/dts/Makefile
@@ -1,6 +1,8 @@
 
-BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME)).dtb.o
-obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB)
+BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME))
+obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o
+
+dtb-y += ${BUILTIN_DTB}.dtb
 
 targets += dtbs
 targets += $(dtb-y)
diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
index 9485fbff50..8280588ab3 100644
--- a/arch/mips/dts/ar9331.dtsi
+++ b/arch/mips/dts/ar9331.dtsi
@@ -24,6 +24,8 @@
 		};
 
 		spi: spi@bf000000{
+			#address-cells = <1>;
+			#size-cells = <0>;
 			compatible = "qca,ath79-spi";
 			reg = <0xbf000000 0x01000000>;
 			status = "disabled";
diff --git a/arch/ppc/include/asm/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h
index f0f3a63355..2c45608e5d 100644
--- a/arch/ppc/include/asm/fsl_ddr_sdram.h
+++ b/arch/ppc/include/asm/fsl_ddr_sdram.h
@@ -90,7 +90,7 @@ struct ddr_board_info_s {
 	uint32_t i2c_slave;
 	uint32_t i2c_speed;
 	void __iomem *i2c_base;
-	uint8_t *spd_i2c_addr;
+	const uint8_t *spd_i2c_addr;
 };
 
 /*
diff --git a/commands/drvinfo.c b/commands/drvinfo.c
index 161118a63e..4a4b957537 100644
--- a/commands/drvinfo.c
+++ b/commands/drvinfo.c
@@ -18,7 +18,7 @@
 #include <command.h>
 #include <driver.h>
 
-int do_drvinfo(int argc, char *argv[])
+static int do_drvinfo(int argc, char *argv[])
 {
 	struct driver_d *drv;
 	struct device_d *dev;
diff --git a/common/bootm.c b/common/bootm.c
index 871959c547..71390cb845 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -312,7 +312,7 @@ static int bootm_open_oftree(struct image_data *data, const char *oftree, int nu
 static void bootm_print_info(struct image_data *data)
 {
 	if (data->os_res)
-		printf("OS image is at 0x%08x-0x%08x\n",
+		printf("OS image is at " PRINTF_CONVERSION_RESOURCE "-" PRINTF_CONVERSION_RESOURCE "\n",
 				data->os_res->start,
 				data->os_res->end);
 	else
@@ -329,7 +329,7 @@ static void bootm_print_info(struct image_data *data)
 			printf(", multifile image %d", data->initrd_num);
 		printf("\n");
 		if (data->initrd_res)
-			printf("initrd is at 0x%08x-0x%08x\n",
+			printf("initrd is at " PRINTF_CONVERSION_RESOURCE "-" PRINTF_CONVERSION_RESOURCE "\n",
 				data->initrd_res->start,
 				data->initrd_res->end);
 		else
diff --git a/common/uimage.c b/common/uimage.c
index 243dfb0df5..4ef09682c1 100644
--- a/common/uimage.c
+++ b/common/uimage.c
@@ -353,7 +353,9 @@ static int uimage_sdram_flush(void *buf, unsigned int len)
 		uimage_resource = request_sdram_region("uimage",
 				start, size);
 		if (!uimage_resource) {
-			printf("unable to request SDRAM 0x%08x-0x%08x\n",
+			printf("unable to request SDRAM "
+					PRINTF_CONVERSION_RESOURCE "-"
+					PRINTF_CONVERSION_RESOURCE "\n",
 				start, start + size - 1);
 			return -ENOMEM;
 		}
diff --git a/drivers/eeprom/at25.c b/drivers/eeprom/at25.c
index 266f2615ff..3e75b56519 100644
--- a/drivers/eeprom/at25.c
+++ b/drivers/eeprom/at25.c
@@ -117,8 +117,8 @@ static ssize_t at25_ee_read(struct cdev *cdev,
 	 */
 	status = spi_sync(at25->spi, &m);
 	dev_dbg(at25->cdev.dev,
-		"read %d bytes at %llu --> %d\n",
-		count, offset, (int) status);
+		"read %zd bytes at %llu --> %zd\n",
+		count, offset, status);
 
 	return status ? status : count;
 }
diff --git a/lib/gui/Kconfig b/lib/gui/Kconfig
index da71bae096..eac9597e2d 100644
--- a/lib/gui/Kconfig
+++ b/lib/gui/Kconfig
@@ -2,7 +2,6 @@ menu "Library gui routines"
 
 config IMAGE_RENDERER
 	bool
-	depends on VIDEO
 	select FILETYPE
 
 if IMAGE_RENDERER