GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stefan Reinauer 2016-03-12 17:19:50 -08:00
parent 821844534c
commit 730d47537e
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/arch/x86/Kconfig
View File

@ -153,11 +153,6 @@ config ID_SECTION_OFFSET
hex hex
default 0x80 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. # 64KiB default bootblock size when employing C_ENVIRONMENT_BOOTBLOCK.
config C_ENV_BOOTBLOCK_SIZE config C_ENV_BOOTBLOCK_SIZE
hex hex

14
src/arch/x86/Makefile.inc
View File

@ -274,16 +274,6 @@ ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_64),y)
target-objcopy=-O elf64-x86-64 -B i386:x86-64 target-objcopy=-O elf64-x86-64 -B i386:x86-64
endif 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) ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c)
ifeq ($(CONFIG_GENERATE_MP_TABLE),y) ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mptable.c),) ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mptable.c),)
@ -298,11 +288,7 @@ ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c
endif endif
ifeq ($(CONFIG_HAVE_ACPI_TABLES),y) ifeq ($(CONFIG_HAVE_ACPI_TABLES),y)
ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c 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)) $(eval $(call asl_template,dsdt))
endif
ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),) ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/fadt.c),)
ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
endif endif

7
src/arch/x86/acpi.c
View File

@ -808,16 +808,9 @@ unsigned long write_acpi_tables(unsigned long start)
if (fw) if (fw)
return 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( dsdt_file = cbfs_boot_map_with_leak(
CONFIG_CBFS_PREFIX "/dsdt.aml", CONFIG_CBFS_PREFIX "/dsdt.aml",
CBFS_TYPE_RAW, &dsdt_size); CBFS_TYPE_RAW, &dsdt_size);
#endif
if (!dsdt_file) { if (!dsdt_file) {
printk(BIOS_ERR, "No DSDT file, skipping ACPI tables\n"); printk(BIOS_ERR, "No DSDT file, skipping ACPI tables\n");
return current; return current;