19 files changed, 74 insertions, 93 deletions

diff --git a/board/Marvell/include/mv_gen_reg.h b/board/Marvell/include/mv_gen_reg.h
index 03fcd88651..008185ec78 100644
--- a/board/Marvell/include/mv_gen_reg.h
+++ b/board/Marvell/include/mv_gen_reg.h
@@ -1864,6 +1864,14 @@
 #define ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port)	   (0x3500 + (port<<10))
 #define ETH_DA_FILTER_UNICAST_TABLE_BASE(port)		(0x3600 + (port<<10))
 
+/* Compat with interrupts.c */
+#define ETHERNET0_INTERRUPT_CAUSE_REGISTER      ETH_INTERRUPT_CAUSE_REG(0)
+#define ETHERNET1_INTERRUPT_CAUSE_REGISTER      ETH_INTERRUPT_CAUSE_REG(1)
+#define ETHERNET2_INTERRUPT_CAUSE_REGISTER      ETH_INTERRUPT_CAUSE_REG(2)
+
+#define ETHERNET0_INTERRUPT_MASK_REGISTER       ETH_INTERRUPT_MASK_REG(0)
+#define ETHERNET1_INTERRUPT_MASK_REGISTER       ETH_INTERRUPT_MASK_REG(1)
+#define ETHERNET2_INTERRUPT_MASK_REGISTER       ETH_INTERRUPT_MASK_REG(2)
 
 /* Ethernet GT64260 */
 /*
diff --git a/board/altera/nios2-generic/nios2-generic.c b/board/altera/nios2-generic/nios2-generic.c
index 220a4c44a4..49ef80de96 100644
--- a/board/altera/nios2-generic/nios2-generic.c
+++ b/board/altera/nios2-generic/nios2-generic.c
@@ -74,7 +74,15 @@ int board_eth_init(bd_t *bis)
 	rc += altera_tse_initialize(0,
 				    CONFIG_SYS_ALTERA_TSE_MAC_BASE,
 				    CONFIG_SYS_ALTERA_TSE_SGDMA_RX_BASE,
-				    CONFIG_SYS_ALTERA_TSE_SGDMA_TX_BASE);
+				    CONFIG_SYS_ALTERA_TSE_SGDMA_TX_BASE,
+#if defined(CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_BASE) && \
+	(CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_SIZE > 0)
+				    CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_BASE,
+				    CONFIG_SYS_ALTERA_TSE_SGDMA_DESC_SIZE);
+#else
+				    0,
+				    0);
+#endif
 #endif
 #ifdef CONFIG_ETHOC
 	rc += ethoc_initialize(0, CONFIG_SYS_ETHOC_BASE);
diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c
index 0d8ef23368..815e4bae45 100644
--- a/board/cpc45/pd67290.c
+++ b/board/cpc45/pd67290.c
@@ -225,11 +225,7 @@ static u_int cirrus_set_opts (socket_info_t * s)
 {
 	cirrus_state_t *p = &s->c_state;
 	u_int mask = 0xffff;
-#if DEBUG
-	char buf[200];
-
-	memset (buf, 0, 200);
-#endif
+	char buf[200] = {0};
 
 	if (has_ring == -1)
 		has_ring = 1;
diff --git a/board/dave/PPChameleonEVB/flash.c b/board/dave/PPChameleonEVB/flash.c
index 2e1a9abc08..3d5b20d223 100644
--- a/board/dave/PPChameleonEVB/flash.c
+++ b/board/dave/PPChameleonEVB/flash.c
@@ -51,7 +51,8 @@ unsigned long flash_init (void)
 	int size_val = 0;
 
 	debug("[%s, %d] Entering ...\n", __FUNCTION__, __LINE__);
-	debug("[%s, %d] flash_info = 0x%08X ...\n", __FUNCTION__, __LINE__, flash_info);
+	debug("[%s, %d] flash_info = 0x%p ...\n", __func__, __LINE__,
+						flash_info);
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c
index c266ebe84f..a60809a1dd 100644
--- a/board/esd/pmc405de/pmc405de.c
+++ b/board/esd/pmc405de/pmc405de.c
@@ -441,7 +441,7 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 */
 	param = base - (pram << 10);
 	printf("PARAM: @%08x\n", param);
