From 822bc65b0e8cb9c17721b8b776ec7ecf6ac4129e Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 3 Jan 2014 15:55:40 +0100 Subject: 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 Reviewed-on: http://review.coreboot.org/4609 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/amd/model_fxx/Makefile.inc | 2 +- src/cpu/intel/fsp_model_206ax/Makefile.inc | 2 +- src/cpu/intel/fsp_model_406dx/Makefile.inc | 2 +- src/cpu/intel/haswell/Makefile.inc | 2 +- src/cpu/intel/model_2065x/Makefile.inc | 2 +- src/cpu/intel/model_206ax/Makefile.inc | 2 +- src/cpu/intel/speedstep/Makefile.inc | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/amd/model_fxx/Makefile.inc b/src/cpu/amd/model_fxx/Makefile.inc index eb62640656..cf4ac2183f 100644 --- a/src/cpu/amd/model_fxx/Makefile.inc +++ b/src/cpu/amd/model_fxx/Makefile.inc @@ -4,4 +4,4 @@ romstage-y += ../../x86/mtrr/earlymtrr.c ramstage-y += model_fxx_init.c ramstage-y += model_fxx_update_microcode.c ramstage-y += processor_name.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += powernow_acpi.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += powernow_acpi.c diff --git a/src/cpu/intel/fsp_model_206ax/Makefile.inc b/src/cpu/intel/fsp_model_206ax/Makefile.inc index cb7f2a8636..e3d3ca5fb4 100644 --- a/src/cpu/intel/fsp_model_206ax/Makefile.inc +++ b/src/cpu/intel/fsp_model_206ax/Makefile.inc @@ -1,7 +1,7 @@ ramstage-y += model_206ax_init.c subdirs-y += ../../x86/name -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-y += acpi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c diff --git a/src/cpu/intel/fsp_model_406dx/Makefile.inc b/src/cpu/intel/fsp_model_406dx/Makefile.inc index 118efee147..767cc20c17 100644 --- a/src/cpu/intel/fsp_model_406dx/Makefile.inc +++ b/src/cpu/intel/fsp_model_406dx/Makefile.inc @@ -20,7 +20,7 @@ ramstage-y += model_406dx_init.c subdirs-y += ../../x86/name -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-y += acpi.c cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc index efed391a68..2518e9a72e 100644 --- a/src/cpu/intel/haswell/Makefile.inc +++ b/src/cpu/intel/haswell/Makefile.inc @@ -3,7 +3,7 @@ ramstage-y += tsc_freq.c romstage-y += romstage.c romstage-y += tsc_freq.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-y += acpi.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c ramstage-$(CONFIG_MONOTONIC_TIMER_MSR) += monotonic_timer.c diff --git a/src/cpu/intel/model_2065x/Makefile.inc b/src/cpu/intel/model_2065x/Makefile.inc index 3b3fc4e016..c21a4b580c 100644 --- a/src/cpu/intel/model_2065x/Makefile.inc +++ b/src/cpu/intel/model_2065x/Makefile.inc @@ -13,7 +13,7 @@ ramstage-y += tsc_freq.c romstage-y += tsc_freq.c smm-$(CONFIG_HAVE_SMI_HANDLER) += tsc_freq.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-y += acpi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c diff --git a/src/cpu/intel/model_206ax/Makefile.inc b/src/cpu/intel/model_206ax/Makefile.inc index a324b64e73..32a5eff707 100644 --- a/src/cpu/intel/model_206ax/Makefile.inc +++ b/src/cpu/intel/model_206ax/Makefile.inc @@ -1,7 +1,7 @@ ramstage-y += model_206ax_init.c subdirs-y += ../../x86/name -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-y += acpi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c diff --git a/src/cpu/intel/speedstep/Makefile.inc b/src/cpu/intel/speedstep/Makefile.inc index 130eb0c79d..eddd4f34df 100644 --- a/src/cpu/intel/speedstep/Makefile.inc +++ b/src/cpu/intel/speedstep/Makefile.inc @@ -1,2 +1 @@ -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c speedstep.c -ramstage-$(CONFIG_CPU_INTEL_MODEL_1067X) += speedstep.c +ramstage-y += acpi.c speedstep.c -- cgit v1.2.3