diff options
| author | Brian Wood <brian.j.wood@intel.com> | 2015-09-30 13:34:46 -0700 |
|---|---|---|
| committer | Brian Wood <brian.j.wood@intel.com> | 2015-09-30 16:43:02 -0700 |
| commit | 03d203d5ff5307e20811805983d96c208accad99 (patch) | |
| tree | b85a66276ac5fa951591e01ab68e732b963527ed | |
| parent | 793580532012ec4a2c79a2b5397508dfef4cd7ef (diff) | |
| download | edison-v3.10-03d203d5ff5307e20811805983d96c208accad99.tar.gz | |
Enable upstream Intel MID watchdog driver
This commit enables the upstream Intel MID
watchdog driver and disables the Intel SCU
EVO watchdog driver. This enablement allows
for the proper setup/use of the Linux userspace
daemon.
Change-Id: Icd785c837ed3174aa6f0fb611b48c693fe9d738f
Signed-off-by: Brian Wood <brian.j.wood@intel.com>
| -rw-r--r-- | arch/x86/configs/i386_brillo_edison_defconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/configs/i386_brillo_edison_defconfig b/arch/x86/configs/i386_brillo_edison_defconfig index 04e60074e8f..6250e324514 100644 --- a/arch/x86/configs/i386_brillo_edison_defconfig +++ b/arch/x86/configs/i386_brillo_edison_defconfig @@ -1095,6 +1095,8 @@ CONFIG_EMMC_IPANIC_PLABEL="panic" # Altera FPGA firmware download module # # CONFIG_ALTERA_STAPL is not set +# CONFIG_INTEL_MEI is not set +# CONFIG_INTEL_MEI_ME is not set # CONFIG_VMWARE_VMCI is not set CONFIG_BCM_BT_LPM=y CONFIG_HAVE_IDE=y @@ -1883,7 +1885,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_SENSORS_THERMAL_MRFLD=y CONFIG_SOC_THERMAL=y CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set # @@ -1905,8 +1907,8 @@ CONFIG_WATCHDOG=y # CONFIG_I6300ESB_WDT is not set # CONFIG_IE6XX_WDT is not set # CONFIG_INTEL_SCU_WATCHDOG is not set -CONFIG_INTEL_SCU_WATCHDOG_EVO=y -CONFIG_DISABLE_SCU_WATCHDOG=y +# CONFIG_INTEL_SCU_WATCHDOG_EVO is not set +CONFIG_INTEL_MID_WATCHDOG=y # CONFIG_ITCO_WDT is not set # CONFIG_IT8712F_WDT is not set # CONFIG_IT87_WDT is not set |