[U-Boot] [PATCH] Revert "sunxi: board: Print error after power initialization fails"

karlp at tweak.net.au karlp at tweak.net.au
Tue Dec 18 11:11:54 UTC 2018


From: Karl Palsson <karlp at tweak.net.au>

This reverts commit a8011eb84dfac5187cebf00ed8bc981bdb5c1fa1

This causes DRAM init failures on (at least)
* allwinner h3 nanopi-duo2
* allwinner h2+ orangepi zero v1.1

Signed-off-by: Karl Palsson <karlp at tweak.net.au>
---

Ideally, this should get into 2019.01, so that this release is not
broken on those targets.

 board/sunxi/board.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 917f5b18f6..f022f365e9 100644
--- 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
 
-- 
2.14.5



More information about the U-Boot mailing list