Silencing TOC and itp error messages not applicable to snowball.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

5 files changed, 13 insertions, 7 deletions

diff --git a/board/st/u8500/mcde_display_image.c b/board/st/u8500/mcde_display_image.c
index 12397354b..a66a35f14 100644
--- a/board/st/u8500/mcde_display_image.c
+++ b/board/st/u8500/mcde_display_image.c
@@ -14,6 +14,7 @@
 #include <mmc.h>
 #include <bmp_layout.h>
 #include <asm/arch/common.h>
+#include <asm/arch/cpu.h>
 #include "mcde.h"
 #include "mcde_display.h"
 
@@ -161,7 +162,7 @@ int mcde_display_image(struct mcde_chnl_state *chnl)
 
 	if (toc_load_toc_entry(&emmc_dev->block_dev, MCDE_TOC_SPLASH_NAME, 0,
 			       0, address)) {
-		printf("mcde_display_image: no splash image found.\n");
+		HREF_PRINTF("mcde_display_image: no splash image found.\n");
 		return -ENOENT;
 	}
 
diff --git a/cpu/arm_cortexa9/db8500/cspsa_fp.c b/cpu/arm_cortexa9/db8500/cspsa_fp.c
index 2b0a22af0..de220e97e 100644
--- a/cpu/arm_cortexa9/db8500/cspsa_fp.c
+++ b/cpu/arm_cortexa9/db8500/cspsa_fp.c
@@ -12,7 +12,7 @@
  * Safe Parameter Storage.
  *
  */
-
+#include <asm/arch/cpu.h>
 #include <asm/arch/cspsa_fp.h>
 #include <malloc.h>
 #include <part.h>
@@ -177,7 +177,7 @@ static int find_cspsa_area(block_dev_desc_t *block_dev, u32 *start_block,
 
 	if (get_entry_info_toc(block_dev, CSPSA_PARTITION_NAME, &offset,
 			       &size, &loadaddr)) {
-		printf("find_cspsa_area: get_entry_info_toc failed\n");
+		HREF_PRINTF("Find_cspsa_area: get_entry_info_toc failed\n");
 		return 1;
 	}
 	(void) loadaddr;
diff --git a/cpu/arm_cortexa9/db8500/itp.c b/cpu/arm_cortexa9/db8500/itp.c
index 6e1102444..3bb3373ea 100644
--- a/cpu/arm_cortexa9/db8500/itp.c
+++ b/cpu/arm_cortexa9/db8500/itp.c
@@ -13,6 +13,7 @@
 #include <asm/arch/itp.h>
 #include <asm/arch/cspsa_fp.h>
 #include <asm/arch/sec_bridge.h>
+#include <asm/arch/cpu.h>
 
 #define IPL_ITEM_ID			0x02
 
@@ -70,7 +71,7 @@ static int itp_load_toc_entry(block_dev_desc_t *block_dev,
 
 	if (get_entry_info_toc(block_dev, partname, &offset,
 			       &size, loadaddress)) {
-		printf("itp_load_toc_entry: %s not present\n", partname);
+		HREF_PRINTF("itp_load_toc_entry: %s not present\n", partname);
 		return 1;
 	}
 
@@ -133,7 +134,7 @@ int itp_read_config(block_dev_desc_t *block_dev)
 	if (cspsa_fp_read(block_dev,
 			  ITP_CSPSA_KEY,
 			  &cspsa_key)) {
-		printf("itp_read_config: config not present. "
+		HREF_PRINTF("itp_read_config: config not present. "
 			   "Using default values\n");
 		cspsa_key = (ITP_LOAD_MODEM | ITP_LOAD_KERNEL);
 	}
diff --git a/disk/part_toc.c b/disk/part_toc.c
index d0d872a43..71cd87b62 100644
--- a/disk/part_toc.c
+++ b/disk/part_toc.c
@@ -166,7 +166,7 @@ static toc_entry_t *toc_get_entry_subtoc(toc_entry_t *toc)
 			break;
 	}
 
-	printf("sub TOC not found!\n");
+	HREF_PRINTF("sub TOC not found!\n");
 	return NULL;
 }
 
@@ -549,7 +549,7 @@ int toc_load_toc_entry(block_dev_desc_t *dev_desc, const char *toc_id,
 
 	if (get_entry_info_toc(dev_desc, toc_id, &entry_offset,
 			       &entry_size, &entry_loadaddr)) {
-		printf("toc_load_toc_entry: get_entry_info_toc failed\n");
+		HREF_PRINTF("toc_load_toc_entry: get_entry_info_toc failed\n");
 		return 1;
 	}
 
diff --git a/include/asm-arm/arch-db8500/cpu.h b/include/asm-arm/arch-db8500/cpu.h
index 2d18d08d7..b1345134e 100644
--- a/include/asm-arm/arch-db8500/cpu.h
+++ b/include/asm-arm/arch-db8500/cpu.h
@@ -12,6 +12,7 @@
 #ifndef __DB8500_CPU_H__
 #define __DB8500_CPU_H__
 
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 
@@ -48,6 +49,9 @@ static inline int u8500_is_snowball(void)
 #endif
 }
 
+#define HREF_PRINTF(fmt, args...) \
+	if (!u8500_is_snowball()) printf(fmt, ##args);
+
 static inline int u8500_is_earlydrop(void)
 {
 	return read_cpuid() == CPUID_DB8500ED;