x86: Tidy up use of CONFIG_ACPIGEN

This is enabled for quite a few boards which don't create ACPI tables.
Tidy this up by dropping the option for some boards.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index c9608cd62e3ef894f83221c2c2443a6382621625..c5dd7fcaf73731fc22bf2f3b88656b262f509d63 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -257,7 +257,7 @@ config X86
        imply PCH
        imply PHYSMEM
        imply RTC_MC146818
-       imply ACPIGEN if !QEMU
+       imply ACPIGEN if !QEMU && !EFI_APP
        imply SYSINFO if GENERATE_SMBIOS_TABLE
        imply SYSINFO_SMBIOS if GENERATE_SMBIOS_TABLE
        imply TIMESTAMP

diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig
index 73120b5b423cf07df1f3026ea1c8ccce56e35b63..7bfbcf650ae51aebd67bfa37820afba48b118c16 100644 (file)
--- a/configs/cherryhill_defconfig
+++ b/configs/cherryhill_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 CONFIG_CPU=y
 CONFIG_RTL8169=y
 CONFIG_SPI=y

diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index 7059be847741ecc56e87257b464e13eb2a6c7b4f..a57543734257bd53cc547cc9b8fc8a0878a0b327 100644 (file)
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -64,6 +64,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index a6efb191f643a06f3608b53c901b543955e88b72..4bb52b6ae55b120f86086cbe2843021589dc0584 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -55,6 +55,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y

diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig
index e35ef474a376614948e947ec9638654528da0ec9..6839d8c151ad9d6b6a1c1303c8743c8e6516c668 100644 (file)
--- a/configs/chromebook_samus_tpl_defconfig
+++ b/configs/chromebook_samus_tpl_defconfig
@@ -74,6 +74,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y

diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig
index 8146569a9d038c9163e737d33e3d4fbfb49ddf30..8b88a08b0883cabb5aa374347e90f3a28c821c55 100644 (file)
--- a/configs/coreboot64_defconfig
+++ b/configs/coreboot64_defconfig
@@ -46,6 +46,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 # CONFIG_PCI_PNP is not set
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y

diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
index a12e4cd41264579af64edd1b4defb49b0e362957..621b736fed68674eb6de62bfd7ba79ea31a343e4 100644 (file)
--- a/configs/coreboot_defconfig
+++ b/configs/coreboot_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 # CONFIG_PCI_PNP is not set
 CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y

diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 650d7686cf23c676fddecb8e4aadbde8a36ac61a..f7dc932684446b788bd096492c6d22f4b21429d7 100644 (file)
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -48,6 +48,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 CONFIG_CPU=y
 CONFIG_E1000=y
 CONFIG_SOUND=y

diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig
index d7be9579cce7b7822f4c323ec501f85d3dc6fa76..ed6fed25555ba095d00fde810eee7fc1e84196c0 100644 (file)
--- a/configs/efi-x86_payload32_defconfig
+++ b/configs/efi-x86_payload32_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 # CONFIG_PCI_PNP is not set
 # CONFIG_GZIP is not set
 CONFIG_EFI=y

diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
index 36dd0647c23d658e6dfe99af9fa8c8c696f744c9..1d4d1f3108dc6896c4f5262992fae0cd49a7a0d4 100644 (file)
--- a/configs/efi-x86_payload64_defconfig
+++ b/configs/efi-x86_payload64_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 # CONFIG_PCI_PNP is not set
 # CONFIG_GZIP is not set
 CONFIG_EFI=y

diff --git a/configs/slimbootloader_defconfig b/configs/slimbootloader_defconfig
index fb2091bd59aa54bdbf8b22a97e4b1e7f84c1fcc8..1597616038f169ff1a05ae55550ec9dcb023ffb1 100644 (file)
--- a/configs/slimbootloader_defconfig
+++ b/configs/slimbootloader_defconfig
@@ -23,6 +23,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+# CONFIG_ACPIGEN is not set
 # CONFIG_PCI_PNP is not set
 CONFIG_CONSOLE_SCROLL_LINES=5
 # CONFIG_GZIP is not set