From 61bb37e2054549b96986c5142aaa680ac311e4bf Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 9 Nov 2014 13:44:36 +0100 Subject: [PATCH] gm45: Link cstates.c rather than including it. The comment about necessity of include isn't true anymore as get_cst_entries is not weak anymore so if it's not found, the linking would fail. Change-Id: I4bf88208d63ac3e625f464c3907e2e1ea575dd9f Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/7375 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/mainboard/lenovo/x200/Makefile.inc | 1 + src/mainboard/lenovo/x200/mainboard.c | 3 --- src/mainboard/roda/rk9/Makefile.inc | 2 ++ src/mainboard/roda/rk9/mainboard.c | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mainboard/lenovo/x200/Makefile.inc b/src/mainboard/lenovo/x200/Makefile.inc index 85bb37a459..b2e5c2aebb 100644 --- a/src/mainboard/lenovo/x200/Makefile.inc +++ b/src/mainboard/lenovo/x200/Makefile.inc @@ -18,3 +18,4 @@ ## ramstage-y += dock.c +ramstage-y += cstates.c diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index f23d8d51a1..518b51a9dd 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -32,9 +32,6 @@ #include #include "drivers/lenovo/lenovo.h" -#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - static void fill_ssdt(void) { drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0); diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc index 21bedea8dc..d6838b7b4b 100644 --- a/src/mainboard/roda/rk9/Makefile.inc +++ b/src/mainboard/roda/rk9/Makefile.inc @@ -18,3 +18,5 @@ ## ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += ti_pci7xx1.c +ramstage-y += cstates.c + diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c index 9d31dc3342..d0d9b55e92 100644 --- a/src/mainboard/roda/rk9/mainboard.c +++ b/src/mainboard/roda/rk9/mainboard.c @@ -26,9 +26,6 @@ #include #include -#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - static void ec_setup(void) { /* Thermal limits? Values are from ectool's ram dump. */