armv7/snow: Move clock initialization from bootblock to romstage.

Exynos system clock can be initialized before RAM init, not necessary to be in
the very beginning (boot block). This helps reducing bootblock dependency.

Verified to boot on armv7/snow.

Change-Id: Ic863e222871a157ba4279a673775b1e18c6eac0d
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2308
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
This commit is contained in:
Hung-Te Lin 2013-02-07 21:38:41 +08:00 committed by David Hendricks
parent 632d6fe3fc
commit 9029f4b63f
3 changed files with 9 additions and 15 deletions

View File

@ -17,10 +17,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
# needed for system_clock_init()
bootblock-y += mainboard.c
bootblock-y += memory.c
romstage-y += mainboard.c romstage-y += mainboard.c
romstage-y += memory.c romstage-y += memory.c
romstage-y += romstage.c romstage-y += romstage.c

View File

@ -23,23 +23,14 @@
#include <cbfs.h> #include <cbfs.h>
#include <uart.h> #include <uart.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/samsung/exynos5250/clk.h>
#include <cpu/samsung/exynos5250/dmc.h>
#include <cpu/samsung/exynos5250/periph.h> #include <cpu/samsung/exynos5250/periph.h>
#include <cpu/samsung/exynos5250/clock_init.h> #include <cpu/samsung/exynos5250/pinmux.h>
#endif #endif
void bootblock_mainboard_init(void); void bootblock_mainboard_init(void);
void bootblock_mainboard_init(void) void bootblock_mainboard_init(void)
{ {
struct mem_timings *mem;
struct arm_clk_ratios *arm_ratios;
mem = get_mem_timings();
arm_ratios = get_arm_clk_ratios();
system_clock_init(mem, arm_ratios);
#if CONFIG_EARLY_SERIAL_CONSOLE #if CONFIG_EARLY_SERIAL_CONSOLE
exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE);
uart_init(); uart_init();

View File

@ -26,6 +26,7 @@
#include <cpu/samsung/exynos5250/dmc.h> #include <cpu/samsung/exynos5250/dmc.h>
#include <cpu/samsung/exynos5250/setup.h> #include <cpu/samsung/exynos5250/setup.h>
#include <cpu/samsung/exynos5250/clock_init.h>
#include <console/console.h> #include <console/console.h>
#include <arch/stages.h> #include <arch/stages.h>
@ -48,13 +49,19 @@ static int board_wakeup_permitted(void)
void main(void) void main(void)
{ {
struct mem_timings *mem; struct mem_timings *mem;
struct arm_clk_ratios *arm_ratios;
int ret; int ret;
void *entry; void *entry;
/* Clock must be initialized before console_init, otherwise you may need
* to re-initialize serial console drivers again. */
mem = get_mem_timings();
arm_ratios = get_arm_clk_ratios();
system_clock_init(mem, arm_ratios);
console_init(); console_init();
printk(BIOS_INFO, "hello from romstage\n"); printk(BIOS_INFO, "hello from romstage\n");
mem = get_mem_timings();
if (!mem) { if (!mem) {
printk(BIOS_CRIT, "Unable to auto-detect memory timings\n"); printk(BIOS_CRIT, "Unable to auto-detect memory timings\n");
while(1); while(1);