Fix some more print() format errors.

Signed-off-by: Wolfgang Denk <wd@denx.de>

18 files changed, 43 insertions, 36 deletions

diff --git a/board/ads5121/ads5121.c b/board/ads5121/ads5121.c
index de59991d2a..d5cee64bde 100644
--- a/board/ads5121/ads5121.c
+++ b/board/ads5121/ads5121.c
@@ -29,6 +29,8 @@
 #ifdef CONFIG_MISC_INIT_R
 #include <i2c.h>
 #endif
+#include "iopin.h"	/* for iopin_initialize() prototype */
+
 /* Clocks in use */
 #define SCCR1_CLOCKS_EN	(CLOCK_SCCR1_CFG_EN |				\
 			 CLOCK_SCCR1_LPC_EN |				\
@@ -52,8 +54,7 @@ long int fixed_sdram(void);
 int board_early_init_f (void)
 {
 	volatile immap_t *im = (immap_t *) CFG_IMMR;
-	u32 lpcaw, tmp32;
-	int i;
+	u32 lpcaw;
 
 	/*
 	 * Initialize Local Window for the CPLD registers access (CS2 selects
@@ -206,6 +207,7 @@ long int fixed_sdram (void)
 int misc_init_r(void)
 {
 	u8 tmp_val;
+	extern int ads5121_diu_init(void);
 
 	/* Using this for DIU init before the driver in linux takes over
 	 *  Enable the TFP410 Encoder (I2C address 0x38)
diff --git a/board/atum8548/atum8548.c b/board/atum8548/atum8548.c
index 4d8c6fbae3..34f4599048 100644
--- a/board/atum8548/atum8548.c
+++ b/board/atum8548/atum8548.c
@@ -53,7 +53,7 @@ int checkboard (void)
 	volatile ccsr_local_ecm_t *ecm = (void *)(CFG_MPC85xx_ECM_ADDR);
 
 	if ((uint)&gur->porpllsr != 0xe00e0000) {
-		printf("immap size error %x\n",&gur->porpllsr);
+		printf("immap size error %lx\n",(ulong)&gur->porpllsr);
 	}
 	printf ("Board: ATUM8548\n");
 
diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c
index f7f0013c7d..48bc65de22 100644
--- a/board/bc3450/cmd_bc3450.c
+++ b/board/bc3450/cmd_bc3450.c
@@ -189,7 +189,7 @@ int cmd_dip (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	if (rc > 0x0F)
 		return -1;
 
-	printf ("0x%x\n", rc);
+	printf ("0x%lx\n", rc);
 	return 0;
 }
 
diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c
index 354f2bf6eb..2201bdd8cc 100644
--- a/board/cm5200/cmd_cm5200.c
+++ b/board/cm5200/cmd_cm5200.c
@@ -335,7 +335,7 @@ int do_rs232(char *argv[])
 		if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x10000000) !=
 				0x10000000) {
 			error_status = 2;
-			printf("%s: failure at rs232_4, rxd status is %d "
+			printf("%s: failure at rs232_4, rxd status is %lu "
 				"(should be 1)\n", __FUNCTION__,
 				((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
 					0x10000000) >> 28);
@@ -350,7 +350,7 @@ int do_rs232(char *argv[])
 		if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x10000000) !=
 				0x00000000) {
 			error_status = 2;
-			printf("%s: failure at rs232_4, rxd status is %d "
+			printf("%s: failure at rs232_4, rxd status is %lu "
 				"(should be 0)\n", __FUNCTION__,
 				((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
 					0x10000000) >> 28);
@@ -366,7 +366,7 @@ int do_rs232(char *argv[])
 		if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x20000000) !=
 				0x20000000) {
 			error_status = 3;
-			printf("%s: failure at rs232_4, cts status is %d "
+			printf("%s: failure at rs232_4, cts status is %lu "
 				"(should be 1)\n", __FUNCTION__,
 				((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
 					0x20000000) >> 29);
@@ -381,7 +381,7 @@ int do_rs232(char *argv[])
 		if (((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) & 0x20000000) !=
 				0x00000000) {
 			error_status = 3;
-			printf("%s: failure at rs232_4, cts status is %d "
+			printf("%s: failure at rs232_4, cts status is %lu "
 				"(should be 0)\n", __FUNCTION__,
 				((*(vu_long *)MPC5XXX_WU_GPIO_DATA_I) &
 					0x20000000) >> 29);
diff --git a/board/cm5200/fwupdate.c b/board/cm5200/fwupdate.c
index 19aa94a5a0..5a27191352 100644
--- a/board/cm5200/fwupdate.c
+++ b/board/cm5200/fwupdate.c
@@ -63,7 +63,7 @@ void cm5200_fwupdate(void)
 	if (!bcmd)
 		return;
 
-	sprintf(ka, "%lx", LOAD_ADDR);
+	sprintf(ka, "%lx", (ulong)LOAD_ADDR);
 
 	/* prepare our bootargs */
 	rsargs = getenv("rs-args");
diff --git a/board/fads/flash.c b/board/fads/flash.c
index f0fb621271..7cda3a412f 100644
--- a/board/fads/flash.c
+++ b/board/fads/flash.c
@@ -90,7 +90,7 @@ unsigned long flash_init (void)
 	default:
 		pd_size = 0;
 		or_am = 0xFFE00000;
-		printf("## Unsupported flash detected by BCSR: 0x%08X\n", bcsr[2]);
+		printf("## Unsupported flash detected by BCSR: 0x%08lX\n", bcsr[2]);
 	}
 
 	total_size = 0;
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index f615b2384a..8c4b04097e 100644
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -47,7 +47,7 @@ int checkboard (void)
 	volatile ccsr_local_ecm_t *ecm = (void *)(CFG_MPC85xx_ECM_ADDR);
 
 	if ((uint)&gur->porpllsr != 0xe00e0000) {
-		printf("immap size error %x\n",&gur->porpllsr);
+		printf("immap size error %lx\n",(ulong)&gur->porpllsr);
 	}
 	printf ("Board: MPC8544DS\n");
 
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 0bf21d592d..ff1b892b51 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -99,8 +99,8 @@ int checkboard(void)
 	volatile immap_t *immap = (immap_t *)CFG_IMMR;
 	volatile ccsr_local_mcm_t *mcm = &immap->im_local_mcm;
 
