GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit 9029f4b63f

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>
This commit is contained in:
David Hendricks 2013-02-08 01:25:04 +01:00
parent 9029f4b63f
commit 1c3187932d
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/google/snow/Makefile.inc
View File

@ -17,6 +17,10 @@
## 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

11
src/mainboard/google/snow/bootblock.c
View File

@ -23,14 +23,23 @@
#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/pinmux.h> #include <cpu/samsung/exynos5250/clock_init.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();

9
src/mainboard/google/snow/romstage.c
View File

@ -26,7 +26,6 @@
#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>
@ -49,19 +48,13 @@ 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);