1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00

Merge branch 'master' of git://git.denx.de/u-boot-sunxi

This commit is contained in:
Tom Rini
2019-01-01 19:55:05 -05:00

View File

@@ -637,6 +637,13 @@ void sunxi_board_init(void)
power_failed |= axp_set_sw(IS_ENABLED(CONFIG_AXP_SW_ON)); power_failed |= axp_set_sw(IS_ENABLED(CONFIG_AXP_SW_ON));
#endif #endif
#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 * Only clock up the CPU to full speed if we are reasonably
@@ -645,16 +652,7 @@ void sunxi_board_init(void)
if (!power_failed) if (!power_failed)
clock_set_pll1(CONFIG_SYS_CLK_FREQ); clock_set_pll1(CONFIG_SYS_CLK_FREQ);
else else
printf("Error setting up the power controller.\n" printf("Failed to set core voltage! Can't set CPU frequency\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 #endif