From e697fd9ecb6fe09775e87226099f85c02d3d3074 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 18 Jan 2021 15:10:43 +0100 Subject: [PATCH] soc/amd/picasso: move HAVE_ACPI_TABLES from mainboards to SoC The SoC code has in implicit dependency on this option, so select it in the SoC code instead of the mainboard code. Change-Id: Iea908c142f4a94a107cf74a31d9f5e29668d4b5b Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/49667 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/amd/mandolin/Kconfig | 1 - src/mainboard/google/zork/Kconfig | 1 - src/soc/amd/picasso/Kconfig | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig index c1d68fa58b..7c9387a144 100644 --- a/src/mainboard/amd/mandolin/Kconfig +++ b/src/mainboard/amd/mandolin/Kconfig @@ -6,7 +6,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_PICASSO - select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_8192 if BOARD_AMD_MANDOLIN select BOARD_ROMSIZE_KB_16384 if BOARD_AMD_CEREME select AZALIA_PLUGIN_SUPPORT diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 88d6e97651..4fce3b8616 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS select ELOG select ELOG_BOOT_COUNT select ELOG_GSMI - select HAVE_ACPI_TABLES select GFXUMA select GOOGLE_SMBIOS_MAINBOARD_VERSION select MAINBOARD_HAS_CHROMEOS diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index c004278d5e..d3c0ef735c 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -23,6 +23,7 @@ config CPU_SPECIFIC_OPTIONS select GENERIC_GPIO_LIB select IDT_IN_EVERY_STAGE select IOAPIC + select HAVE_ACPI_TABLES select HAVE_EM100_SUPPORT select HAVE_USBDEBUG_OPTIONS select SOC_AMD_COMMON_BLOCK_SPI