From d696fa69877ce3b2f63ee7ee85a94d872e8ae144 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Tue, 1 Apr 2025 16:28:03 +0200 Subject: [PATCH] Revert "acpi,Makefile: Add preload_acpi_dsdt" This reverts commit 6b446b991b00c44902b70d86c75b23a8f93d510b. Reason for revert: This effort was apparently given up on since 4 years. So remove the function, since it is not used at the moment. If someone wants to bring that effort back to live, said person can feel free to do so. Change-Id: Ifa1ca58c8bf6aabb5b291d3244b1a1a0a7aec6c7 Signed-off-by: Maximilian Brune Reviewed-on: https://review.coreboot.org/c/coreboot/+/87065 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- Makefile.mk | 3 --- src/acpi/acpi.c | 11 ----------- src/include/acpi/acpi.h | 1 - 3 files changed, 15 deletions(-) diff --git a/Makefile.mk b/Makefile.mk index 576cebd904..3969bfbd05 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -306,9 +306,6 @@ define asl_template $(CONFIG_CBFS_PREFIX)/$(1).aml-file = $(obj)/$(1).aml $(CONFIG_CBFS_PREFIX)/$(1).aml-type = raw $(CONFIG_CBFS_PREFIX)/$(1).aml-compression = none -ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_LPC_SPI_DMA),y) -$(CONFIG_CBFS_PREFIX)/$(1).aml-align = 64 -endif cbfs-files-$(if $(2),$(2),y) += $(CONFIG_CBFS_PREFIX)/$(1).aml $(eval DEPENDENCIES += $(obj)/$(1).d) $(obj)/$(1).aml: $(src)/mainboard/$(MAINBOARDDIR)/$(1).asl $(obj)/config.h diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 06879540bf..6c463c93d4 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -1349,17 +1349,6 @@ unsigned long __weak fw_cfg_acpi_tables(unsigned long start) return 0; } -void preload_acpi_dsdt(void) -{ - const char *file = CONFIG_CBFS_PREFIX "/dsdt.aml"; - - if (!CONFIG(CBFS_PRELOAD)) - return; - - printk(BIOS_DEBUG, "Preloading %s\n", file); - cbfs_preload(file); -} - static void acpi_create_dsdt(acpi_header_t *header, void *dsdt_file_arg) { dsdt = header; diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index 604c60dad0..3b0aa626e2 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -1739,7 +1739,6 @@ void acpi_create_einj(acpi_einj_t *einj, uintptr_t addr, u8 actions); unsigned long fw_cfg_acpi_tables(unsigned long start); /* These are implemented by the target port or north/southbridge. */ -void preload_acpi_dsdt(void); unsigned long write_acpi_tables(const unsigned long addr); unsigned long acpi_fill_madt(unsigned long current); unsigned long acpi_arch_fill_madt(acpi_madt_t *madt, unsigned long current);