-	printf ("Board: MPC8610HPCD, System ID: 0x%02lx, "
-		"System Version: 0x%02lx, FPGA Version: 0x%02lx\n",
+	printf ("Board: MPC8610HPCD, System ID: 0x%02x, "
+		"System Version: 0x%02x, FPGA Version: 0x%02x\n",
 		in8(PIXIS_BASE + PIXIS_ID), in8(PIXIS_BASE + PIXIS_VER),
 		in8(PIXIS_BASE + PIXIS_PVER));
 
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index b30c6b1e92..db46953044 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -47,8 +47,8 @@ int board_early_init_f(void)
 
 int checkboard(void)
 {
-	printf ("Board: MPC8641HPCN, System ID: 0x%02lx, "
-		"System Version: 0x%02lx, FPGA Version: 0x%02lx\n",
+	printf ("Board: MPC8641HPCN, System ID: 0x%02x, "
+		"System Version: 0x%02x, FPGA Version: 0x%02x\n",
 		in8(PIXIS_BASE + PIXIS_ID), in8(PIXIS_BASE + PIXIS_VER),
 		in8(PIXIS_BASE + PIXIS_PVER));
 	return 0;
diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index 5580c11887..2ed66ddb41 100644
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -491,7 +491,7 @@ int do_auto_update(void)
 			aufile[i], sz, image_get_header_size ());
 
 		if (sz != ausize[i]) {
-			printf ("%s: size %d read %d?\n", aufile[i], ausize[i], sz);
+			printf ("%s: size %ld read %ld?\n", aufile[i], ausize[i], sz);
 			continue;
 		}
 
diff --git a/board/mpc8540eval/flash.c b/board/mpc8540eval/flash.c
index 7300a041a2..79eb04ca87 100644
--- a/board/mpc8540eval/flash.c
+++ b/board/mpc8540eval/flash.c
@@ -591,7 +591,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 		cnt -= FLASH_BLOCK_SIZE;
 		if (((count-cnt)>>10)>temp) {
 			temp=(count-cnt)>>10;
-			printf("\r%d KB",temp);
+			printf("\r%lu KB",temp);
 		}
 	}
 	printf("\n");
@@ -699,7 +699,8 @@ static int write_block(flash_info_t *info, uchar * src, ulong dest, ulong cnt)
 			}
 		}
 		if (csr & 0x4040) {
-			printf ("CSR indicates write error (%04x) at %08lx\n", csr, (ulong)addr);
+			printf ("CSR indicates write error (%04lx) at %08lx\n",
+				csr, (ulong)addr);
 			flag = 1;
 		}
 		/* Clear Status Registers Command */
