diff options
| author | David Hendricks <dhendrix@chromium.org> | 2013-02-08 01:25:04 +0100 |
|---|---|---|
| committer | David Hendricks <dhendrix@chromium.org> | 2013-02-08 01:35:48 +0100 |
| commit | 1c3187932d1399bef60788759f75a60179a6a474 (patch) | |
| tree | 384101516c595b1ba6a3619206251ac1a1d2570c /src/mainboard/google | |
| parent | 9029f4b63f6d0e29bf1608e666cdb025de45ca24 (diff) | |
Revert "armv7/snow: Move clock initialization from bootblock to romstage."
This reverts commit 9029f4b63f6d0e29bf1608e666cdb025de45ca24
This patch needs to go at the end of the UART patch set. Sorry 'bout the confusion!
Change-Id: I5702c7d6130daf95776f2c15d24e5d253691cefd
Reviewed-on: http://review.coreboot.org/2319
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/snow/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/mainboard/google/snow/bootblock.c | 11 | ||||
| -rw-r--r-- | src/mainboard/google/snow/romstage.c | 9 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/mainboard/google/snow/Makefile.inc b/src/mainboard/google/snow/Makefile.inc index b56a1a42cf..04bf543d40 100644 --- a/src/mainboard/google/snow/Makefile.inc +++ b/src/mainboard/google/snow/Makefile.inc @@ -17,6 +17,10 @@ ## 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 += memory.c romstage-y += romstage.c diff --git a/src/mainboard/google/snow/bootblock.c b/src/mainboard/google/snow/bootblock.c index 18306cc51c..bcfe440379 100644 --- a/src/mainboard/google/snow/bootblock.c +++ b/src/mainboard/google/snow/bootblock.c @@ -23,14 +23,23 @@ #include <cbfs.h> #include <uart.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/pinmux.h> +#include <cpu/samsung/exynos5250/clock_init.h> #endif 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 exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); uart_init(); diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/snow/romstage.c index c0bb6f4be0..b8e5116b22 100644 --- a/src/mainboard/google/snow/romstage.c +++ b/src/mainboard/google/snow/romstage.c @@ -26,7 +26,6 @@ #include <cpu/samsung/exynos5250/dmc.h> #include <cpu/samsung/exynos5250/setup.h> -#include <cpu/samsung/exynos5250/clock_init.h> #include <console/console.h> #include <arch/stages.h> @@ -49,19 +48,13 @@ static int board_wakeup_permitted(void) void main(void) { struct mem_timings *mem; - struct arm_clk_ratios *arm_ratios; int ret; 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(); printk(BIOS_INFO, "hello from romstage\n"); + mem = get_mem_timings(); if (!mem) { printk(BIOS_CRIT, "Unable to auto-detect memory timings\n"); while(1); |