Revert "sunxi: board: Print error after power initialization fails"

[oweals/u-boot.git] / board / sunxi / board.c

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 917f5b18f6b315e3c04c81ee5f8c52d5a0d80705..f022f365e950d29123bed42a7a607b49c8609c6a 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -637,6 +637,13 @@ void sunxi_board_init(void)
        power_failed |= axp_set_sw(IS_ENABLED(CONFIG_AXP_SW_ON));
 #endif
 #endif
+       printf("DRAM:");
+       gd->ram_size = sunxi_dram_init();
+       printf(" %d MiB\n", (int)(gd->ram_size >> 20));
+       if (!gd->ram_size)
+               hang();
+
+       sunxi_spl_store_dram_size(gd->ram_size);
 
        /*
         * Only clock up the CPU to full speed if we are reasonably
@@ -645,16 +652,7 @@ void sunxi_board_init(void)
        if (!power_failed)
                clock_set_pll1(CONFIG_SYS_CLK_FREQ);
        else
-               printf("Error setting up the power controller.\n"
-                      "CPU frequency not set.\n");
-
-       printf("DRAM:");
-       gd->ram_size = sunxi_dram_init();
-       printf(" %d MiB\n", (int)(gd->ram_size >> 20));
-       if (!gd->ram_size)
-               hang();
-
-       sunxi_spl_store_dram_size(gd->ram_size);
+               printf("Failed to set core voltage! Can't set CPU frequency\n");
 }
 #endif