aboutsummaryrefslogtreecommitdiff
path: root/board/sunxi/board.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-12-07 19:02:01 -0500
committerTom Rini <trini@konsulko.com>2018-12-07 19:02:01 -0500
commitc49aff3e66b930aa06936afee401cf5e19377958 (patch)
tree836506695f3a38370108ec2060f23ef2954da0f9 /board/sunxi/board.c
parent10d3e90f46feace58f4141b696d91644e594e3ed (diff)
parent8a6121ea078347de017c833e131eb4a806cf0c51 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Various axp209 fixes - Fixes for OLinuXino-A20-Lime2 / OLinuXino-A20-Lime2-eMMC
Diffstat (limited to 'board/sunxi/board.c')
-rw-r--r--board/sunxi/board.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 64ccbc7245..26284db111 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -637,13 +637,6 @@ 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
@@ -652,7 +645,16 @@ void sunxi_board_init(void)
if (!power_failed)
clock_set_pll1(CONFIG_SYS_CLK_FREQ);
else
- printf("Failed to set core voltage! Can't set CPU frequency\n");
+ 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);
}
#endif