diff options
| author | Tom Rini | 2019-01-01 19:55:05 -0500 |
|---|---|---|
| committer | Tom Rini | 2019-01-01 19:55:05 -0500 |
| commit | f97c49d6a2f504d0f0a8aab37c67aa314e006250 (patch) | |
| tree | 6f1ffe0b1086377c436f74ae30b00a53367de5bc /board | |
| parent | 522e035441ca04d99de2fc13b614ad896691e9c9 (diff) | |
| parent | 44c214dc2738da979d277d8d45fe50997b62b5f8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/board.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 917f5b18f6b..f022f365e95 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 |