[PATCH linux dev-5.1] ARM: config: npcm7xx: Refresh and add EDAC

[Joel Stanley]

This regenerates the defconfig on a 5.1 kernel tree, and adds the newly
merged EDAC driver to the configuration.

Signed-off-by: Joel Stanley <joel at jms.id.au>
---
 arch/arm/configs/npcm7xx_defconfig | 42 +++++++++++++-----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/arch/arm/configs/npcm7xx_defconfig b/arch/arm/configs/npcm7xx_defconfig
index 62aaffdba4dd..7577a53847b4 100644
--- a/arch/arm/configs/npcm7xx_defconfig
+++ b/arch/arm/configs/npcm7xx_defconfig
@@ -9,16 +9,16 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_DEFAULT_DEADLINE=y
 CONFIG_ARCH_NPCM=y
 CONFIG_ARCH_NPCM7XX=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_3G_OPT=y
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_CRYPTO=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_PARTITION_ADVANCED=y
 CONFIG_BINFMT_MISC=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -53,8 +53,6 @@ CONFIG_BROADCOM_PHY=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_NPCM750_OTP=y
-CONFIG_NPCM750_OTP_WRITE_ENABLE=y
 CONFIG_NPCM7XX_KCS_IPMI_BMC=y
 CONFIG_HW_RANDOM=y
 CONFIG_I2C=y
@@ -67,12 +65,12 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_NPCM7XX=y
+CONFIG_SENSORS_PECI_CPUTEMP=y
+CONFIG_SENSORS_PECI_DIMMTEMP=y
 CONFIG_SENSORS_TMP102=y
 CONFIG_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_NPCM750_VCD=y
-CONFIG_NPCM750_ECE=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -83,18 +81,21 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_NPCMX50_USB2=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_EDM_KBD_MOUSE=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_NPCM750=y
+CONFIG_EDAC=y
+# CONFIG_EDAC_LEGACY_SYSFS is not set
+CONFIG_EDAC_NPCM7XX=y
 CONFIG_IIO=y
 CONFIG_NPCM_ADC=y
 CONFIG_IIO_MUX=y
+CONFIG_RAS=y
 CONFIG_MUX_MMIO=y
+CONFIG_PECI=y
+CONFIG_PECI_NPCM=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
@@ -106,6 +107,11 @@ CONFIG_CIFS_XATTR=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_REDUCED=y
@@ -113,15 +119,3 @@ CONFIG_READABLE_ASM=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_FUNCTION_TRACER=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_DEV_NPCMX50=y
-CONFIG_ARM_CRYPTO=y
-CONFIG_PECI=y
-CONFIG_PECI_NPCM=y
-CONFIG_MFD_INTEL_PECI_CLIENT=y
-CONFIG_SENSORS_PECI_CPUTEMP=y
-CONFIG_SENSORS_PECI_DIMMTEMP=y
-- 
2.20.1