| From 526c471f3f93c86c79a5a95b3fc6fd8772e79d6f Mon Sep 17 00:00:00 2001 |
| From: Anand K Mistry <amistry@chromium.org> |
| Date: Tue, 10 Aug 2021 10:47:23 +1000 |
| Subject: [PATCH] CHROMIUM: config: Move Intel-specific options to Intel |
| configs |
| |
| CONFIG_PUNIT_ATOM_DEBUG is only used on BayTrail and Braswell systems. |
| CONFIG_ITCO_WDT is used on a variety of Intel systems. |
| |
| BUG=b:194984180 |
| TEST=CQ |
| |
| Change-Id: I9a7353ca654ac2f080965a697a05c155a77545c2 |
| Signed-off-by: Anand K Mistry <amistry@chromium.org> |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3096725 |
| Reviewed-by: Guenter Roeck <groeck@chromium.org> |
| --- |
| chromeos/config/x86_64/chromeos-intel-denverton.flavour.config | 2 ++ |
| chromeos/config/x86_64/chromeos-intel-pineview.flavour.config | 3 +++ |
| chromeos/config/x86_64/common.config | 3 --- |
| 3 files changed, 5 insertions(+), 3 deletions(-) |
| |
| diff --git a/chromeos/config/x86_64/chromeos-intel-denverton.flavour.config b/chromeos/config/x86_64/chromeos-intel-denverton.flavour.config |
| --- a/chromeos/config/x86_64/chromeos-intel-denverton.flavour.config |
| +++ b/chromeos/config/x86_64/chromeos-intel-denverton.flavour.config |
| @@ -23,6 +23,8 @@ CONFIG_INTEL_MENLOW=y |
| CONFIG_INTEL_PMC_CORE=y |
| CONFIG_INTEL_SOC_DTS_THERMAL=y |
| CONFIG_IRQ_REMAP=y |
| +CONFIG_ITCO_VENDOR_SUPPORT=y |
| +CONFIG_ITCO_WDT=y |
| CONFIG_IWLDVM=m |
| CONFIG_IWLMVM=m |
| CONFIG_IWLWIFI=m |
| diff --git a/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config |
| --- a/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config |
| +++ b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config |
| @@ -38,6 +38,8 @@ CONFIG_INTEL_PMT_TELEMETRY=y |
| CONFIG_INTEL_PUNIT_IPC=y |
| CONFIG_INTEL_SCU_PLATFORM=y |
| CONFIG_INTEL_SOC_DTS_THERMAL=y |
| +CONFIG_ITCO_VENDOR_SUPPORT=y |
| +CONFIG_ITCO_WDT=y |
| CONFIG_IWLDVM=m |
| CONFIG_IWLMVM=m |
| CONFIG_IWLWIFI=m |
| @@ -61,6 +63,7 @@ CONFIG_PINCTRL_ICELAKE=y |
| CONFIG_PINCTRL_JASPERLAKE=y |
| CONFIG_PINCTRL_SUNRISEPOINT=y |
| CONFIG_PINCTRL_TIGERLAKE=y |
| +CONFIG_PUNIT_ATOM_DEBUG=y |
| # CONFIG_RT2800PCI_RT33XX is not set |
| # CONFIG_RT2800PCI_RT35XX is not set |
| # CONFIG_RT2800PCI_RT53XX is not set |
| diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config |
| --- a/chromeos/config/x86_64/common.config |
| +++ b/chromeos/config/x86_64/common.config |
| @@ -73,8 +73,6 @@ CONFIG_IIO_CROS_EC_SENSORS_SYNC=m |
| CONFIG_INTEL_RAPL=y |
| CONFIG_INTEL_VBTN=m |
| CONFIG_IO_DELAY_0XED=y |
| -CONFIG_ITCO_VENDOR_SUPPORT=y |
| -CONFIG_ITCO_WDT=y |
| CONFIG_JME=m |
| CONFIG_LEGACY_VSYSCALL_EMULATE=y |
| CONFIG_LPC_ICH=y |
| @@ -103,7 +101,6 @@ CONFIG_PCIEPORTBUS=y |
| CONFIG_PM_TRACE_RTC=y |
| CONFIG_POWERCAP=y |
| CONFIG_PROC_KCORE=y |
| -CONFIG_PUNIT_ATOM_DEBUG=y |
| CONFIG_R8169=m |
| CONFIG_RT2800PCI=m |
| # CONFIG_RTC_HCTOSYS is not set |
| -- |
| 2.33.0.rc2.250.ged5fa647cd-goog |
| |