-	debug("memsize=0x%08x, base=0x%08x\n", gd->bd->bi_memsize, base);
+	debug("memsize=0x%08x, base=0x%08x\n", (u32)gd->bd->bi_memsize, base);
 
 	/* clear entire PA ram */
 	memset((void*)param, 0, (pram << 10));
diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 200d7ee30d..02028768f9 100644
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -368,7 +368,7 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 */
 	param = base - (pram << 10);
 	printf("PARAM: @%08x\n", param);
-	debug("memsize=0x%08x, base=0x%08x\n", gd->bd->bi_memsize, base);
+	debug("memsize=0x%08x, base=0x%08x\n", (u32)gd->bd->bi_memsize, base);
 
 	/* clear entire PA ram */
 	memset((void*)param, 0, (pram << 10));
diff --git a/board/freescale/mpc5121ads/mpc5121ads.c b/board/freescale/mpc5121ads/mpc5121ads.c
index b356a478b3..97eeab3a23 100644
--- a/board/freescale/mpc5121ads/mpc5121ads.c
+++ b/board/freescale/mpc5121ads/mpc5121ads.c
@@ -253,14 +253,14 @@ int misc_init_r(void)
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x08, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n", tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	tmp_val = 0x10;
 	i2c_write(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n", tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	return 0;
 }
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 1854e27dac..5b3b560426 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -76,14 +76,14 @@ int misc_init_r(void)
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x08, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n",tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	tmp_val = 0x10;
 	i2c_write(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n",tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	return 0;
 }
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 8f9b857334..2ce6e8e340 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -38,8 +38,8 @@
 #include <asm/arch/sys_proto.h>
 #include <netdev.h>
 
-#ifndef BOARD_LATE_INIT
-#error "BOARD_LATE_INIT must be set for this board"
+#ifndef CONFIG_BOARD_LATE_INIT
+#error "CONFIG_BOARD_LATE_INIT must be set for this board"
 #endif
 
 #ifndef CONFIG_BOARD_EARLY_INIT_F
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 8da1ee8b1a..f998610577 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -409,7 +409,7 @@ int board_init(void)
 	return 0;
 }
 
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
 #ifdef CONFIG_MXC_SPI
diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c
index cef81ce030..d5428ea16d 100644
--- a/board/freescale/p1022ds/diu.c
+++ b/board/freescale/p1022ds/diu.c
@@ -74,7 +74,7 @@ void diu_set_pixel_clock(unsigned int pixclock)
 	temp = 1000000000 / pixclock;
 	temp *= 1000;
 	pixval = speed_ccb / temp;
-	debug("DIU pixval = %lu\n", pixval);
+	debug("DIU pixval = %u\n", pixval);
 
 	/* Modify PXCLK in GUTS CLKDVDR */
 	temp = in_be32(&gur->clkdvdr) & 0x2000FFFF;
diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c
index 2cd3707d72..cd9c4e2076 100644
--- a/board/hymod/bsp.c
+++ b/board/hymod/bsp.c
@@ -200,7 +200,7 @@ do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 			load_addr = simple_strtoul (argv[3], NULL, 16);
 			NetBootFileXferSize = 0;
 
