Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7375
-gerrit
commit e27e063ad9d44017b50a8cb23c04ba7ac19edcba Author: Vladimir Serbinenko phcoder@gmail.com Date: Sun Nov 9 13:44:36 2014 +0100
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 phcoder@gmail.com --- 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 4eb1216..c3c8a0e 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 5354834..8ba7a35 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -32,9 +32,6 @@ #include <ec/acpi/ec.h> #include <ec/lenovo/h8/h8.h>
-#include "cstates.c" /* Include it, as the linker won't find - the overloaded weak function in there. */ - const char *smbios_mainboard_bios_version(void) { static char *s = NULL; diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc index 1a6cb02..d69f715 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 4ae004b..1b607cc 100644 --- a/src/mainboard/roda/rk9/mainboard.c +++ b/src/mainboard/roda/rk9/mainboard.c @@ -26,9 +26,6 @@ #include <pc80/keyboard.h> #include <ec/acpi/ec.h>
-#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. */