[coreboot-gerrit] New patch to review for coreboot: x86: Drop CONFIG_COMPILE_IN_DSDT

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14078

-gerrit

commit 12a55de25897a882f58d341a1a00868afa574e02
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Sat Mar 12 17:19:50 2016 -0800

    x86: Drop CONFIG_COMPILE_IN_DSDT
    
    This option is no longer needed, as FMAP support has been
    fully integrated in coreboot
    
    Change-Id: I6121b31bf946532717ba15e12f5c63d2baa95ab2
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 src/arch/x86/Kconfig      |  5 -----
 src/arch/x86/Makefile.inc | 14 --------------
 src/arch/x86/acpi.c       |  7 -------
 3 files changed, 26 deletions(-)

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index a90b04e..4102b68 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -153,11 +153,6 @@ config ID_SECTION_OFFSET
 	hex
 	default 0x80
 
-config COMPILE_IN_DSDT
-	bool "compile in DSDT and use that over DSDT in CBFS"
-	depends on HAVE_ACPI_TABLES
-	default n
-
 # 64KiB default bootblock size when employing C_ENVIRONMENT_BOOTBLOCK.
 config C_ENV_BOOTBLOCK_SIZE
 	hex
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 01fa81e..249cdd1 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -274,16 +274,6 @@ ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_64),y)
 target-objcopy=-O elf64-x86-64 -B i386:x86-64
 endif
 
-ifeq ($(CONFIG_COMPILE_IN_DSDT),y)
-ramstage-srcs += $(obj)/dsdt.aml
-
-define ramstage-objs_aml_template
-$(call src-to-obj,ramstage,$(1).aml): $(1).aml
-	@printf "    OBJCOPY    $$(subst $$(obj)/,,$$(@))\n"
-	cd $$(dir $$@) && $$(OBJCOPY_ramstage) -I binary $$(target-objcopy) $$(notdir $$<) $$(notdir $$@)
-endef
-endif
-
 ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c)
 ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
 ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mptable.c),)
@@ -298,11 +288,7 @@ ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c
 endif
 ifeq ($(CONFIG_HAVE_ACPI_TABLES),y)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c
-ifeq ($(CONFIG_COMPILE_IN_DSDT),y)
-$(eval $(call asl_template,dsdt,n))
-else
 $(eval $(call asl_template,dsdt))
-endif
 ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),)
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
 endif
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 9a031ad..a21bae2 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -808,16 +808,9 @@ unsigned long write_acpi_tables(unsigned long start)
 	if (fw)
 		return fw;
 
-#if CONFIG_COMPILE_IN_DSDT
-	extern char _binary_dsdt_aml_start;
-	extern char _binary_dsdt_aml_end;
-	dsdt_file = (acpi_header_t *)&_binary_dsdt_aml_start;
-	dsdt_size = (size_t)(&_binary_dsdt_aml_end - &_binary_dsdt_aml_start);
-#else
 	dsdt_file = cbfs_boot_map_with_leak(
 				     CONFIG_CBFS_PREFIX "/dsdt.aml",
 				     CBFS_TYPE_RAW, &dsdt_size);
-#endif
 	if (!dsdt_file) {
 		printk(BIOS_ERR, "No DSDT file, skipping ACPI tables\n");
 		return current;