google/snow: Revise romstage initialization code.
Move board setup procedure to snow_setup_* functions, and Snow board-specific (wakeup) code to snow_* for better function names and comments. Verified by successfully building and booting on Google/Snow. Change-Id: I2942d75064135093eeb1c1da188a005fd255111d Signed-off-by: Hung-Te Lin <hungte@chromium.org> Reviewed-on: http://review.coreboot.org/3130 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
This commit is contained in:
Hung-Te Lin
Ronald G. Minnich
parent
526a46ed7e
commit
31039e315c
|
|
@ -36,14 +36,14 @@ enum snow_board_config {
|
|||
int board_get_config(void);
|
||||
|
||||
enum {
|
||||
BOARD_IS_NOT_WAKEUP, // A normal boot (not suspend/resume).
|
||||
BOARD_WAKEUP_DIRECT, // A wake up event that can be resumed any time.
|
||||
BOARD_WAKEUP_NEED_CLOCK_RESET, // A wake up event that must be resumed
|
||||
SNOW_IS_NOT_WAKEUP, // A normal boot (not suspend/resume).
|
||||
SNOW_WAKEUP_DIRECT, // A wake up event that can be resumed any time.
|
||||
SNOW_WAKEUP_NEED_CLOCK_RESET, // A wake up event that must be resumed
|
||||
// only after clock and memory
|
||||
// controllers are re-initialized.
|
||||
};
|
||||
|
||||
int board_get_wakeup_state(void);
|
||||
void board_wakeup(void);
|
||||
int snow_get_wakeup_state(void);
|
||||
void snow_wakeup(void);
|
||||
|
||||
#endif /* MAINBOARD_H */
|
||||
|
|
|
|||
|
|
@ -46,10 +46,16 @@
|
|||
#define PMIC_BUS 0
|
||||
#define MMC0_GPIO_PIN (58)
|
||||
|
||||
static int setup_pmic(void)
|
||||
static void snow_setup_power(void)
|
||||
{
|
||||
int error = 0;
|
||||
|
||||
power_init();
|
||||
|
||||
/* Initialize I2C bus to configure PMIC. */
|
||||
i2c_init(0, CONFIG_SYS_I2C_SPEED, 0x00);
|
||||
|
||||
printk(BIOS_DEBUG, "%s: Setting up PMIC...\n", __func__);
|
||||
/*
|
||||
* We're using CR1616 coin cell battery that is non-rechargeable
|
||||
* battery. But, BBCHOSTEN bit of the BBAT Charger Register in
|
||||
|
|
@ -81,19 +87,19 @@ static int setup_pmic(void)
|
|||
|
||||
error |= max77686_enable_32khz_cp(PMIC_BUS);
|
||||
|
||||
if (error)
|
||||
printk(BIOS_CRIT, "%s: Error during PMIC setup\n", __func__);
|
||||
|
||||
return error;
|
||||
if (error) {
|
||||
printk(BIOS_CRIT, "%s: PMIC error: %#x\n", __func__, error);
|
||||
die("Failed to intialize PMIC.\n");
|
||||
}
|
||||
}
|
||||
|
||||
static void initialize_s5p_mshc(void)
|
||||
static void snow_setup_storage(void)
|
||||
{
|
||||
/* MMC0: Fixed, 8 bit mode, connected with GPIO. */
|
||||
if (clock_set_mshci(PERIPH_ID_SDMMC0))
|
||||
printk(BIOS_CRIT, "Failed to set clock for SDMMC0.\n");
|
||||
printk(BIOS_CRIT, "%s: Failed to set MMC0 clock.\n", __func__);
|
||||
if (gpio_direction_output(MMC0_GPIO_PIN, 1)) {
|
||||
printk(BIOS_CRIT, "Unable to power on SDMMC0.\n");
|
||||
printk(BIOS_CRIT, "%s: Unable to power on MMC0.\n", __func__);
|
||||
}
|
||||
gpio_set_pull(MMC0_GPIO_PIN, EXYNOS_GPIO_PULL_NONE);
|
||||
gpio_set_drv(MMC0_GPIO_PIN, EXYNOS_GPIO_DRV_4X);
|
||||
|
|
@ -104,12 +110,12 @@ static void initialize_s5p_mshc(void)
|
|||
exynos_pinmux_config(PERIPH_ID_SDMMC2, 0);
|
||||
}
|
||||
|
||||
static void graphics(void)
|
||||
static void snow_setup_graphics(void)
|
||||
{
|
||||
exynos_pinmux_config(PERIPH_ID_DPHPD, 0);
|
||||
}
|
||||
|
||||
static void chromeos_gpios(void)
|
||||
static void snow_setup_gpio(void)
|
||||
{
|
||||
struct exynos5_gpio_part1 *gpio_pt1;
|
||||
struct exynos5_gpio_part2 *gpio_pt2;
|
||||
|
|
@ -137,53 +143,49 @@ static void chromeos_gpios(void)
|
|||
s5p_gpio_set_pull(&gpio_pt2->x1, POWER_GPIO, EXYNOS_GPIO_PULL_NONE);
|
||||
}
|
||||
|
||||
void main(void)
|
||||
static void snow_setup_memory(struct mem_timings *mem, int is_resume)
|
||||
{
|
||||
struct mem_timings *mem;
|
||||
struct arm_clk_ratios *arm_ratios;
|
||||
int ret;
|
||||
void *entry;
|
||||
|
||||
clock_set_rate(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
|
||||
|
||||
/* 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();
|
||||
|
||||
i2c_init(0, CONFIG_SYS_I2C_SPEED, 0x00);
|
||||
if (power_init())
|
||||
power_shutdown();
|
||||
printk(BIOS_DEBUG, "%s: setting up pmic...\n", __func__);
|
||||
if (setup_pmic())
|
||||
power_shutdown();
|
||||
|
||||
if (!mem) {
|
||||
printk(BIOS_CRIT, "Unable to auto-detect memory timings\n");
|
||||
while(1);
|
||||
}
|
||||
printk(BIOS_SPEW, "man: 0x%x type: 0x%x, div: 0x%x, mhz: 0x%x\n",
|
||||
mem->mem_manuf,
|
||||
mem->mem_type,
|
||||
mem->mpll_mdiv,
|
||||
mem->frequency_mhz);
|
||||
|
||||
ret = ddr3_mem_ctrl_init(mem, DMC_INTERLEAVE_SIZE, 1);
|
||||
if (ret) {
|
||||
printk(BIOS_ERR, "Memory controller init failed, err: %x\n",
|
||||
ret);
|
||||
while(1);
|
||||
if (ddr3_mem_ctrl_init(mem, DMC_INTERLEAVE_SIZE, !is_resume)) {
|
||||
die("Failed to initialize memory controller.\n");
|
||||
}
|
||||
}
|
||||
|
||||
initialize_s5p_mshc();
|
||||
static struct mem_timings *snow_setup_clock(void)
|
||||
{
|
||||
struct mem_timings *mem = get_mem_timings();
|
||||
struct arm_clk_ratios *arm_ratios = get_arm_clk_ratios();
|
||||
if (!mem) {
|
||||
die("Unable to auto-detect memory timings\n");
|
||||
}
|
||||
system_clock_init(mem, arm_ratios);
|
||||
return mem;
|
||||
}
|
||||
|
||||
chromeos_gpios();
|
||||
void main(void)
|
||||
{
|
||||
struct mem_timings *mem;
|
||||
void *entry;
|
||||
|
||||
graphics();
|
||||
/* Clock must be initialized before console_init, otherwise you may need
|
||||
* to re-initialize serial console drivers again. */
|
||||
mem = snow_setup_clock();
|
||||
|
||||
console_init();
|
||||
snow_setup_power();
|
||||
|
||||
snow_setup_memory(mem, 0);
|
||||
|
||||
snow_setup_storage();
|
||||
snow_setup_gpio();
|
||||
snow_setup_graphics();
|
||||
|
||||
/* Set SPI (primary CBFS media) clock to 50MHz. */
|
||||
clock_set_rate(PERIPH_ID_SPI1, 50000000);
|
||||
entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/coreboot_ram");
|
||||
printk(BIOS_INFO, "entry is 0x%p, leaving romstage.\n", entry);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,16 +26,16 @@
|
|||
|
||||
#include "mainboard.h"
|
||||
|
||||
static int wakeup_need_reset(void)
|
||||
static int snow_wakeup_need_reset(void)
|
||||
{
|
||||
/* The "wake up" event is not reliable (known as "bad wakeup") and needs
|
||||
* reset if GPIO value is high. */
|
||||
return gpio_get_value(GPIO_Y10);
|
||||
}
|
||||
|
||||
void board_wakeup(void)
|
||||
void snow_wakeup(void)
|
||||
{
|
||||
if (wakeup_need_reset())
|
||||
if (snow_wakeup_need_reset())
|
||||
power_reset();
|
||||
|
||||
power_init(); /* Ensure ps_hold_setup() for early wakeup. */
|
||||
|
|
@ -44,7 +44,7 @@ void board_wakeup(void)
|
|||
die("Failed to wake up.\n");
|
||||
}
|
||||
|
||||
int board_get_wakeup_state()
|
||||
int snow_get_wakeup_state()
|
||||
{
|
||||
uint32_t status = power_read_reset_status();
|
||||
|
||||
|
|
@ -53,10 +53,10 @@ int board_get_wakeup_state()
|
|||
*/
|
||||
|
||||
if (status == S5P_CHECK_DIDLE || status == S5P_CHECK_LPA)
|
||||
return BOARD_WAKEUP_DIRECT;
|
||||
return SNOW_WAKEUP_DIRECT;
|
||||
|
||||
if (status == S5P_CHECK_SLEEP)
|
||||
return BOARD_WAKEUP_NEED_CLOCK_RESET;
|
||||
return SNOW_WAKEUP_NEED_CLOCK_RESET;
|
||||
|
||||
return BOARD_IS_NOT_WAKEUP;
|
||||
return SNOW_IS_NOT_WAKEUP;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue