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

Fix mismerge of ACPI patches 

Change-Id: I2a9960861465f4686113213d5e5793333b6274b2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7079
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Vladimir Serbinenko 2014-10-16 18:00:27 +02:00 committed by Patrick Georgi
parent 833bf20f92
commit f21271edb5
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/northbridge/amd/amdk8/northbridge.c
View File

@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include <lib.h> #include <lib.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
#include <arch/acpi.h> #include <arch/acpi.h>
#include "acpi.h" #include "acpi.h"
#endif #endif
@ -584,7 +584,7 @@ static void mcf0_control_init(struct device *dev)
#endif #endif
} }
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
static unsigned long northbridge_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp) static unsigned long northbridge_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp)
{ {
unsigned long current; unsigned long current;
@ -616,7 +616,7 @@ static struct device_operations northbridge_operations = {
.read_resources = amdk8_read_resources, .read_resources = amdk8_read_resources,
.set_resources = amdk8_set_resources, .set_resources = amdk8_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.acpi_fill_ssdt_generator = k8acpi_write_vars, .acpi_fill_ssdt_generator = k8acpi_write_vars,
.write_acpi_tables = northbridge_write_acpi_tables, .write_acpi_tables = northbridge_write_acpi_tables,
#endif #endif

6
src/southbridge/amd/amd8111/lpc.c
View File

@ -11,7 +11,7 @@
#include <pc80/isa-dma.h> #include <pc80/isa-dma.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <arch/ioapic.h> #include <arch/ioapic.h>
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/acpigen.h> #include <arch/acpigen.h>
#include <cpu/amd/model_fxx_powernow.h> #include <cpu/amd/model_fxx_powernow.h>
@ -118,7 +118,7 @@ static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));
} }
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
extern u16 pm_base; extern u16 pm_base;
@ -147,7 +147,7 @@ static struct device_operations lpc_ops = {
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = lpc_init, .init = lpc_init,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
#endif #endif

4
src/southbridge/amd/sb600/lpc.c
View File

@ -219,7 +219,7 @@ static void sb600_lpc_enable_resources(device_t dev)
sb600_lpc_enable_childrens_resources(dev); sb600_lpc_enable_childrens_resources(dev);
} }
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
extern u16 pm_base; extern u16 pm_base;
@ -237,7 +237,7 @@ static struct device_operations lpc_ops = {
.read_resources = sb600_lpc_read_resources, .read_resources = sb600_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = sb600_lpc_enable_resources, .enable_resources = sb600_lpc_enable_resources,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
#endif #endif

4
src/southbridge/amd/sb700/lpc.c
View File

@ -268,7 +268,7 @@ static void sb700_lpc_enable_resources(device_t dev)
sb700_lpc_enable_childrens_resources(dev); sb700_lpc_enable_childrens_resources(dev);
} }
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
static void southbridge_acpi_fill_ssdt_generator(void) { static void southbridge_acpi_fill_ssdt_generator(void) {
amd_model_fxx_generate_powernow(ACPI_CPU_CONTROL, 6, 1); amd_model_fxx_generate_powernow(ACPI_CPU_CONTROL, 6, 1);
@ -285,7 +285,7 @@ static struct device_operations lpc_ops = {
.read_resources = sb700_lpc_read_resources, .read_resources = sb700_lpc_read_resources,
.set_resources = sb700_lpc_set_resources, .set_resources = sb700_lpc_set_resources,
.enable_resources = sb700_lpc_enable_resources, .enable_resources = sb700_lpc_enable_resources,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
#endif #endif

2
src/southbridge/nvidia/ck804/ht.c
View File

@ -26,7 +26,7 @@
#include "ck804.h" #include "ck804.h"
#include <arch/acpi.h> #include <arch/acpi.h>
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
unsigned long acpi_fill_mcfg(unsigned long current) unsigned long acpi_fill_mcfg(unsigned long current)
{ {

4
src/southbridge/nvidia/ck804/lpc.c
View File

@ -317,7 +317,7 @@ static struct device_operations lpc_ops = {
.read_resources = ck804_lpc_read_resources, .read_resources = ck804_lpc_read_resources,
.set_resources = ck804_lpc_set_resources, .set_resources = ck804_lpc_set_resources,
.enable_resources = ck804_lpc_enable_resources, .enable_resources = ck804_lpc_enable_resources,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_init, .init = lpc_init,
@ -349,7 +349,7 @@ static struct device_operations lpc_slave_ops = {
.read_resources = ck804_lpc_read_resources, .read_resources = ck804_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_slave_init, .init = lpc_slave_init,

2
src/southbridge/nvidia/mcp55/ht.c
View File

@ -29,7 +29,7 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include "mcp55.h" #include "mcp55.h"
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
unsigned long acpi_fill_mcfg(unsigned long current) unsigned long acpi_fill_mcfg(unsigned long current)
{ {
/* Not implemented */ /* Not implemented */

6
src/southbridge/nvidia/mcp55/lpc.c
View File

@ -36,7 +36,7 @@
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <stdlib.h> #include <stdlib.h>
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/acpigen.h> #include <arch/acpigen.h>
#endif #endif
@ -281,7 +281,7 @@ static const struct pci_driver lpc_driver __pci_driver = {
.devices = lpc_ids, .devices = lpc_ids,
}; };
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
static void southbridge_acpi_fill_ssdt_generator(void) static void southbridge_acpi_fill_ssdt_generator(void)
{ {
@ -294,7 +294,7 @@ static struct device_operations lpc_slave_ops = {
.read_resources = mcp55_lpc_read_resources, .read_resources = mcp55_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES)
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
#endif #endif

6
src/southbridge/via/k8t890/traf_ctrl.c
View File

@ -125,7 +125,7 @@ static void traf_ctrl_enable_k8t890(struct device *dev)
pci_write_config8(dev, 0x60, 0x80 | reg); pci_write_config8(dev, 0x60, 0x80 | reg);
} }
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
static void southbridge_acpi_fill_ssdt_generator(void) { static void southbridge_acpi_fill_ssdt_generator(void) {
amd_model_fxx_generate_powernow(0, 0, 0); amd_model_fxx_generate_powernow(0, 0, 0);
@ -139,7 +139,7 @@ static const struct device_operations traf_ctrl_ops_m = {
.set_resources = mmconfig_set_resources, .set_resources = mmconfig_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.enable = traf_ctrl_enable_k8m890, .enable = traf_ctrl_enable_k8m890,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
.acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator, .acpi_fill_ssdt_generator = southbridge_acpi_fill_ssdt_generator,
#endif #endif
@ -151,7 +151,7 @@ static const struct device_operations traf_ctrl_ops_t = {
.set_resources = mmconfig_set_resources, .set_resources = mmconfig_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.enable = traf_ctrl_enable_k8t890, .enable = traf_ctrl_enable_k8t890,
#if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.ops_pci = 0, .ops_pci = 0,