···11+diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
22+index 48398b4..0e37f7d 100644
33+--- a/drivers/base/Kconfig
44++++ b/drivers/base/Kconfig
55+@@ -198,30 +198,6 @@ config DEV_COREDUMP
66+ default y if WANT_DEV_COREDUMP
77+ depends on ALLOW_DEV_COREDUMP
88+99+-config WANT_DEV_COREDUMP
1010+- bool
1111+- help
1212+- Drivers should "select" this option if they desire to use the
1313+- device coredump mechanism.
1414+-
1515+-config ALLOW_DEV_COREDUMP
1616+- bool "Allow device coredump" if EXPERT
1717+- default y
1818+- help
1919+- This option controls if the device coredump mechanism is available or
2020+- not; if disabled, the mechanism will be omitted even if drivers that
2121+- can use it are enabled.
2222+- Say 'N' for more sensitive systems or systems that don't want
2323+- to ever access the information to not have the code, nor keep any
2424+- data.
2525+-
2626+- If unsure, say Y.
2727+-
2828+-config DEV_COREDUMP
2929+- bool
3030+- default y if WANT_DEV_COREDUMP
3131+- depends on ALLOW_DEV_COREDUMP
3232+-
3333+ config DEBUG_DRIVER
3434+ bool "Driver Core verbose debug messages"
3535+ depends on DEBUG_KERNEL
3636+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
3737+index 58154a9..53a0d73 100644
3838+--- a/drivers/mfd/Kconfig
3939++++ b/drivers/mfd/Kconfig
4040+@@ -81,7 +81,7 @@ config MFD_AXP20X
4141+4242+ config MFD_CROS_EC
4343+ tristate "Support ChromeOS Embedded Controller"
4444+- depends on MFD_CORE
4545++ select MFD_CORE
4646+ help
4747+ If you say Y here you get support for the ChromeOS Embedded
4848+ Controller (EC) providing keyboard, battery and power services.
···147147148148 # Video configuration.
149149 # Enable KMS for devices whose X.org driver supports it.
150150- ${optionalString (versionOlder version "4.3") ''
150150+ ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
151151 DRM_I915_KMS y
152152 ''}
153153 # Allow specifying custom EDID on the kernel command line
···502502503503 # Disable the firmware helper fallback, udev doesn't implement it any more
504504 FW_LOADER_USER_HELPER_FALLBACK? n
505505+506506+ # ChromiumOS support
507507+ ${optionalString (features.chromiumos or false) ''
508508+ CHROME_PLATFORMS y
509509+ VGA_SWITCHEROO n
510510+ MMC_SDHCI_PXAV2 n
511511+ NET_IPVTI n
512512+ IPV6_VTI n
513513+ REGULATOR_FIXED_VOLTAGE n
514514+ TPS6105X n
515515+ CPU_FREQ_STAT y
516516+ IPV6 y
517517+ MFD_CROS_EC y
518518+ MFD_CROS_EC_LPC y
519519+ MFD_CROS_EC_DEV y
520520+ CHARGER_CROS_USB_PD y
521521+ I2C y
522522+ MEDIA_SUBDRV_AUTOSELECT n
523523+ VIDEO_IR_I2C n
524524+ BLK_DEV_DM y
525525+ ANDROID_PARANOID_NETWORK n
526526+ DM_VERITY n
527527+ DRM_VGEM n
528528+ CPU_FREQ_GOV_INTERACTIVE n
529529+ INPUT_KEYRESET n
530530+ DM_BOOTCACHE n
531531+ UID_CPUTIME n
532532+533533+ ${optionalString (versionAtLeast version "3.18") ''
534534+ CPUFREQ_DT n
535535+ EXTCON_CROS_EC n
536536+ DRM_POWERVR_ROGUE n
537537+ CHROMEOS_OF_FIRMWARE y
538538+ TEST_RHASHTABLE n
539539+ BCMDHD n
540540+ TRUSTY n
541541+ ''}
542542+543543+ ${optionalString (versionOlder version "3.18") ''
544544+ MALI_MIDGARD n
545545+ DVB_USB_DIB0700 n
546546+ DVB_USB_DW2102 n
547547+ DVB_USB_PCTV452E n
548548+ DVB_USB_TTUSB2 n
549549+ DVB_USB_AF9015 n
550550+ DVB_USB_AF9035 n
551551+ DVB_USB_ANYSEE n
552552+ DVB_USB_AZ6007 n
553553+ DVB_USB_IT913X n
554554+ DVB_USB_LME2510 n
555555+ DVB_USB_RTL28XXU n
556556+ USB_S2255 n
557557+ VIDEO_EM28XX n
558558+ VIDEO_TM6000 n
559559+ USB_DWC2 n
560560+ USB_GSPCA n
561561+ SPEAKUP n
562562+ XO15_EBOOK n
563563+ USB_GADGET n
564564+ ''}
565565+ ''}
505566506567 ${kernelPlatform.kernelExtraConfig or ""}
507568 ${extraConfig}