From 0be2ecd4861faa410491170e205488f9ee82a227 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 7 Nov 2019 14:25:00 -0500 Subject: configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- configs/display5_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'configs/display5_defconfig') diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 91b369532d..7169b334ab 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -48,7 +48,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y # CONFIG_CMD_PINMUX is not set -CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y @@ -88,7 +87,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD_DEVICE=y CONFIG_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y CONFIG_SF_DEFAULT_BUS=1 CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=50000000 @@ -109,8 +107,8 @@ CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_MXC_SPI=y -CONFIG_WATCHDOG_TIMEOUT_MSECS=15000 CONFIG_SYSRESET=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_I2C_EDID=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=15000 CONFIG_IMX_WATCHDOG=y -- cgit v1.2.1