@@ -756,7 +757,8 @@ static int write_short (flash_info_t *info, ulong dest, ushort data)
 			}
 		}
 		if (csr & 0x4040) {
-			printf ("CSR indicates write error (%04x) at %08lx\n", csr, (ulong)addr);
+			printf ("CSR indicates write error (%04lx) at %08lx\n",
+				csr, (ulong)addr);
 			flag = 1;
 		}
 		/* Clear Status Registers Command */
diff --git a/board/netstal/common/nm_bsp.c b/board/netstal/common/nm_bsp.c
index 86f491b34e..e38b7069ce 100644
--- a/board/netstal/common/nm_bsp.c
+++ b/board/netstal/common/nm_bsp.c
@@ -75,8 +75,8 @@ void set_params_for_sw_install(int install_requested, char *board_name )
 		setenv("install", string);
 		sprintf(string, "setenv bootargs emac(0,0)c:%s/%s_sw_inst "
 			"e=${ipaddr} h=${serverip} f=0x1000; "
-			"bootvx ${loadaddr}\0",
-			board_name, board_name);
+			"bootvx ${loadaddr}%c",
+			board_name, board_name, 0);
 		setenv("boot_sw_inst", string);
 	}
 }
@@ -108,10 +108,12 @@ void common_misc_init_r(void)
 		gd->bd->bi_enetaddr[3] = (serial >> 16) & 0xff;
 		gd->bd->bi_enetaddr[4] = (serial >>  8) & 0xff;
 		gd->bd->bi_enetaddr[5] = hcu_get_slot();
-		sprintf(ethaddr, "%02X:%02X:%02X:%02X:%02X:%02X\0",
+		sprintf(ethaddr, "%02X:%02X:%02X:%02X:%02X:%02X%c",
 			gd->bd->bi_enetaddr[0], gd->bd->bi_enetaddr[1],
 			gd->bd->bi_enetaddr[2], gd->bd->bi_enetaddr[3],
-			gd->bd->bi_enetaddr[4], gd->bd->bi_enetaddr[5]) ;
+			gd->bd->bi_enetaddr[4],
+			gd->bd->bi_enetaddr[5],
+			0) ;
 		printf("%s: Setting eth %s serial 0x%x\n",  __FUNCTION__,
 		       ethaddr, serial);
 		setenv(DEFAULT_ETH_ADDR, ethaddr);
diff --git a/board/o2dnt/flash.c b/board/o2dnt/flash.c
index 037d28732d..349086ffb5 100644
--- a/board/o2dnt/flash.c
+++ b/board/o2dnt/flash.c
@@ -411,7 +411,7 @@ static int write_data (flash_info_t *info, FPWV *dest, FPW data)
 
 	/* Check if Flash is (sufficiently) erased */
 	if ((*addr & data) != data) {
-		printf ("not erased at %08lx (%lx)\n", (ulong) addr, *addr);
+		printf ("not erased at %08lx (%x)\n", (ulong) addr, *addr);
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c
index 86d259fac4..97049013e1 100644
--- a/board/sandburst/metrobox/metrobox.c
+++ b/board/sandburst/metrobox/metrobox.c
@@ -270,7 +270,7 @@ int checkboard (void)
 	}
 
 	printf ("OptoFPGA ID:\t0x%02X\tRev:  0x%02X\n", opto_id, opto_rev);