-			if (NetLoop (TFTP) <= 0) {
+			if (NetLoop(TFTPGET) <= 0) {
 				printf ("tftp transfer failed - aborting "
 					"fgpa load\n");
 				return 1;
diff --git a/board/hymod/fetch.c b/board/hymod/fetch.c
index e121d5565e..f5f9582e95 100644
--- a/board/hymod/fetch.c
+++ b/board/hymod/fetch.c
@@ -55,7 +55,7 @@ fetch_and_parse (char *fn, ulong addr, int (*cback)(uchar *, uchar *))
 	load_addr = addr;
 	NetBootFileXferSize = 0;
 
-	if (NetLoop (TFTP) == 0) {
+	if (NetLoop(TFTPGET) == 0) {
 		printf ("tftp transfer of file '%s' failed\n", fn);
 		return (0);
 	}
diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c
index 773900e3c9..47f1a8d1c0 100644
--- a/board/imx31_phycore/imx31_phycore.c
+++ b/board/imx31_phycore/imx31_phycore.c
@@ -74,7 +74,7 @@ int board_early_init_f(void)
 	return 0;
 }
 
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
 #ifdef CONFIG_S6E63D6
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index f78f754f37..67f158c1eb 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -481,38 +481,6 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
 }
 #endif
 
-#if defined(CONFIG_POST)
-
-#define KM_POST_EN_L   44
-
-int post_hotkeys_pressed(void)
-{
-	return !kw_gpio_get_value(KM_POST_EN_L);
-}
-
-ulong post_word_load(void)
-{
-	volatile void* addr = (void *) (gd->ram_size - BOOTCOUNT_ADDR + 4);
-	return in_le32(addr);
-
-}
-void post_word_store(ulong value)
-{
-	volatile void* addr = (void *) (gd->ram_size - BOOTCOUNT_ADDR + 4);
-	out_le32(addr, value);
-}
-
-int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset)
-{
-	*vstart = CONFIG_SYS_SDRAM_BASE;
-
-	/* we go up to relocation plus a 1 MB margin */
-	*size = CONFIG_SYS_TEXT_BASE - (1<<20);
-
-	return 0;
-}
-#endif
-
 #if defined(CONFIG_SYS_EEPROM_WREN)
 int eeprom_write_enable(unsigned dev_addr, int state)
 {
diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index 45cccf712b..26ec11d5d2 100644
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@@ -219,7 +219,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info)
 
 	value = addr[0];
 
