summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2020-04-30 14:30:31 -0700
committerFelix Held <felix-coreboot@felixheld.de>2020-05-02 12:09:51 +0000
commita268aac9e5b79dcd96ab3411413f4385bfecfe5e (patch)
treeb8531338553b838cf5679bf17013b7342ca30210 /src
parent50c1f27069535beedc6ee36232a3ebab35b5c625 (diff)
downloadcoreboot-a268aac9e5b79dcd96ab3411413f4385bfecfe5e.tar.xz
src/acpi: Drop Kconfig option ACPI_SATA_GENERATOR
ACPI_SATA_GENERATOR is currently used to include sata.c in ramstage. However, there is no need to guard this inclusion using a separate Kconfig. All other files that deal with ACPI tables are included based on the state of HAVE_ACPI_TABLES. This change includes sata.c in ramstage if HAVE_ACPI_TABLES is selected. If the ACPI function isn't used, linker will optimize it out. BUG=b:155428745 Change-Id: I9a319cfe7c3f973b15ccbd0f13bd1ed07571a398 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40928 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/acpi/Kconfig6
-rw-r--r--src/acpi/Makefile.inc2
-rw-r--r--src/southbridge/intel/bd82x6x/Kconfig1
-rw-r--r--src/southbridge/intel/ibexpeak/Kconfig1
4 files changed, 1 insertions, 9 deletions
diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig
index 3c6aeb1a18..8c8bb87884 100644
--- a/src/acpi/Kconfig
+++ b/src/acpi/Kconfig
@@ -1,12 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
# This file is part of the coreboot project.
-config ACPI_SATA_GENERATOR
- bool
- default n
- help
- Use ACPI SATA port generator.
-
config ACPI_INTEL_HARDWARE_SLEEP_VALUES
def_bool n
help
diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc
index 7c2092d5f5..e99110ec24 100644
--- a/src/acpi/Makefile.inc
+++ b/src/acpi/Makefile.inc
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
# This file is part of the coreboot project.
-ramstage-$(CONFIG_ACPI_SATA_GENERATOR) += sata.c
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += sata.c
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index 534d110e70..b6478aedca 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -27,7 +27,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select PCIEXP_ASPM
select PCIEXP_COMMON_CLOCK
select COMMON_FADT
- select ACPI_SATA_GENERATOR
select INTEL_DESCRIPTOR_MODE_CAPABLE
select SOUTHBRIDGE_INTEL_COMMON_GPIO
select RTC
diff --git a/src/southbridge/intel/ibexpeak/Kconfig b/src/southbridge/intel/ibexpeak/Kconfig
index 2b59134ae2..856dc61487 100644
--- a/src/southbridge/intel/ibexpeak/Kconfig
+++ b/src/southbridge/intel/ibexpeak/Kconfig
@@ -36,7 +36,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select SOUTHBRIDGE_INTEL_COMMON_RESET
select HAVE_USBDEBUG_OPTIONS
select COMMON_FADT
- select ACPI_SATA_GENERATOR
select INTEL_DESCRIPTOR_MODE_CAPABLE
select SOUTHBRIDGE_INTEL_COMMON_GPIO
select HAVE_INTEL_CHIPSET_LOCKDOWN