Timothy Pearson (tpearson@raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12267
-gerrit
commit e310b0e18492db37d775a3f3c0921ad7deff020a Author: Timothy Pearson tpearson@raptorengineeringinc.com Date: Fri Oct 30 14:46:18 2015 -0500
southbridge/amd/sb700: Remove acpi_get_sleep_type for early CBMEM
The acpi_get_sleep_type function in SB700 ramstage is only needed for boards / CPUs that require late CBMEM initialization.
Providing this function in early CBMEM-compatible boards breaks building of the ACPI S3 code due to multiple definitions of acpi_get_sleep_type.
Change-Id: Ieebc2640a586812e3e2bfd410987205d64147314 Signed-off-by: Timothy Pearson tpearson@raptorengineeringinc.com --- src/southbridge/amd/sb700/lpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c index 8f286d7..24635b1 100644 --- a/src/southbridge/amd/sb700/lpc.c +++ b/src/southbridge/amd/sb700/lpc.c @@ -87,13 +87,13 @@ static void lpc_init(device_t dev) cmos_check_update_date(); }
+#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT) int acpi_get_sleep_type(void) { u16 tmp = inw(ACPI_PM1_CNT_BLK); return ((tmp & (7 << 10)) >> 10); }
-#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT) void backup_top_of_ram(uint64_t ramtop) { u32 dword = (u32) ramtop;