commit d1e4967b8c6fb26363f0a1fb6857bda47ad3fbed
author Tzung-Bi Shih <tzungbi@chromium.org> Tue Apr 23 15:01:22 2024 +0800
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 25 02:22:10 2024 +0000
tree 91dea3abdb4623cc0b4440d71a74c98991520622
parent a2ef81e428a034da2582a3895bbec2e312a262d3

CHROMIUM: config: replace ACPI_CHROMEOS by CHROMEOS_ACPI

Reland https://crrev.com/c/4777030:
    "chromeos_acpi" has upsteram version.  Let's use it.

    Also set NVRAM as ACPI_CHROMEOS selects NVRAM in
    drivers/platform/x86/Kconfig.

This is:
$ cat >>chromeos/config/chromeos/x86_64/common.config <<EOF
CONFIG_ACPI_CHROMEOS=n
CONFIG_CHROMEOS_ACPI=y
CONFIG_NVRAM=y
EOF
(chroot) $ ./chromeos/scripts/kernelconfig olddefconfig

BUG=b:291036452
TEST=emerge-zork chromeos-kernel-5_4 &&
     ls /sys/devices/platform/GOOG0016:00/

Change-Id: I5278224d64f972f5aca35e997768f6bdfa5be61e
Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/5473731
Reviewed-by: Guenter Roeck <groeck@chromium.org>

chromeos/config/chromeos/x86_64/common.config

diff --git a/chromeos/config/chromeos/x86_64/common.config b/chromeos/config/chromeos/x86_64/common.config
index 500000e..b05e10d 100644
--- a/chromeos/config/chromeos/x86_64/common.config
+++ b/chromeos/config/chromeos/x86_64/common.config
@@ -3,7 +3,6 @@
 #
 CONFIG_ACPI_ALS=m
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_CHROMEOS=y
 CONFIG_ACPI_DOCK=y
 CONFIG_AGP=y
 CONFIG_ALT_SYSCALL=y
@@ -26,6 +25,7 @@
 CONFIG_BT_ATH3K=m
 CONFIG_BT_HCIBCM203X=m
 CONFIG_CHARGER_CROS_USBPD=y
+CONFIG_CHROMEOS_ACPI=y
 CONFIG_CHROMEOS_LAPTOP=y
 CONFIG_CHROMEOS_PSTORE=y
 CONFIG_CHROMEOS_TBMC=y
@@ -111,6 +111,7 @@
 # CONFIG_MOUSE_PS2_SYNAPTICS is not set
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_MWIFIEX_PCIE=m
+CONFIG_NVRAM=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCSPKR_PLATFORM is not set