-	printf ("Board Rev:\t0x%02X\tID:  %s\n", brd_rev, board_id_as[brd_id]);
+	printf ("Board Rev:\t0x%02X\tID:  %s\n", brd_rev, (char *)board_id_as[brd_id]);
 
 	/* Fix the ack in the bme 32 */
 	udelay(5000);
diff --git a/board/spc1920/hpi.c b/board/spc1920/hpi.c
index cd7799b277..cf21b215b7 100644
--- a/board/spc1920/hpi.c
+++ b/board/spc1920/hpi.c
@@ -234,7 +234,8 @@ static int hpi_write_inc(u32 addr, u32 *data, u32 count)
 	HPI_HPIA_1 = addr1;
 	HPI_HPIA_2 = addr2;
 
-	debugX(4, "writing from data=0x%x to 0x%x\n", data, (data+count));
+	debugX(4, "writing from data=0x%lx to 0x%lx\n",
+		(ulong)data, (ulong)(data+count));
 
 	for(i=0; i<count; i++) {
 		HPI_HPID_INC_1 = (u16) ((data[i] >> 16) & 0xffff);
diff --git a/board/total5200/total5200.c b/board/total5200/total5200.c
index 868ebd5f54..1ae24c4f3a 100644
--- a/board/total5200/total5200.c
+++ b/board/total5200/total5200.c
@@ -67,14 +67,14 @@ int checkboard (void)
 	puts ("Board: Total5100 ");
 #endif
 
-/*
- * Retrieve FPGA Revision.
- */
-printf ("(FPGA %08X)\n", *(vu_long *) (CFG_FPGA_BASE + 0x400));
+	/*
+	 * Retrieve FPGA Revision.
+	 */
+	printf ("(FPGA %08lX)\n", *(vu_long *) (CFG_FPGA_BASE + 0x400));
 
-/*
- * Take all peripherals in power-up mode.
- */
+	/*
+	 * Take all peripherals in power-up mode.
+	 */
 #if CONFIG_TOTAL5200_REV==2
 	*(vu_char *) (CFG_CPLD_BASE + 0x46) = 0x70;
 #else
diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index 7472ca9e97..58039d4170 100644
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -478,7 +478,7 @@ static int cmd_wav(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	}
 	set_attenuation(volume);
 
-	printf("Play wave file at %#p with length %#x\n", addr, length);
+	printf("Play wave file at %lX with length %lX\n", addr, length);
 	rcode = i2s_play_wave(addr, length);
 
 	return rcode;
diff --git a/board/tqc/tqm8272/tqm8272.c b/board/tqc/tqm8272/tqm8272.c
index 29099f5ed1..cde02961be 100644
--- a/board/tqc/tqm8272/tqm8272.c
+++ b/board/tqc/tqm8272/tqm8272.c
@@ -652,7 +652,7 @@ static int dump_hwib(void)
 		printf ("ethaddr: %s\n", hw->ethaddr);
 		printf ("FLASH	: %x nr:%d\n", hw->flash, hw->flash_nr);
 		printf ("RAM	: %x cs:%d\n", hw->ram, hw->ram_cs);
-		printf ("CPU	: %d\n", hw->cpunr);
+		printf ("CPU	: %lu\n", hw->cpunr);
 		printf ("CAN	: %d\n", hw->can);
 		if (hw->eeprom) printf ("EEprom : %x\n", hw->eeprom);
 		else printf ("No EEprom\n");
@@ -663,7 +663,7 @@ static int dump_hwib(void)
 		printf ("Bus %s mode.\n", (hw->Bus ? "60x" : "Single PQII"));
 		printf ("  real : %s\n", (immr->im_siu_conf.sc_bcr & BCR_EBM ? \
 				 "60x" : "Single PQII"));
-		printf ("Option : %x\n", hw->option);
+		printf ("Option : %lx\n", hw->option);
 		printf ("%s Security Engine\n", (hw->SecEng ? "with" : "no"));
 		printf ("CPM Clk: %d\n", hw->cpmcl);
 		printf ("CPU Clk: %d\n", hw->cpucl);