[U-Boot] [PATCH v2 3/7] ARM: UniPhier: remove meaningless CONFIG_SPL_BUILD ifdefs

[Masahiro Yamada]

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 at socionext.com>
---

Changes in v2: None

 arch/arm/mach-uniphier/ddrphy_training.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-uniphier/ddrphy_training.c b/arch/arm/mach-uniphier/ddrphy_training.c
index b1d46cf..5f3d591 100644
--- a/arch/arm/mach-uniphier/ddrphy_training.c
+++ b/arch/arm/mach-uniphier/ddrphy_training.c
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m at jp.panasonic.com>
+ * Copyright (C) 2011-2015 Panasonic Corporation
+ * Copyright (C) 2015      Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro at socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -116,10 +117,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);
@@ -128,10 +127,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;
 		}
 	}
-- 
1.9.1