diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-01-03 15:55:40 +0100 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2014-10-16 12:01:10 +0200 |
| commit | 822bc65b0e8cb9c17721b8b776ec7ecf6ac4129e (patch) | |
| tree | b32448affa8d83a08cc4a754aed4731b32c09882 /src/arch/x86 | |
| parent | 0e64617d7d8adcd4d3db16eed7a34604691c2ee6 (diff) | |
| download | coreboot-822bc65b0e8cb9c17721b8b776ec7ecf6ac4129e.tar.xz | |
ACPI: Remove CONFIG_GENERATE_ACPI_TABLES
As currently many systems would be barely functional without ACPI,
always generate ACPI tables if supported.
Change-Id: I372dbd03101030c904dab153552a1291f3b63518
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4609
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/x86/boot/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/arch/x86/boot/smbios.c | 2 | ||||
| -rw-r--r-- | src/arch/x86/boot/tables.c | 2 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 8 |
5 files changed, 5 insertions, 13 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 0a7399e3dd..1480a666b2 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -278,7 +278,7 @@ endif ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/reset.c),) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c endif -ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y) +ifeq ($(CONFIG_HAVE_ACPI_TABLES),y) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/dsdt.asl ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/ssdt2.asl),) diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc index a6f914c11f..2c482b33f3 100644 --- a/src/arch/x86/boot/Makefile.inc +++ b/src/arch/x86/boot/Makefile.inc @@ -14,9 +14,9 @@ ramstage-y += tables.c ramstage-y += cbmem.c ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen.c ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S $(obj)/arch/x86/boot/smbios.ramstage.o: $(obj)/build.h diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 8437fb5ab0..f374bd9e87 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -169,7 +169,7 @@ static int smbios_write_type0(unsigned long *current, int handle) BIOS_CHARACTERISTICS_SELECTABLE_BOOT | BIOS_CHARACTERISTICS_UPGRADEABLE; -#if CONFIG_GENERATE_ACPI_TABLES +#if CONFIG_HAVE_ACPI_TABLES t->bios_characteristics_ext1 = BIOS_EXT1_CHARACTERISTICS_ACPI; #endif t->bios_characteristics_ext2 = BIOS_EXT2_CHARACTERISTICS_TARGET; diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index 42b8a678ee..e5fb43a9b7 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -108,7 +108,7 @@ void write_tables(void) } #endif /* CONFIG_GENERATE_MP_TABLE */ -#if CONFIG_GENERATE_ACPI_TABLES +#if CONFIG_HAVE_ACPI_TABLES #if CONFIG_DYNAMIC_CBMEM #define MAX_ACPI_SIZE (144 * 1024) #else diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 4adf89e3f8..f334da5652 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -27,8 +27,6 @@ #ifndef __ASM_ACPI_H #define __ASM_ACPI_H -#if CONFIG_GENERATE_ACPI_TABLES - #include <stdint.h> #define RSDP_SIG "RSD PTR " /* RSDT pointer signature */ @@ -581,12 +579,6 @@ unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current); /* cpu/intel/speedstep/acpi.c */ void generate_cpu_entries(void); -#else // CONFIG_GENERATE_ACPI_TABLES - -#define write_acpi_tables(start) (start) - -#endif /* CONFIG_GENERATE_ACPI_TABLES */ - static inline int acpi_s3_resume_allowed(void) { return IS_ENABLED(CONFIG_HAVE_ACPI_RESUME); |