From 8f8a18906b8280645a5ee560de78b00799eef767 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 2 Jun 2014 17:18:45 +0200 Subject: [PATCH 1/9] fix format specifiers Signed-off-by: Sascha Hauer --- common/bootm.c | 4 ++-- common/uimage.c | 4 +++- drivers/eeprom/at25.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 871959c54..71390cb84 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 243dfb0df..4ef09682c 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 266f2615f..3e75b5651 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; } From e0d9920f40bfe0423348252fc249d310b74d618e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:01:59 +0200 Subject: [PATCH 2/9] ARM: MXS: Remove unused variables Fixes: arch/arm/boards/crystalfontz-cfa10036/cfa10036.c: In function 'cfa10036_devices_init': arch/arm/boards/crystalfontz-cfa10036/cfa10036.c:119:9: warning: unused variable 'ret' [-Wunused-variable] arch/arm/boards/chumby_falconwing/falconwing.c: In function 'falconwing_devices_init': arch/arm/boards/chumby_falconwing/falconwing.c:287:9: warning: unused variable 'rc' [-Wunused-variable] arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c: In function 'imx23_olinuxino_devices_init': arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c:118:9: warning: unused variable 'rc' [-Wunused-variable] Signed-off-by: Sascha Hauer --- arch/arm/boards/chumby_falconwing/falconwing.c | 2 +- arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 2 +- arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 669de95b3..77581f668 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 337433856..e6ebe8207 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 3d466047b..6346c2536 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++) From 4550f93fb7dce8cda421cd8a673d3717a5b176c0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:03:07 +0200 Subject: [PATCH 3/9] ARM: friendlyarm_mini2440: refresh defconfig Fixes: arch/arm/configs/friendlyarm_mini2440_defconfig:38:warning: override: reassigning to symbol CMD_TFTP arch/arm/configs/friendlyarm_mini2440_defconfig:46:warning: override: reassigning to symbol FS_TFTP Signed-off-by: Sascha Hauer --- .../configs/friendlyarm_mini2440_defconfig | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/arch/arm/configs/friendlyarm_mini2440_defconfig b/arch/arm/configs/friendlyarm_mini2440_defconfig index acd5e42da..6cbafef4b 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_CMD_EXPORT=y -CONFIG_CMD_PRINTENV=y -CONFIG_CMD_READLINE=y -CONFIG_CMD_GLOBAL=y -CONFIG_CMD_TFTP=y +CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=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_RESET=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_GPIO=y -CONFIG_NET=y +CONFIG_CMD_EXPORT=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_FS_TFTP=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_GPIO=y +CONFIG_NET=y CONFIG_DRIVER_NET_DM9K=y # CONFIG_SPI is not set CONFIG_USB=y From eb2c63d0890a005100187a5fad729d36f398def9 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:03:52 +0200 Subject: [PATCH 4/9] mips: dlink-dir-320: refresh defconfig Fixes: arch/mips/configs/dlink-dir-320_defconfig:52:warning: override: reassigning to symbol CMD_DHCP arch/mips/configs/dlink-dir-320_defconfig:54:warning: override: reassigning to symbol CMD_PING arch/mips/configs/dlink-dir-320_defconfig:55:warning: override: reassigning to symbol CMD_TFTP arch/mips/configs/dlink-dir-320_defconfig:64:warning: override: reassigning to symbol FS_TFTP Signed-off-by: Sascha Hauer --- arch/mips/configs/dlink-dir-320_defconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/mips/configs/dlink-dir-320_defconfig b/arch/mips/configs/dlink-dir-320_defconfig index 2ff9dd7f4..ab29cf31b 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 From 0ad84fb2c2041098f7b0029e07440e9de8862c8d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:16:12 +0200 Subject: [PATCH 5/9] mips: ar9331: Add missing #address-cells/#size-cells properties SPI nodes need valid #address-cells/#size-cells properties. Fixes: Warning (reg_format): "reg" property in /soc/spi@bf000000/m25p80@0 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/spi@bf000000/m25p80@0 Warning (avoid_default_addr_size): Relying on default #size-cells value for /soc/spi@bf000000/m25p80@0 Signed-off-by: Sascha Hauer --- arch/mips/dts/ar9331.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi index 9485fbff5..8280588ab 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"; From 3aa17a1e18bbc1d5c2acf09dc67af94cf31c9591 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:17:26 +0200 Subject: [PATCH 6/9] PPC: FSL DDR: Fix compiler warning Fixes: arch/ppc/boards/freescale-p1022ds/ddr.c: In function 'fsl_ddr_board_info': arch/ppc/boards/freescale-p1022ds/ddr.c:39:21: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Sascha Hauer --- arch/ppc/include/asm/fsl_ddr_sdram.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ppc/include/asm/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h index f0f3a6335..2c45608e5 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; }; /* From 4cbecde30c1fbeb046e18df4c4f73069e8c1b14e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:18:06 +0200 Subject: [PATCH 7/9] commands: drvinfo: Make locally used function static Signed-off-by: Sascha Hauer --- commands/drvinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/drvinfo.c b/commands/drvinfo.c index 161118a63..4a4b95753 100644 --- a/commands/drvinfo.c +++ b/commands/drvinfo.c @@ -18,7 +18,7 @@ #include #include -int do_drvinfo(int argc, char *argv[]) +static int do_drvinfo(int argc, char *argv[]) { struct driver_d *drv; struct device_d *dev; From 68ad2e4daa1202a7e74d506d1d7a574414905252 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:18:32 +0200 Subject: [PATCH 8/9] gui: IMAGE_RENDERER does not depend on VIDEO Image renderer may not be particularly useful without framebuffer support, but technically it does not depend on VIDEO. Fixes: warning: (CMD_SPLASH) selects IMAGE_RENDERER which has unmet direct dependencies (VIDEO) Signed-off-by: Sascha Hauer --- lib/gui/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gui/Kconfig b/lib/gui/Kconfig index da71bae09..eac9597e2 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 From 13eb0229c1367106e1407ff17d5a5b62a696999e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:21:39 +0200 Subject: [PATCH 9/9] mips: Add builtin dtb to dtb-y Otherwise a rebuild of the dtb file is triggered each build. Signed-off-by: Sascha Hauer --- arch/mips/dts/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index 3ee89247e..348b81426 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)