From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Fri, 29 May 2015 08:30:04 +0000 (+0900)
Subject: ARM: UniPhier: remove meaningless CONFIG_SPL_BUILD ifdefs
X-Git-Tag: v2015.07-rc2~49^2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e143cd6daa1b22c0b0df14e1e720571a982eaa6;p=oweals%2Fu-boot.git

ARM: UniPhier: remove meaningless CONFIG_SPL_BUILD ifdefs

This file is only built for SPL.  These ifdef conditionals are
unnecessary because UniPhier platform now supports UART on SPL.
Show appropriate messages on error.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/arch/arm/mach-uniphier/ddrphy_training.c b/arch/arm/mach-uniphier/ddrphy_training.c
index e99c5e65f2..a98b814df0 100644
--- a/arch/arm/mach-uniphier/ddrphy_training.c
+++ b/arch/arm/mach-uniphier/ddrphy_training.c
@@ -115,10 +115,8 @@ int ddrphy_training(struct ddrphy __iomem *phy)
 
 	do {
 		if (--timeout < 0) {
-#ifndef CONFIG_SPL_BUILD
 			printf("%s: error: timeout during DDR training\n",
 								__func__);
-#endif
 			return -1;
 		}
 		udelay(1);
@@ -127,10 +125,8 @@ int ddrphy_training(struct ddrphy __iomem *phy)
 
 	for (i = 0; i < ARRAY_SIZE(init_sequence); i++) {
 		if (pgsr0 & init_sequence[i].err_flag) {
-#ifndef CONFIG_SPL_BUILD
 			printf("%s: error: %s failed\n", __func__,
 						init_sequence[i].description);
-#endif
 			return -1;
 		}
 	}