-	debug ("Manuf. ID @ 0x%08lx: 0x%08lx\n", (ulong)addr, value);
+	debug("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
 
 	switch (value) {
 	case (FPW) INTEL_MANUFACT:
@@ -235,7 +235,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info)
 
 	value = addr[1];			/* device ID        */
 
-	debug ("Device ID @ 0x%08lx: 0x%08lx\n", (ulong)(&addr[1]), value);
+	debug("Device ID @ 0x%08lx: 0x%08x\n", (ulong)(&addr[1]), value);
 
 	switch (value) {
 	case (FPW) INTEL_ID_28F320J3A:
diff --git a/board/spc1920/hpi.c b/board/spc1920/hpi.c
index 26d0f9c33d..9d8ec1006d 100644
--- a/board/spc1920/hpi.c
+++ b/board/spc1920/hpi.c
@@ -234,13 +234,13 @@ 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%lx to 0x%lx\n",
+	debug("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);
 		HPI_HPID_INC_2 = (u16) (data[i] & 0xffff);
-		debugX(4, "hpi_write_inc: data1=0x%x, data2=0x%x\n",
+		debug("hpi_write_inc: data1=0x%x, data2=0x%x\n",
 		       (u16) ((data[i] >> 16) & 0xffff),
 		       (u16) (data[i] & 0xffff));
 	}
@@ -273,7 +273,7 @@ static int hpi_read_inc(u32 addr, u32 *buf, u32 count)
 	for(i=0; i<count; i++) {
 		data1 = HPI_HPID_INC_1;
 		data2 = HPI_HPID_INC_2;
-		debugX(4, "hpi_read_inc: data1=0x%x, data2=0x%x\n", data1, data2);
+		debug("hpi_read_inc: data1=0x%x, data2=0x%x\n", data1, data2);
 		buf[i] = (((u32) data1) << 16) | (data2 & 0xffff);
 	}
 
@@ -354,9 +354,9 @@ int hpi_test(void)
 	u32 test_data[HPI_TEST_CHUNKSIZE];
 	u32 read_data[HPI_TEST_CHUNKSIZE];
 
-	debugX(2, "hpi_test: activating hpi...");
+	debug("hpi_test: activating hpi...");
 	hpi_activate();
-	debugX(2, "OK.\n");
+	debug("OK.\n");
 
 #if 0
 	/* Dump the first 1024 bytes
@@ -372,22 +372,22 @@ int hpi_test(void)
 	/* HPIA read-write test
 	 *
 	 */
-	debugX(1, "hpi_test: starting HPIA read-write tests...\n");
+	debug("hpi_test: starting HPIA read-write tests...\n");
 	err |= hpi_write_addr_test(0xdeadc0de);
 	err |= hpi_write_addr_test(0xbeefd00d);
 	err |= hpi_write_addr_test(0xabcd1234);
 	err |= hpi_write_addr_test(0xaaaaaaaa);
 	if(err) {
-		debugX(1, "hpi_test: HPIA read-write tests: *** FAILED ***\n");
+		debug("hpi_test: HPIA read-write tests: *** FAILED ***\n");
 		return -1;
 	}
-	debugX(1, "hpi_test: HPIA read-write tests: OK\n");
+	debug("hpi_test: HPIA read-write tests: OK\n");
 
 
 	/* read write test using nonincremental data regs
 	 *
 	 */
-	debugX(1, "hpi_test: starting nonincremental tests...\n");
+	debug("hpi_test: starting nonincremental tests...\n");
 	for(i=HPI_TEST_START; i<HPI_TEST_END; i+=4) {
 		err |= hpi_read_write_test(i, pattern);
 
@@ -400,16 +400,16 @@ int hpi_test(void)
 		err |= hpi_read_write_test(i, pattern);
 
 		if(err) {
-			debugX(1, "hpi_test: nonincremental tests *** FAILED ***\n");
+			debug("hpi_test: nonincremental tests *** FAILED ***\n");
 			return -1;
 		}
 	}
-	debugX(1, "hpi_test: nonincremental test OK\n");
+	debug("hpi_test: nonincremental test OK\n");
 
 	/* read write a chunk of data using nonincremental data regs
 	 *
 	 */
-	debugX(1, "hpi_test: starting nonincremental chunk tests...\n");
+	debug("hpi_test: starting nonincremental chunk tests...\n");
 	pattern = HPI_TEST_PATTERN;
 	for(i=HPI_TEST_START; i<HPI_TEST_END; i+=4) {
 		hpi_write_noinc(i, pattern);
@@ -426,7 +426,7 @@ int hpi_test(void)
 		tmp = hpi_read_noinc(i);
 
 		if(tmp != pattern) {
-			debugX(1, "hpi_test: noninc chunk test *** FAILED *** @ 0x%x, written=0x%x, read=0x%x\n", i, pattern, tmp);
+			debug("hpi_test: noninc chunk test *** FAILED *** @ 0x%x, written=0x%x, read=0x%x\n", i, pattern, tmp);
 			err = -1;
 		}
 		/* stolen from cmd_mem.c */
@@ -438,23 +438,23 @@ int hpi_test(void)
 	}
 	if(err)
 		return -1;
-	debugX(1, "hpi_test: nonincremental chunk test OK\n");
+	debug("hpi_test: nonincremental chunk test OK\n");
 
 
 #ifdef DO_TINY_TEST
 	/* small verbose test using autoinc and nonautoinc to compare
 	 *
 	 */
-	debugX(1, "hpi_test: tiny_autoinc_test...\n");
+	debug("hpi_test: tiny_autoinc_test...\n");
 	hpi_tiny_autoinc_test();
-	debugX(1, "hpi_test: tiny_autoinc_test done\n");
+	debug("hpi_test: tiny_autoinc_test done\n");
 #endif /* DO_TINY_TEST */
 
 
 	/* $%& write a chunk of data using the autoincremental regs
 	 *
 	 */
-	debugX(1, "hpi_test: starting autoinc test %d chunks with 0x%x bytes...\n",
+	debug("hpi_test: starting autoinc test %d chunks with 0x%x bytes...\n",
 	       ((HPI_TEST_END - HPI_TEST_START) / HPI_TEST_CHUNKSIZE),
 	       HPI_TEST_CHUNKSIZE);
 
@@ -462,9 +462,9 @@ int hpi_test(void)
 	    i < ((HPI_TEST_END - HPI_TEST_START) / HPI_TEST_CHUNKSIZE);
 	    i++) {
 		/* generate the pattern data */
-		debugX(3, "generating pattern data: ");
+		debug("generating pattern data: ");
 		for(ii = 0; ii < HPI_TEST_CHUNKSIZE; ii++) {
-			debugX(3, "0x%x ", pattern);
+			debug("0x%x ", pattern);
 
 			test_data[ii] = pattern;
 			read_data[ii] = 0x0; /* zero to be sure */
@@ -476,24 +476,24 @@ int hpi_test(void)
 				pattern = ~pattern;
 			}
 		}
-		debugX(3, "done\n");
+		debug("done\n");
 
-		debugX(2, "Writing autoinc data @ 0x%x\n", i);
+		debug("Writing autoinc data @ 0x%x\n", i);
 		hpi_write_inc(i, test_data, HPI_TEST_CHUNKSIZE);
 
-		debugX(2, "Reading autoinc data @ 0x%x\n", i);
+		debug("Reading autoinc data @ 0x%x\n", i);
 		hpi_read_inc(i, read_data, HPI_TEST_CHUNKSIZE);
 
 		/* compare */
 		for(ii = 0; ii < HPI_TEST_CHUNKSIZE; ii++) {
-			debugX(3, "hpi_test_autoinc: @ 0x%x, written=0x%x, read=0x%x", i+ii, test_data[ii], read_data[ii]);
+			debug("hpi_test_autoinc: @ 0x%x, written=0x%x, read=0x%x", i+ii, test_data[ii], read_data[ii]);
 			if(read_data[ii] != test_data[ii]) {
-				debugX(0, "hpi_test: autoinc test @ 0x%x, written=0x%x, read=0x%x *** FAILED ***\n", i+ii, test_data[ii], read_data[ii]);
+				debug("hpi_test: autoinc test @ 0x%x, written=0x%x, read=0x%x *** FAILED ***\n", i+ii, test_data[ii], read_data[ii]);
 				return -1;
 			}
 		}
 	}
-	debugX(1, "hpi_test: autoinc test OK\n");
+	debug("hpi_test: autoinc test OK\n");
 
 	return 0;
 }
@@ -510,22 +510,22 @@ int hpi_test(void)
 		0x0009000a, 0x000b000c, 0x000d000e, 0x000f0001
 	};
 
