]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
ARM: UniPhier: remove meaningless CONFIG_SPL_BUILD ifdefs
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 29 May 2015 08:30:04 +0000 (17:30 +0900)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 8 Sep 2015 20:47:19 +0000 (22:47 +0200)
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>
arch/arm/mach-uniphier/ddrphy_training.c

index e99c5e65f2a51ed7a67b774aab319d29d05c2b63..a98b814df07f343d145c0a2ef116311f0f7b452f 100644 (file)
@@ -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;
                }
        }