Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7375
-gerrit
commit 7035b7e524ad2eb6355c4d17ce4307efc94854a0
Author: Vladimir Serbinenko <phcoder(a)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(a)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. */
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7135
-gerrit
commit cc9a144aa6ece7972ab06d540ead4e0b053a73d5
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Mon Oct 20 19:38:27 2014 +0200
Kconfig: Remove ACPI_SSDTX_NUM.
Its scope is limited to a single mainboard and is only to go through ifdef.
Kill it and move the value to the code.
Change-Id: I76a87e2790d57dee8f37b51e33d0689fffd3a59d
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/Kconfig | 4 ----
src/mainboard/amd/olivehill/Kconfig | 4 ----
src/mainboard/amd/olivehillplus/Kconfig | 4 ----
src/mainboard/amd/serengeti_cheetah/Kconfig | 4 ----
src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 3 ---
src/mainboard/amd/serengeti_cheetah/readme_acpi.txt | 2 +-
src/mainboard/amd/serengeti_cheetah_fam10/Kconfig | 4 ----
src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c | 5 -----
src/mainboard/asrock/imb-a180/Kconfig | 4 ----
src/mainboard/iwill/dk8_htx/Kconfig | 4 ----
src/northbridge/amd/amdfam10/get_pci1234.c | 3 +--
src/northbridge/amd/amdk8/get_sblk_pci1234.c | 3 ---
12 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig
index ee0b78e..c02d945 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -351,10 +351,6 @@ config HAVE_ACPI_SLIC
bool
default n
-config ACPI_SSDTX_NUM
- int
- default 0
-
config HAVE_HARD_RESET
bool
default n
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index ea97550..6f1ceb5 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -56,10 +56,6 @@ config IRQ_SLOT_COUNT
int
default 11
-config ACPI_SSDTX_NUM
- int
- default 0
-
config ONBOARD_VGA_IS_PRIMARY
bool
default y
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig
index 93f0fc6..20aee12 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig
+++ b/src/mainboard/amd/olivehillplus/Kconfig
@@ -56,10 +56,6 @@ config IRQ_SLOT_COUNT
int
default 11
-config ACPI_SSDTX_NUM
- int
- default 0
-
config ONBOARD_VGA_IS_PRIMARY
bool
default y
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index ae0e1f4..e1363eb 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -71,8 +71,4 @@ config IRQ_SLOT_COUNT
int
default 11
-config ACPI_SSDTX_NUM
- int
- default 4
-
endif # BOARD_AMD_SERENGETI_CHEETAH
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index 65b8fc5..802635c 100644
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -136,8 +136,6 @@ unsigned long mainboard_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp
start = ALIGN(start, 16);
current = start;
-#if CONFIG_ACPI_SSDTX_NUM >= 1
-
//same htio, but different position? We may have to copy, change HCIN, and recalculate the checknum and add_table
for(i=1;i<sysconf.hc_possible_num;i++) { // 0: is hc sblink
@@ -173,7 +171,6 @@ unsigned long mainboard_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp
ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length);
acpi_add_table(rsdp, ssdtx);
}
-#endif
return current;
}
diff --git a/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt b/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
index 685cd7a..5d27554 100644
--- a/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
+++ b/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
@@ -12,7 +12,7 @@ Change dsdt.asl, according to MB layout
Change acpi_tables.c
sbdn: Real SB device Num. for 8111 =3 or 1 depend if 8131 presents. ---- Actually you don't need to change it, it is coreboot run-time configurable now.
- if there is HT-IO board, need to adjust SSDTX_NUM...., and preset pci1234 array. acpi_tables.c will decide to put the SSDT on the RSDT or not according if the HT-IO board is installed
+ if there is HT-IO board, need to preset pci1234 array. acpi_tables.c will decide to put the SSDT on the RSDT or not according if the HT-IO board is installed
Regarding pci bridge apic and pic
need to modify entries amd8111.asl and amd8131.asl and amd8151.asl.... acording to your MB laybout, it is like that in mptable.c
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index f0b2043..8677fc9 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -62,8 +62,4 @@ config AMD_UCODE_PATCH_FILE
string
default "mc_patch_01000095.h"
-config ACPI_SSDTX_NUM
- int
- default 5
-
endif # BOARD_AMD_SERENGETI_CHEETAH_FAM10
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
index ea3ec6c..cb91132 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
@@ -30,12 +30,10 @@
#include "mb_sysconf.h"
#include "mainboard.h"
-#if CONFIG_ACPI_SSDTX_NUM >= 1
extern const unsigned char AmlCode_ssdt2[];
extern const unsigned char AmlCode_ssdt3[];
extern const unsigned char AmlCode_ssdt4[];
extern const unsigned char AmlCode_ssdt5[];
-#endif
unsigned long acpi_fill_madt(unsigned long current)
{
@@ -143,8 +141,6 @@ unsigned long mainboard_write_acpi_tables(unsigned long current,
get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
-#if CONFIG_ACPI_SSDTX_NUM >= 1
-
/* same htio, but different possition? We may have to copy,
change HCIN, and recalculate the checknum and add_table */
@@ -182,7 +178,6 @@ unsigned long mainboard_write_acpi_tables(unsigned long current,
ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length);
acpi_add_table(rsdp, ssdtx);
}
-#endif
return current;
}
diff --git a/src/mainboard/asrock/imb-a180/Kconfig b/src/mainboard/asrock/imb-a180/Kconfig
index f3c8aa7..f88ce04 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -57,10 +57,6 @@ config IRQ_SLOT_COUNT
int
default 11
-config ACPI_SSDTX_NUM
- int
- default 0
-
config ONBOARD_VGA_IS_PRIMARY
bool
default y
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index f4a137d..cdfd99a 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -54,8 +54,4 @@ config IRQ_SLOT_COUNT
int
default 11
-config ACPI_SSDTX_NUM
- int
- default 5
-
endif # BOARD_IWILL_DK8_HTX
diff --git a/src/northbridge/amd/amdfam10/get_pci1234.c b/src/northbridge/amd/amdfam10/get_pci1234.c
index 6831013..c5642c7 100644
--- a/src/northbridge/amd/amdfam10/get_pci1234.c
+++ b/src/northbridge/amd/amdfam10/get_pci1234.c
@@ -49,8 +49,7 @@
* reset HC_POSSIBLE_NUM and update ssdt.dsl (hcdn, hclk)
*
* Put all the possible ht node/link to the list tp pci1234[] in get_bus_conf.c
- * on MB dir. Also, don't forget to increase the CONFIG_ACPI_SSDTX_NUM etc if you have
- * too much SSDT. How about co-processor on socket 1 on 2 way system.
+ * on MB dir. How about co-processor on socket 1 on 2 way system.
* or socket 2, and socket3 on 4 way system? treat that as one hc too!
*
*/
diff --git a/src/northbridge/amd/amdk8/get_sblk_pci1234.c b/src/northbridge/amd/amdk8/get_sblk_pci1234.c
index 6fdc3c4..2db726c 100644
--- a/src/northbridge/amd/amdk8/get_sblk_pci1234.c
+++ b/src/northbridge/amd/amdk8/get_sblk_pci1234.c
@@ -176,9 +176,6 @@ unsigned node_link_to_bus(unsigned node, unsigned link)
* Just put all the possible HT Node/link to the list tp pci1234[] in
* src/mainboard/<vendor>/<mainboard>get_bus_conf.c
*
- * Also don't forget to increase the CONFIG_ACPI_SSDTX_NUM etc (FIXME what else) if
- * you have too many SSDTs
- *
* What about co-processor in socket 1 on a 2 way system? Or socket 2 and
* socket 3 on a 4 way system? Treat that as an HC, too!
*