-	debugX(0, "hpi_test: activating hpi...");
+	debug("hpi_test: activating hpi...");
 	hpi_activate();
-	debugX(0, "OK.\n");
+	debug("OK.\n");
 
 	while(1) {
 		led9(1);
-		debugX(0, " writing to autoinc...\n");
+		debug(" writing to autoinc...\n");
 		hpi_write_inc(TINY_AUTOINC_BASE_ADDR,
 			      dummy_data, TINY_AUTOINC_DATA_SIZE);
 
-		debugX(0, " reading from autoinc...\n");
+		debug(" reading from autoinc...\n");
 		hpi_read_inc(TINY_AUTOINC_BASE_ADDR,
 			     read_data, TINY_AUTOINC_DATA_SIZE);
 
 		for(i=0; i < (TINY_AUTOINC_DATA_SIZE); i++) {
-			debugX(0, " written=0x%x, read(inc)=0x%x\n",
+			debug(" written=0x%x, read(inc)=0x%x\n",
 			       dummy_data[i], read_data[i]);
 		}
 		led9(0);
@@ -546,11 +546,11 @@ static int hpi_write_addr_test(u32 addr)
 	read_back = (((u32) HPI_HPIA_1)<<16) | ((u32) HPI_HPIA_2);
 
 	if(read_back == addr) {
-		debugX(2, " hpi_write_addr_test OK: written=0x%x, read=0x%x\n",
+		debug(" hpi_write_addr_test OK: written=0x%x, read=0x%x\n",
 		       addr, read_back);
 		return 0;
 	} else {
-		debugX(0, " hpi_write_addr_test *** FAILED ***: written=0x%x, read=0x%x\n",
+		debug(" hpi_write_addr_test *** FAILED ***: written=0x%x, read=0x%x\n",
 		      addr, read_back);
 		return -1;
 	}
@@ -567,10 +567,10 @@ static int hpi_read_write_test(u32 addr, u32 data)
 	read_back = hpi_read_noinc(addr);
 
 	if(read_back == data) {
-		debugX(2, " hpi_read_write_test: OK, addr=0x%x written=0x%x, read=0x%x\n", addr, data, read_back);
+		debug(" hpi_read_write_test: OK, addr=0x%x written=0x%x, read=0x%x\n", addr, data, read_back);
 		return 0;
 	} else {
-		debugX(0, " hpi_read_write_test: *** FAILED ***, addr=0x%x written=0x%x, read=0x%x\n", addr, data, read_back);
+		debug(" hpi_read_write_test: *** FAILED ***, addr=0x%x written=0x%x, read=0x%x\n", addr, data, read_back);
 		return -1;
 	}
 
diff --git a/board/st-ericsson/u8500/u8500_href.c b/board/st-ericsson/u8500/u8500_href.c
index 9283fab685..5f85fdcbfc 100644
--- a/board/st-ericsson/u8500/u8500_href.c
+++ b/board/st-ericsson/u8500/u8500_href.c
@@ -226,7 +226,7 @@ unsigned int addr_vall_arr[] = {
 	0xA03FE024, 0x00000000	/* USB */
 };
 
-#ifdef BOARD_LATE_INIT
+#ifdef CONFIG_BOARD_LATE_INIT
 #ifdef CONFIG_MMC
 
 #define LDO_VAUX3_MASK		0x3
@@ -351,7 +351,7 @@ int board_late_init(void)
 
 	return 0;
 }
-#endif /* BOARD_LATE_INIT */
+#endif /* CONFIG_BOARD_LATE_INIT */
 
 static void early_gpio_setup(struct gpio_register *gpio_reg, u32 bits)
 {
diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 260e3928d7..7af8b4ca67 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -123,7 +123,7 @@ phys_size_t initdram (int board_type)
 			(long *)(CONFIG_SYS_DDR_BASE + size));
 		size += bank_size;
 
-		debug("DDR Bank%d size: %d MiB\n\n", cs, bank_size >> 20);
+		debug("DDR Bank%d size: %ld MiB\n\n", cs, bank_size >> 20);
 
 		/* exit if less than one bank */
 		if(size < DDR_MAX_SIZE_PER_CS) break;
@@ -333,7 +333,7 @@ static long int get_ddr_bank_size(short cs, long *base)
  */
 static void set_cs_bounds(short cs, long base, long size)
 {
-	debug("Setting bounds %08x, %08x for cs %d\n", base, size, cs);
+	debug("Setting bounds %08lx, %08lx for cs %d\n", base, size, cs);
 	if(size == 0){
 		im->ddr.csbnds[cs].csbnds = 0x00000000;
 	} else {
@@ -351,7 +351,7 @@ static void set_cs_bounds(short cs, long base, long size)
  */
 static void set_cs_config(short cs, long config)
 {
-	debug("Setting config %08x for cs %d\n", config, cs);
+	debug("Setting config %08lx for cs %d\n", config, cs);
 	im->ddr.cs_config[cs] = config;
 	SYNC;
 }