summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2016-03-12 17:19:50 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2016-03-15 21:17:14 +0100
commit730d47537e947eff439b33a6d3847abdd2a5a2ef (patch)
treee48d771860e073fdfc7a3cf21e9e3ea801e0b13e /src/arch/x86
parent821844534c78c60041402e732892f79865636650 (diff)
downloadcoreboot-730d47537e947eff439b33a6d3847abdd2a5a2ef.tar.xz
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@coreboot.org> Reviewed-on: https://review.coreboot.org/14078 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/Kconfig5
-rw-r--r--src/arch/x86/Makefile.inc14
-rw-r--r--src/arch/x86/acpi.c7
3 files changed, 0 insertions, 26 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index a90b04e440..4102b6805f 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 01fa81e747..249cdd1be6 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 9a031adff9..a21bae2a36 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;