GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/stoneyridge:Fix IS_ENABLED() around Kconfig symbol references 

- Update files that were added since the IS_ENABLED() fix patches
- Remove extra XHCI controller.

Change-Id: I7028942ce54b06cd048029f7b93f064beba579ad
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20565
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Martin Roth 2017-07-13 11:05:35 -07:00
parent 99aa6ce053
commit 5998198f0c
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/soc/amd/stoneyridge/acpi/sleepstates.asl
View File

@ -23,7 +23,7 @@ If (LAnd(SSFG, 0x01)) {
If (LAnd(SSFG, 0x02)) { If (LAnd(SSFG, 0x02)) {
Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} ) /* (S2) - "light" Suspend to RAM */ Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} ) /* (S2) - "light" Suspend to RAM */
} }
#if CONFIG_HAVE_ACPI_RESUME #if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
If (LAnd(SSFG, 0x04)) { If (LAnd(SSFG, 0x04)) {
Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} ) /* (S3) - Suspend to RAM */ Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} ) /* (S3) - Suspend to RAM */
} }

8
src/soc/amd/stoneyridge/acpi/usb.asl
View File

@ -55,11 +55,3 @@ Device(XHC0) {
Name(_ADR, 0x00100000) Name(_ADR, 0x00100000)
Name(_PRW, Package() {0x0b, 4}) Name(_PRW, Package() {0x0b, 4})
} /* end XHC0 */ } /* end XHC0 */
#if !CONFIG_SOUTHBRIDGE_AMD_PI_AVALON && !CONFIG_SOUTHBRIDGE_AMD_PI_KERN
/* 0:10.1 - XHCI 1*/
Device(XHC1) {
Name(_ADR, 0x00100001)
Name(_PRW, Package() {0x0b, 4})
} /* end XHC1 */
#endif

2
src/soc/amd/stoneyridge/fadt.c
View File

@ -25,7 +25,7 @@
#include <soc/hudson.h> #include <soc/hudson.h>
#include <soc/smi.h> #include <soc/smi.h>
#if CONFIG_STONEYRIDGE_LEGACY_FREE #if IS_ENABLED(CONFIG_STONEYRIDGE_LEGACY_FREE)
#define FADT_BOOT_ARCH ACPI_FADT_LEGACY_FREE #define FADT_BOOT_ARCH ACPI_FADT_LEGACY_FREE
#else #else
#define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042) #define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042)

4
src/soc/amd/stoneyridge/model_15_init.c
View File

@ -54,7 +54,7 @@ static void model_15_init(device_t dev)
u8 i; u8 i;
msr_t msr; msr_t msr;
int msrno; int msrno;
#if CONFIG_LOGICAL_CPUS #if IS_ENABLED(CONFIG_LOGICAL_CPUS)
u32 siblings; u32 siblings;
#endif #endif
@ -92,7 +92,7 @@ static void model_15_init(device_t dev)
/* Enable the local CPU APICs */ /* Enable the local CPU APICs */
setup_lapic(); setup_lapic();
#if CONFIG_LOGICAL_CPUS #if IS_ENABLED(CONFIG_LOGICAL_CPUS)
siblings = cpuid_ecx(0x80000008) & 0xff; siblings = cpuid_ecx(0x80000008) & 0xff;
if (siblings > 0) { if (siblings > 0) {

2
src/soc/amd/stoneyridge/northbridge.c
View File

@ -48,7 +48,7 @@
#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES) #define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
#if (defined CONFIG_EXT_CONF_SUPPORT) && CONFIG_EXT_CONF_SUPPORT == 1 #if IS_ENABLED(CONFIG_EXT_CONF_SUPPORT)
#error CONFIG_EXT_CONF_SUPPORT == 1 not support anymore! #error CONFIG_EXT_CONF_SUPPORT == 1 not support anymore!
#endif #endif