Hung-Te Lin (hungte@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2282
-gerrit
commit ef01087dde5062b5bee45f04c127e91736843bf8 Author: Hung-Te Lin hungte@chromium.org Date: Mon Feb 4 14:38:03 2013 +0800
armv7: Clean up arm/snow bootblock build process.
Remove duplicated / testing code and share more driver for bootblock, romstage and ramstage.
The __PRE_RAM__ is now also defined in bootblock build stage, since bootblock is executed before RAM is initialized.
Change-Id: I4f5469b1545631eee1cf9f2f5df93cbe3a58268b Signed-off-by: Hung-Te Lin hungte@chromium.org --- Makefile.inc | 6 +- src/arch/armv7/bootblock_exit.c | 28 -- src/arch/armv7/bootblock_simple.c | 10 +- src/arch/armv7/include/arch/bootblock_exit.h | 26 -- src/arch/armv7/include/arch/stages.h | 2 +- src/arch/armv7/lib/Makefile.inc | 2 +- src/arch/armv7/lib/romstage_console.c | 12 +- src/arch/armv7/stages.c | 4 +- src/console/Makefile.inc | 5 + src/cpu/samsung/exynos5-common/clk.h | 2 +- src/cpu/samsung/exynos5250/Makefile.inc | 1 + src/cpu/samsung/exynos5250/clock_init.h | 1 + src/cpu/samsung/exynos5250/power.c | 1 + src/cpu/samsung/exynos5250/uart.c | 3 + src/cpu/samsung/s5p-common/s3c24x0_i2c.c | 11 - src/drivers/maxim/max77686/Makefile.inc | 1 + src/mainboard/google/snow/bootblock.c | 536 +-------------------------- src/mainboard/google/snow/romstage.c | 59 +-- 18 files changed, 43 insertions(+), 667 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc index 0b473e4..069bdfe 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -111,8 +111,8 @@ $(error Your current configuration requires binary-only components, but you did endif endif
-bootblock-c-ccopts:=-D__BOOT_BLOCK__ -bootblock-S-ccopts:=-D__BOOT_BLOCK__ +bootblock-c-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__ +bootblock-S-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__
smm-c-ccopts:=-D__SMM__ smm-S-ccopts:=-D__SMM__ @@ -292,7 +292,7 @@ $(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $
$(obj)/%.bootblock.o $(abspath $(obj))/%.bootblock.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC) -MMD -D__BOOT_BLOCK__ $(CFLAGS) -c -o $@ $< + $(CC) -MMD $(bootblock-c-ccopts) $(CFLAGS) -c -o $@ $<
####################################################################### # Clean up rules diff --git a/src/arch/armv7/bootblock_exit.c b/src/arch/armv7/bootblock_exit.c deleted file mode 100644 index 8b97d6b..0000000 --- a/src/arch/armv7/bootblock_exit.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Google Inc - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include <arch/bootblock_exit.h> - -void bootblock_exit(unsigned long addr) -{ - __attribute__((noreturn)) void (*doit)(void) = (void *)addr; - doit(); -} diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index e808edc..fe2662e 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -38,19 +38,19 @@ static int boot_cpu(void)
void main(void) { - const char *target1 = "fallback/romstage"; - unsigned long romstage_entry; + const char *stage_name = "fallback/romstage"; + void *entry;
if (boot_cpu()) { bootblock_cpu_init(); bootblock_mainboard_init(); }
+ printk(BIOS_INFO, "hello from bootblock\n"); printk(BIOS_INFO, "bootblock main(): loading romstage\n"); - romstage_entry = (unsigned long)cbfs_load_stage( - CBFS_DEFAULT_MEDIA, target1); + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name);
printk(BIOS_INFO, "bootblock main(): jumping to romstage\n"); - if (romstage_entry) stage_exit(romstage_entry); + if (entry) stage_exit(entry); hlt(); } diff --git a/src/arch/armv7/include/arch/bootblock_exit.h b/src/arch/armv7/include/arch/bootblock_exit.h deleted file mode 100644 index 0a039e1..0000000 --- a/src/arch/armv7/include/arch/bootblock_exit.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Google Inc - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -/** - * This is a shim that is to be compiled for the instruction set matching - * that of the entry point for the next boot stage (romstage). - */ -void bootblock_exit(unsigned long addr); diff --git a/src/arch/armv7/include/arch/stages.h b/src/arch/armv7/include/arch/stages.h index 215aaa8..671c02b 100644 --- a/src/arch/armv7/include/arch/stages.h +++ b/src/arch/armv7/include/arch/stages.h @@ -23,6 +23,6 @@ extern void main(void);
void stage_entry(void) __attribute__((section(".text.stage_entry.armv7"))); -void stage_exit(unsigned long); +void stage_exit(void *);
#endif diff --git a/src/arch/armv7/lib/Makefile.inc b/src/arch/armv7/lib/Makefile.inc index e33618b..343e9f8 100644 --- a/src/arch/armv7/lib/Makefile.inc +++ b/src/arch/armv7/lib/Makefile.inc @@ -1,4 +1,5 @@ bootblock-y += syslib.c +bootblock-y += romstage_console.c
romstage-y += cache_v7.c romstage-y += cache-cp15.c @@ -8,7 +9,6 @@ romstage-y += romstage_console.c romstage-y += syslib.c
#ramstage-y += printk_init.c -#romstage-y += walkcbfs.S
ramstage-y += div0.c ramstage-y += div64.S diff --git a/src/arch/armv7/lib/romstage_console.c b/src/arch/armv7/lib/romstage_console.c index ead26f3..42a9664 100644 --- a/src/arch/armv7/lib/romstage_console.c +++ b/src/arch/armv7/lib/romstage_console.c @@ -19,6 +19,7 @@
#include <console/console.h> #include <console/vtxprintf.h> +// TODO Unify with x86 (CONFIG_CONSOLE_SERIAL8250) #if CONFIG_SERIAL_CONSOLE #include <uart.h> #endif @@ -43,18 +44,15 @@ void console_tx_byte(unsigned char byte) #endif }
-/* FIXME(dhendrix): add this back in */ -#if 0 -static void console_tx_flush(void) +static void _console_tx_flush(void) { -#if CONFIG_CONSOLE_SERIAL - uart_tx_flush(CONFIG_CONSOLE_SERIAL_UART_ADDRESS); +#if CONFIG_SERIAL_CONSOLE + uart_tx_flush(); #endif #if CONFIG_USBDEBUG usbdebug_tx_flush(0); #endif } -#endif
int do_printk(int msg_level, const char *fmt, ...) { @@ -69,7 +67,7 @@ int do_printk(int msg_level, const char *fmt, ...) i = vtxprintf(console_tx_byte, fmt, args); va_end(args);
-// console_tx_flush(); + _console_tx_flush();
return i; } diff --git a/src/arch/armv7/stages.c b/src/arch/armv7/stages.c index fd4374f..e8a47e5 100644 --- a/src/arch/armv7/stages.c +++ b/src/arch/armv7/stages.c @@ -38,8 +38,8 @@ void stage_entry(void) main(); }
-void stage_exit(unsigned long addr) +void stage_exit(void *addr) { - __attribute__((noreturn)) void (*doit)(void) = (void *)addr; + __attribute__((noreturn)) void (*doit)(void) = addr; doit(); } diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 3c4777f..dd826d6 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -14,6 +14,11 @@ romstage-$(CONFIG_EARLY_SERIAL_CONSOLE) += console.c romstage-y += post.c romstage-y += die.c
+# TODO Add vtxprintf.c only when early console is required. +bootblock-y += vtxprintf.c +bootblock-$(CONFIG_EARLY_SERIAL_CONSOLE) += console.c +bootblock-y += die.c + ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c diff --git a/src/cpu/samsung/exynos5-common/clk.h b/src/cpu/samsung/exynos5-common/clk.h index 0178f88..eb3b253 100644 --- a/src/cpu/samsung/exynos5-common/clk.h +++ b/src/cpu/samsung/exynos5-common/clk.h @@ -52,7 +52,7 @@ struct clk_bit_info { s8 prediv_bit; };
-/* FIXME(dhendrix) conflicts with stp-common/clk.h */ +/* FIXME(dhendrix) conflicts with s5p-common/clk.h */ #if 0 unsigned long get_pll_clk(int pllreg); unsigned long get_arm_clk(void); diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/cpu/samsung/exynos5250/Makefile.inc index 1c6d716..e2033ff 100644 --- a/src/cpu/samsung/exynos5250/Makefile.inc +++ b/src/cpu/samsung/exynos5250/Makefile.inc @@ -9,6 +9,7 @@ bootblock-y += clock_init.c bootblock-y += clock.c bootblock-y += pinmux.c +bootblock-y += power.c bootblock-y += soc.c bootblock-y += uart.c
diff --git a/src/cpu/samsung/exynos5250/clock_init.h b/src/cpu/samsung/exynos5250/clock_init.h index 3757e7d..bb7f7e9 100644 --- a/src/cpu/samsung/exynos5250/clock_init.h +++ b/src/cpu/samsung/exynos5250/clock_init.h @@ -24,6 +24,7 @@
#ifndef __EXYNOS_CLOCK_INIT_H #define __EXYNOS_CLOCK_INIT_H +#include "dmc.h"
/* These are the ratio's for configuring ARM clock */ struct arm_clk_ratios { diff --git a/src/cpu/samsung/exynos5250/power.c b/src/cpu/samsung/exynos5250/power.c index 60003c4..d0650fb 100644 --- a/src/cpu/samsung/exynos5250/power.c +++ b/src/cpu/samsung/exynos5250/power.c @@ -25,6 +25,7 @@ #include <common.h> #include <arch/hlt.h> #include <arch/io.h> +#include <arch/hlt.h> #include <console/console.h> #include <cpu/samsung/exynos5250/cpu.h> #include <cpu/samsung/exynos5250/power.h> diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/cpu/samsung/exynos5250/uart.c index f3ee081..3126d7a 100644 --- a/src/cpu/samsung/exynos5250/uart.c +++ b/src/cpu/samsung/exynos5250/uart.c @@ -211,4 +211,7 @@ void uart_tx_byte(unsigned char data) { exynos5_uart_tx_byte(data); } + +void uart_tx_flush(void) { +} #endif diff --git a/src/cpu/samsung/s5p-common/s3c24x0_i2c.c b/src/cpu/samsung/s5p-common/s3c24x0_i2c.c index 2940b09..3e94ea7 100644 --- a/src/cpu/samsung/s5p-common/s3c24x0_i2c.c +++ b/src/cpu/samsung/s5p-common/s3c24x0_i2c.c @@ -221,22 +221,11 @@ void board_i2c_init(const void *blob) /* * MULTI BUS I2C support */ -/* - * FIXME(dhendrix): not sure why this had to be guarded, but the code - * should probably go into an exynos5-specific .c file if it really is - * not generic. - */ -//#ifdef CONFIG_EXYNOS5 static void i2c_bus_init(struct s3c24x0_i2c_bus *i2c, unsigned int bus) { exynos_pinmux_config(i2c->id, 0); - i2c_ch_init(i2c->regs, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); } -//#else -//#error "should not be here" -//static void i2c_bus_init(struct s3c24x0_i2c_bus *i2c, unsigned int bus) {} -//#endif
#ifdef CONFIG_I2C_MULTI_BUS int i2c_set_bus_num(unsigned int bus) diff --git a/src/drivers/maxim/max77686/Makefile.inc b/src/drivers/maxim/max77686/Makefile.inc index a5d7b90..097b291 100644 --- a/src/drivers/maxim/max77686/Makefile.inc +++ b/src/drivers/maxim/max77686/Makefile.inc @@ -17,5 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ##
+bootblock-$(CONFIG_DRIVER_MAXIM_MAX77686) += max77686.c romstage-$(CONFIG_DRIVER_MAXIM_MAX77686) += max77686.c ramstage-$(CONFIG_DRIVER_MAXIM_MAX77686) += max77686.c diff --git a/src/mainboard/google/snow/bootblock.c b/src/mainboard/google/snow/bootblock.c index fc0b208..64b12c6 100644 --- a/src/mainboard/google/snow/bootblock.c +++ b/src/mainboard/google/snow/bootblock.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+#if CONFIG_EARLY_SERIAL_CONSOLE #include <types.h> #include <arch/io.h> #include <cbfs.h> @@ -27,553 +28,28 @@ #include <cpu/samsung/exynos5250/dmc.h> #include <cpu/samsung/exynos5250/periph.h> #include <cpu/samsung/exynos5250/clock_init.h> +#include <src/cpu/samsung/exynos5250/power.h> #include <drivers/maxim/max77686/max77686.h>
#define I2C0_BASE 0x12c60000 - -/* - * Max77686 parameters values - * see max77686.h for parameters details - */ -struct max77686_para max77686_param[] = {/*{vol_addr, vol_bitpos, - vol_bitmask, reg_enaddr, reg_enbitpos, reg_enbitmask, reg_enbiton, - reg_enbitoff, vol_min, vol_div}*/ - {/* PMIC_BUCK1 */ 0x11, 0x0, 0x3F, 0x10, 0x0, 0x3, 0x3, 0x0, 750, 50000}, - {/* PMIC_BUCK2 */ 0x14, 0x0, 0xFF, 0x12, 0x4, 0x3, 0x1, 0x0, 600, 12500}, - {/* PMIC_BUCK3 */ 0x1E, 0x0, 0xFF, 0x1C, 0x4, 0x3, 0x1, 0x0, 600, 12500}, - {/* PMIC_BUCK4 */ 0x28, 0x0, 0xFF, 0x26, 0x4, 0x3, 0x1, 0x0, 600, 12500}, - {/* PMIC_BUCK5 */ 0x31, 0x0, 0x3F, 0x30, 0x0, 0x3, 0x3, 0x0, 750, 50000}, - {/* PMIC_BUCK6 */ 0x33, 0x0, 0x3F, 0x32, 0x0, 0x3, 0x3, 0x0, 750, 50000}, - {/* PMIC_BUCK7 */ 0x35, 0x0, 0x3F, 0x34, 0x0, 0x3, 0x3, 0x0, 750, 50000}, - {/* PMIC_BUCK8 */ 0x37, 0x0, 0x3F, 0x36, 0x0, 0x3, 0x3, 0x0, 750, 50000}, - {/* PMIC_BUCK9 */ 0x39, 0x0, 0x3F, 0x38, 0x0, 0x3, 0x3, 0x0, 750, 50000}, - {/* PMIC_LDO1 */ 0x40, 0x0, 0x3F, 0x40, 0x6, 0x3, 0x3, 0x0, 800, 25000}, - {/* PMIC_LDO2 */ 0x41, 0x0, 0x3F, 0x41, 0x6, 0x3, 0x1, 0x0, 800, 25000}, - {/* PMIC_LDO3 */ 0x42, 0x0, 0x3F, 0x42, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO4 */ 0x43, 0x0, 0x3F, 0x43, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO5 */ 0x44, 0x0, 0x3F, 0x44, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO6 */ 0x45, 0x0, 0x3F, 0x45, 0x6, 0x3, 0x1, 0x0, 800, 25000}, - {/* PMIC_LDO7 */ 0x46, 0x0, 0x3F, 0x46, 0x6, 0x3, 0x1, 0x0, 800, 25000}, - {/* PMIC_LDO8 */ 0x47, 0x0, 0x3F, 0x47, 0x6, 0x3, 0x1, 0x0, 800, 25000}, - {/* PMIC_LDO9 */ 0x48, 0x0, 0x3F, 0x48, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO10 */ 0x49, 0x0, 0x3F, 0x49, 0x6, 0x3, 0x1, 0x0, 800, 50000}, - {/* PMIC_LDO11 */ 0x4A, 0x0, 0x3F, 0x4A, 0x6, 0x3, 0x1, 0x0, 800, 50000}, - {/* PMIC_LDO12 */ 0x4B, 0x0, 0x3F, 0x4B, 0x6, 0x3, 0x1, 0x0, 800, 50000}, - {/* PMIC_LDO13 */ 0x4C, 0x0, 0x3F, 0x4C, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO14 */ 0x4D, 0x0, 0x3F, 0x4D, 0x6, 0x3, 0x1, 0x0, 800, 50000}, - {/* PMIC_LDO15 */ 0x4E, 0x0, 0x3F, 0x4E, 0x6, 0x3, 0x1, 0x0, 800, 25000}, - {/* PMIC_LDO16 */ 0x4F, 0x0, 0x3F, 0x4F, 0x6, 0x3, 0x1, 0x0, 800, 50000}, - {/* PMIC_LDO17 */ 0x50, 0x0, 0x3F, 0x50, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO18 */ 0x51, 0x0, 0x3F, 0x51, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO19 */ 0x52, 0x0, 0x3F, 0x52, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO20 */ 0x53, 0x0, 0x3F, 0x53, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO21 */ 0x54, 0x0, 0x3F, 0x54, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO22 */ 0x55, 0x0, 0x3F, 0x55, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO23 */ 0x56, 0x0, 0x3F, 0x56, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO24 */ 0x57, 0x0, 0x3F, 0x57, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO25 */ 0x58, 0x0, 0x3F, 0x58, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_LDO26 */ 0x59, 0x0, 0x3F, 0x59, 0x6, 0x3, 0x3, 0x0, 800, 50000}, - {/* PMIC_EN32KHZ_CP */ 0x0, 0x0, 0x0, 0x7F, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0}, -}; - -/* - * Write a value to a register - * - * @param chip_addr i2c addr for max77686 - * @param reg reg number to write - * @param val value to be written - * - */ -static inline int max77686_i2c_write(unsigned char chip_addr, - unsigned int reg, unsigned char val) -{ - return i2c_write(chip_addr, reg, 1, &val, 1); -} - -/* - * Read a value from a register - * - * @param chip_addr i2c addr for max77686 - * @param reg reg number to write - * @param val value to be written - * - */ -static inline int max77686_i2c_read(unsigned char chip_addr, - unsigned int reg, unsigned char *val) -{ - return i2c_read(chip_addr, reg, 1, val, 1); -} - -/* Chip register numbers (not exported from this module) */ -enum { - REG_BBAT = 0x7e, - - /* Bits for BBAT */ - BBAT_BBCHOSTEN_MASK = 1 << 0, - BBAT_BBCVS_SHIFT = 3, - BBAT_BBCVS_MASK = 3 << BBAT_BBCVS_SHIFT, -}; - -int max77686_disable_backup_batt(void) -{ - unsigned char val; - int ret; - - //i2c_set_bus_num(0); - ret = max77686_i2c_read(MAX77686_I2C_ADDR, REG_BBAT, &val); - if (ret) { -// debug("max77686 i2c read failed\n"); - return ret; - } - - /* If we already have the correct values, exit */ - if ((val & (BBAT_BBCVS_MASK | BBAT_BBCHOSTEN_MASK)) == - BBAT_BBCVS_MASK) - return 0; - - /* First disable charging */ - val &= ~BBAT_BBCHOSTEN_MASK; - ret = max77686_i2c_write(MAX77686_I2C_ADDR, REG_BBAT, val); - if (ret) { - //debug("max77686 i2c write failed\n"); - return -1; - } - - /* Finally select 3.5V to minimize power consumption */ - val |= BBAT_BBCVS_MASK; - ret = max77686_i2c_write(MAX77686_I2C_ADDR, REG_BBAT, val); - if (ret) { - //debug("max77686 i2c write failed\n"); - return -1; - } - - return 0; -} - -static int max77686_enablereg(enum max77686_regnum reg, int enable) -{ - struct max77686_para *pmic; - unsigned char read_data; - int ret; - - pmic = &max77686_param[reg]; - - ret = max77686_i2c_read(MAX77686_I2C_ADDR, pmic->reg_enaddr, - &read_data); - if (ret != 0) { - //debug("max77686 i2c read failed.\n"); - return -1; - } - - if (enable == REG_DISABLE) { - clrbits_8(&read_data, - pmic->reg_enbitmask << pmic->reg_enbitpos); - } else { - clrsetbits_8(&read_data, - pmic->reg_enbitmask << pmic->reg_enbitpos, - pmic->reg_enbiton << pmic->reg_enbitpos); - } - - ret = max77686_i2c_write(MAX77686_I2C_ADDR, - pmic->reg_enaddr, read_data); - if (ret != 0) { - //debug("max77686 i2c write failed.\n"); - return -1; - } - - return 0; -} - -static int max77686_do_volsetting(enum max77686_regnum reg, unsigned int volt, - int enable, int volt_units) -{ - struct max77686_para *pmic; - unsigned char read_data; - int vol_level = 0; - int ret; - - pmic = &max77686_param[reg]; - - if (pmic->vol_addr == 0) { - //debug("not a voltage register.\n"); - return -1; - } - - ret = max77686_i2c_read(MAX77686_I2C_ADDR, pmic->vol_addr, &read_data); - if (ret != 0) { - //debug("max77686 i2c read failed.\n"); - return -1; - } - - if (volt_units == MAX77686_UV) - vol_level = volt - (u32)pmic->vol_min * 1000; - else - vol_level = (volt - (u32)pmic->vol_min) * 1000; - - if (vol_level < 0) { - //debug("Not a valid voltage level to set\n"); - return -1; - } - vol_level /= (u32)pmic->vol_div; - - clrsetbits_8(&read_data, pmic->vol_bitmask << pmic->vol_bitpos, - vol_level << pmic->vol_bitpos); - - ret = max77686_i2c_write(MAX77686_I2C_ADDR, pmic->vol_addr, read_data); - if (ret != 0) { - //debug("max77686 i2c write failed.\n"); - return -1; - } - - ret = max77686_enablereg(reg, enable); - if (ret != 0) { - //debug("Failed to enable buck/ldo.\n"); - return -1; - } - return 0; -} - -int max77686_volsetting(enum max77686_regnum reg, unsigned int volt, - int enable, int volt_units) -{ -// int old_bus = i2c_get_bus_num(); - int ret; - -// i2c_set_bus_num(0); - ret = max77686_do_volsetting(reg, volt, enable, volt_units); -// i2c_set_bus_num(old_bus); - return ret; -} - -/* power_init() stuff */ -static void power_init(void) -{ - max77686_disable_backup_batt(); - -#if 0 - /* FIXME: for debugging... */ - volatile unsigned long *addr = (unsigned long *)0x1004330c; - *addr |= 0x100; - while (1); #endif
- max77686_volsetting(PMIC_BUCK2, CONFIG_VDD_ARM_MV, - REG_ENABLE, MAX77686_MV); - max77686_volsetting(PMIC_BUCK3, CONFIG_VDD_INT_UV, - REG_ENABLE, MAX77686_UV); - max77686_volsetting(PMIC_BUCK1, CONFIG_VDD_MIF_MV, - REG_ENABLE, MAX77686_MV); - max77686_volsetting(PMIC_BUCK4, CONFIG_VDD_G3D_MV, - REG_ENABLE, MAX77686_MV); - max77686_volsetting(PMIC_LDO2, CONFIG_VDD_LDO2_MV, - REG_ENABLE, MAX77686_MV); - max77686_volsetting(PMIC_LDO3, CONFIG_VDD_LDO3_MV, - REG_ENABLE, MAX77686_MV); - max77686_volsetting(PMIC_LDO5, CONFIG_VDD_LDO5_MV, - REG_ENABLE, MAX77686_MV); - max77686_volsetting(PMIC_LDO10, CONFIG_VDD_LDO10_MV, - REG_ENABLE, MAX77686_MV); -} - -#include <console/vtxprintf.h> -#include <string.h> -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -/* haha, don't need ctype.c */ -#define isdigit(c) ((c) >= '0' && (c) <= '9') -#define is_digit isdigit -#define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F')) - -static int skip_atoi(const char **s) -{ - int i=0; - - while (is_digit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - -#include <div64.h> -static int number(void (*tx_byte)(unsigned char byte), - unsigned long long num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; - int i; - int count = 0; - - if (type & LARGE) - digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if ((signed long long)num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) { - tmp[i++]='0'; - } else while (num != 0) { - /* FIXME: do_div was broken */ -// tmp[i++] = digits[do_div(num,base)]; - tmp[i++] = digits[num & 0xf]; - num = num >> 4; - } - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - tx_byte(' '), count++; - if (sign) - tx_byte(sign), count++; - if (type & SPECIAL) { - if (base==8) - tx_byte('0'), count++; - else if (base==16) { - tx_byte('0'), count++; - tx_byte(digits[33]), count++; - } - } - if (!(type & LEFT)) - while (size-- > 0) - tx_byte(c), count++; - while (i < precision--) - tx_byte('0'), count++; - while (i-- > 0) - tx_byte(tmp[i]), count++; - while (size-- > 0) - tx_byte(' '), count++; - return count; -} - -int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args) -{ - int len; - unsigned long long num; - int i, base; - const char *s; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', or 'L' for integer fields */ - - int count; - - for (count=0; *fmt ; ++fmt) { - if (*fmt != '%') { - tx_byte(*fmt), count++; - continue; - } - - /* process flags */ - flags = 0; -repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (is_digit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (is_digit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'z') { - qualifier = *fmt; - ++fmt; - if (*fmt == 'l') { - qualifier = 'L'; - ++fmt; - } - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - tx_byte(' '), count++; - tx_byte((unsigned char) va_arg(args, int)), count++; - while (--field_width > 0) - tx_byte(' '), count++; - continue; - - case 's': - s = va_arg(args, char *); - if (!s) - s = "<NULL>"; - - len = strnlen(s, precision); - - if (!(flags & LEFT)) - while (len < field_width--) - tx_byte(' '), count++; - for (i = 0; i < len; ++i) - tx_byte(*s++), count++; - while (len < field_width--) - tx_byte(' '), count++; - continue; - - case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - count += number(tx_byte, - (unsigned long) va_arg(args, void *), 16, - field_width, precision, flags); - continue; - - case 'n': - if (qualifier == 'L') { - long long *ip = va_arg(args, long long *); - *ip = count; - } else if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = count; - } else { - int * ip = va_arg(args, int *); - *ip = count; - } - continue; - - case '%': - tx_byte('%'), count++; - continue; - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - tx_byte('%'), count++; - if (*fmt) - tx_byte(*fmt), count++; - else - --fmt; - continue; - } - if (qualifier == 'L') { - num = va_arg(args, unsigned long long); - } else if (qualifier == 'l') { - num = va_arg(args, unsigned long); - } else if (qualifier == 'z') { - num = va_arg(args, size_t); - } else if (qualifier == 'h') { - num = (unsigned short) va_arg(args, int); - if (flags & SIGN) - num = (short) num; - } else if (flags & SIGN) { - num = va_arg(args, int); - } else { - num = va_arg(args, unsigned int); - } - count += number(tx_byte, num, base, field_width, precision, flags); - } - return count; -} - -int do_printk(int msg_level, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i = vtxprintf(uart_tx_byte, fmt, args); - va_end(args); - - return i; -} - void bootblock_mainboard_init(void); void bootblock_mainboard_init(void) { struct mem_timings *mem; struct arm_clk_ratios *arm_ratios;
- /* FIXME: we should not need UART in bootblock, this is only - done for testing purposes */ i2c_set_early_reg(I2C0_BASE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); power_init(); 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(); - printk(BIOS_INFO, "%s: UART initialized\n", __func__); - printk(BIOS_INFO, "%s: finished\n", __func__); + printk(BIOS_INFO, "\n\n\n%s: UART initialized\n", __func__); +#endif } diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/snow/romstage.c index 690d4aa..b8e5116 100644 --- a/src/mainboard/google/snow/romstage.c +++ b/src/mainboard/google/snow/romstage.c @@ -47,15 +47,12 @@ static int board_wakeup_permitted(void)
void main(void) { - struct cbfs_media cbfs; -// i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); -// power_init(); -// clock_init(); -// exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); - console_init(); - printk(BIOS_INFO, "hello from romstage\n"); struct mem_timings *mem; int ret; + void *entry; + + console_init(); + printk(BIOS_INFO, "hello from romstage\n");
mem = get_mem_timings(); if (!mem) { @@ -76,51 +73,9 @@ void main(void) }
printk(BIOS_INFO, "ddr3_init done\n"); - /* wow, did it work? */ - int i; - u32 *c = (void *)CONFIG_RAMBASE; - -// mmu_setup(CONFIG_SYS_SDRAM_BASE, CONFIG_DRAM_SIZE_MB * 1024); -// printk(BIOS_INFO, "mmu_setup done\n"); - for(i = 0; i < 16384; i++) - c[i] = i+32768; - for(i = 0; i < 16384; i++) - if (c[i] != i+32768) - printk(BIOS_SPEW, "BADc[%02x]: %02x,", i, c[i]); - for(i = 0; i < 1048576; i++) - c[i] = 0; - - ret = init_default_cbfs_media(&cbfs); - if (ret){ - printk(BIOS_ERR, "init_default_cbfs_media returned %d: HALT\n", - ret); - while (1); - } - - struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(&cbfs, "fallback/coreboot_ram", - CBFS_TYPE_STAGE); - printk(BIOS_ERR, "Stage: %p\n", stage); - printk(BIOS_ERR, "loading stage %s @ 0x%x (0x%x bytes),entry @ 0x%p\n", - "ram stage", - (uint32_t) stage->load, stage->memlen, - (void *)(u32)stage->entry); - -#if 0 - /* for reference and testing ... we should be able to remove soon */ -// c = (void *)(u32)(stage->load + stage->len); - c = (void *)(u32)(stage->load); - printk(BIOS_ERR, "memzero 0x%x words starting at %p\n", - (stage->memlen /*- stage->len*/)/4, c); - for(i = 0; i < (stage->memlen /*- stage->len*/)/4; i++){ - printk(BIOS_INFO, "%p, ", &c[i]); - c[i] = 0; - } -#endif
- void *entry = cbfs_load_stage(&cbfs, "fallback/coreboot_ram"); - printk(BIOS_INFO, "entry is %p\n", entry); + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/coreboot_ram"); + printk(BIOS_INFO, "entry is 0x%p, leaving romstage.\n", entry);
- printk(BIOS_INFO, "sayonara, romstage!\n"); - stage_exit((unsigned long)entry); + stage_exit(entry); }