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>

13 files changed, 18 insertions, 20 deletions

diff --git a/src/northbridge/amd/agesa/family10/Makefile.inc b/src/northbridge/amd/agesa/family10/Makefile.inc
index 9676d54d92..a10a4a1c21 100644
--- a/src/northbridge/amd/agesa/family10/Makefile.inc
+++ b/src/northbridge/amd/agesa/family10/Makefile.inc
@@ -19,4 +19,4 @@
 
 ramstage-y += northbridge.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.asl
diff --git a/src/northbridge/amd/agesa/family12/Makefile.inc b/src/northbridge/amd/agesa/family12/Makefile.inc
index 62c851903f..ffadecd411 100644
--- a/src/northbridge/amd/agesa/family12/Makefile.inc
+++ b/src/northbridge/amd/agesa/family12/Makefile.inc
@@ -24,4 +24,4 @@ ramstage-y += northbridge.c
 ramstage-y += fam12_callouts.c
 ramstage-y += dimmSpd.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.asl
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index a24783b236..bae7c187ac 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -1,13 +1,13 @@
 ramstage-y += northbridge.c
 ramstage-y += misc_control.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.asl
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.asl
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.asl
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.asl
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sspr1.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sspr2.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sspr3.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sspr4.asl
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sspr5.asl
 
 ramstage-y += get_pci1234.c
 
diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc
index 38b0201f6a..eeef9e8054 100644
--- a/src/northbridge/amd/amdk8/Makefile.inc
+++ b/src/northbridge/amd/amdk8/Makefile.inc
@@ -1,7 +1,7 @@
 ramstage-y += northbridge.c
 ramstage-y += misc_control.c
 ramstage-y += get_sblk_pci1234.c
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
 
 # Enable this if you want to check the values of the PCI routing registers.
 # Call show_all_routes() anywhere amdk8.h is included.
diff --git a/src/northbridge/intel/fsp_rangeley/Makefile.inc b/src/northbridge/intel/fsp_rangeley/Makefile.inc
index d9955fec17..96de4df449 100644
--- a/src/northbridge/intel/fsp_rangeley/Makefile.inc
+++ b/src/northbridge/intel/fsp_rangeley/Makefile.inc
@@ -22,7 +22,7 @@ subdirs-y += fsp
 ramstage-y += northbridge.c
 ramstage-y += raminit.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 ramstage-y += port_access.c
 
 romstage-y += raminit.c
diff --git a/src/northbridge/intel/fsp_sandybridge/Makefile.inc b/src/northbridge/intel/fsp_sandybridge/Makefile.inc
index a22911991a..22e4ed4cbe 100644
--- a/src/northbridge/intel/fsp_sandybridge/Makefile.inc
+++ b/src/northbridge/intel/fsp_sandybridge/Makefile.inc
@@ -22,7 +22,7 @@ subdirs-y += fsp
 ramstage-y += northbridge.c
 ramstage-y += gma.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 
 romstage-y += raminit.c
 romstage-y += early_init.c
diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc
index 5caa8afb05..13525257da 100644
--- a/src/northbridge/intel/gm45/Makefile.inc
+++ b/src/northbridge/intel/gm45/Makefile.inc
@@ -31,7 +31,7 @@ romstage-y += pm.c
 romstage-y += ram_calc.c
 romstage-$(CONFIG_IOMMU) += iommu.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 
 ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
diff --git a/src/northbridge/intel/haswell/Makefile.inc b/src/northbridge/intel/haswell/Makefile.inc
index bf7daa706a..372175554f 100644
--- a/src/northbridge/intel/haswell/Makefile.inc
+++ b/src/northbridge/intel/haswell/Makefile.inc
@@ -21,7 +21,7 @@ ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 ramstage-y += mrccache.c
 ramstage-y += minihd.c
 
diff --git a/src/northbridge/intel/i945/Makefile.inc b/src/northbridge/intel/i945/Makefile.inc
index 67643eb972..d3a795cfd6 100644
--- a/src/northbridge/intel/i945/Makefile.inc
+++ b/src/northbridge/intel/i945/Makefile.inc
@@ -20,7 +20,7 @@
 ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 
 romstage-y += ram_calc.c
 romstage-y += raminit.c
diff --git a/src/northbridge/intel/nehalem/Makefile.inc b/src/northbridge/intel/nehalem/Makefile.inc
index c6dcfd4c5f..416e481d59 100644
--- a/src/northbridge/intel/nehalem/Makefile.inc
+++ b/src/northbridge/intel/nehalem/Makefile.inc
@@ -21,7 +21,7 @@ ramstage-y += ram_calc.c
 ramstage-y += northbridge.c
 ramstage-y += gma.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 ramstage-y += ../sandybridge/mrccache.c
 
 romstage-y += ram_calc.c
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 5dfd87788d..09d6614eb1 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -23,7 +23,7 @@ ramstage-y += gma.c
 ramstage-$(CONFIG_IVYBRIDGE_LVDS) += gma_ivybridge_lvds.c
 ramstage-$(CONFIG_SANDYBRIDGE_LVDS) += gma_sandybridge_lvds.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
 ramstage-y += mrccache.c
 
 romstage-y += ram_calc.c
diff --git a/src/northbridge/intel/sch/Makefile.inc b/src/northbridge/intel/sch/Makefile.inc
index 6124a8c734..16152b7c9a 100644
--- a/src/northbridge/intel/sch/Makefile.inc
+++ b/src/northbridge/intel/sch/Makefile.inc
@@ -20,4 +20,4 @@
 ramstage-y += northbridge.c
 ramstage-y += gma.c
 ramstage-y += port_access.c
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
+ramstage-y += acpi.c
diff --git a/src/northbridge/intel/sch/acpi.c b/src/northbridge/intel/sch/acpi.c
index 6dd495ffbc..25cf7bada8 100644
--- a/src/northbridge/intel/sch/acpi.c
+++ b/src/northbridge/intel/sch/acpi.c
@@ -66,9 +66,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
 	if (!pciexbar)
 		return current;
 
-#if CONFIG_GENERATE_ACPI_TABLES
 	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *) current,
 					     pciexbar, 0x0, 0x0, max_buses - 1);
-#endif
 	return current;
 }