From 187809517da0f488f6f2069543783cf2923abb23 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 7 Dec 2016 22:10:25 +0900 Subject: Sync defconfig files by savedefconfig Generated by "tools/moveconfig -s". This will make config moves easier. Signed-off-by: Masahiro Yamada --- configs/imx6dl_icore_nand_defconfig | 44 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 25 deletions(-) (limited to 'configs/imx6dl_icore_nand_defconfig') diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index af3a9f8225b..16d9d2d2e8d 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -1,42 +1,36 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_MX6Q_ICORE=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_VIDEO=y +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND" +CONFIG_BOOTDELAY=3 CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb" -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" -CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SPL=y -CONFIG_BOOTDELAY=3 -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_DISPLAY_CPUINFO=y +CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y -CONFIG_AUTO_COMPLETE=y -CONFIG_SYS_MAXARGS=32 -# CONFIG_CMD_IMLS is not set +CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_CMD_BOOTZ=y -CONFIG_CMD_GPIO=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_CMD_GPIO=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_LIBFDT=y -CONFIG_FEC_MXC=y -CONFIG_MXC_UART=y -CONFIG_NAND_MXS=y -CONFIG_IMX_THERMAL=y # CONFIG_BLK is not set +CONFIG_SYS_I2C_MXC=y # CONFIG_DM_MMC_OPS is not set +CONFIG_NAND_MXS=y +CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y -CONFIG_SYS_I2C_MXC=y -CONFIG_VIDEO=y +CONFIG_MXC_UART=y +CONFIG_IMX_THERMAL=y CONFIG_VIDEO_IPUV3=y -CONFIG_SYS_CONSOLE_IS_IN_ENV=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_GPIO_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_DMA_SUPPORT=y -- cgit v1.2.3