| From 4150c0e3ee8e495c85c918a99a0c68f7d587ac1c Mon Sep 17 00:00:00 2001 |
| From: Nicholas Bishop <nicholasbishop@google.com> |
| Date: Tue, 21 Sep 2021 11:25:38 -0400 |
| Subject: [PATCH] CHROMIUM: config: Normalize configs |
| |
| Run in the chroot: |
| ../third_party/kernel/v5.10/chromeos/scripts/kernelconfig olddefconfig |
| |
| BUG=None |
| TEST=Build test, and checked that the change is just configs being moved |
| |
| Change-Id: Icc70566ae64b05a4509563b2566a6a20d844db1e |
| Signed-off-by: Nicholas Bishop <nicholasbishop@google.com> |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3173531 |
| Reviewed-by: Daniel Winkler <danielwinkler@google.com> |
| --- |
| .../config/x86_64/chromeos-intel-pineview.flavour.config | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| 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,12 +38,12 @@ CONFIG_INTEL_PMT_TELEMETRY=y |
| CONFIG_INTEL_PUNIT_IPC=y |
| CONFIG_INTEL_SCU_PLATFORM=y |
| CONFIG_INTEL_SOC_DTS_THERMAL=y |
| +CONFIG_INTEL_TURBO_MAX_3=y |
| CONFIG_ITCO_VENDOR_SUPPORT=y |
| CONFIG_ITCO_WDT=y |
| CONFIG_IWLDVM=m |
| CONFIG_IWLMVM=m |
| CONFIG_IWLWIFI=m |
| -CONFIG_INTEL_TURBO_MAX_3=y |
| CONFIG_KEYBOARD_GPIO=y |
| CONFIG_MFD_INTEL_LPSS_ACPI=y |
| CONFIG_MFD_INTEL_LPSS_PCI=y |
| @@ -51,8 +51,8 @@ CONFIG_MFD_INTEL_PMT=y |
| CONFIG_MFD_TPS68470=y |
| CONFIG_MISC_RTSX_PCI=m |
| CONFIG_MMC_REALTEK_PCI=m |
| -CONFIG_MTK_T7XX=m |
| # CONFIG_MOUSE_PS2_TRACKPOINT is not set |
| +CONFIG_MTK_T7XX=m |
| CONFIG_NR_CPUS=24 |
| CONFIG_PCI_MSI=y |
| CONFIG_PHYLIB=y |
| @@ -132,6 +132,7 @@ CONFIG_USB4_DMA_TEST=m |
| CONFIG_USB4_NET=m |
| CONFIG_VIDEO_DW9714=m |
| CONFIG_VIDEO_DW9768=m |
| +CONFIG_VIDEO_HI556=m |
| CONFIG_VIDEO_IMX208=m |
| CONFIG_VIDEO_INTEL_IPU6=m |
| CONFIG_VIDEO_IPU3_CIO2=m |
| @@ -142,7 +143,6 @@ CONFIG_VIDEO_OV5670=m |
| CONFIG_VIDEO_OV5675=m |
| CONFIG_VIDEO_OV8856=m |
| CONFIG_VIDEO_OV9734=m |
| -CONFIG_VIDEO_HI556=m |
| CONFIG_WILCO_EC=m |
| CONFIG_WILCO_EC_CHARGE_SCHEDULE=m |
| CONFIG_WILCO_EC_DEBUGFS=m |
| -- |
| 2.33.0.685.g46640cef36-goog |
| |
