From d820f4b8fb6602993c003f2db3e18029d9105b2a Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Mon, 13 Aug 2018 10:39:03 -0600 Subject: soc/amd/stoneyridge: Add bootblock_fch_init Add a method in bootblock that can be used for printing registers. BUG=none TEST=compiled grunt Change-Id: I8dff30e589761fbad92cfc2709546dba169993d8 Signed-off-by: Raul E Rangel Reviewed-on: https://review.coreboot.org/28059 Reviewed-by: Marshall Dawson Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- src/soc/amd/stoneyridge/bootblock/bootblock.c | 2 ++ src/soc/amd/stoneyridge/include/soc/southbridge.h | 1 + src/soc/amd/stoneyridge/southbridge.c | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock/bootblock.c index 7b2c42086d..c2440b0eb1 100644 --- a/src/soc/amd/stoneyridge/bootblock/bootblock.c +++ b/src/soc/amd/stoneyridge/bootblock/bootblock.c @@ -106,6 +106,8 @@ void bootblock_soc_init(void) u32 val = cpuid_eax(1); printk(BIOS_DEBUG, "Family_Model: %08x\n", val); + bootblock_fch_init(); + /* Initialize any early i2c buses. */ i2c_soc_early_init(); } diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h index 64b4b4691d..c6f77916d8 100644 --- a/src/soc/amd/stoneyridge/include/soc/southbridge.h +++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h @@ -449,6 +449,7 @@ uint16_t xhci_pm_read16(uint8_t reg); void xhci_pm_write32(uint8_t reg, uint32_t value); uint32_t xhci_pm_read32(uint8_t reg); void bootblock_fch_early_init(void); +void bootblock_fch_init(void); /** * @brief Save the UMA bize returned by AGESA * diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index a6219b4b5c..c4b8d04d37 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -621,6 +621,7 @@ static void setup_misc(int *reboot) } } +/* Before console init */ void bootblock_fch_early_init(void) { int reboot = 0; @@ -643,6 +644,9 @@ void bootblock_fch_early_init(void) enable_aoac_devices(); } +/* After console init */ +void bootblock_fch_init(void) {} + void sb_enable(device_t dev) { printk(BIOS_DEBUG, "%s\n", __func__); -- cgit v1.2.3