From 7802ce910ba17a962d90b60b5e998e40d5a08067 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 13 Jun 2016 09:45:14 -0400 Subject: configs: Re-sync BOOTDELAY changes With updated moveconfig.py and an better default, re-generate the migration of BOOTDELAY to the defconfig. Reviewed-by: Hans de Goede Signed-off-by: Tom Rini --- configs/ge_b650v3_defconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'configs/ge_b650v3_defconfig') diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index 2af4b119c4..c5f391edb5 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -1,6 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_GE_B650V3=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_BOOTDELAY=1 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -8,18 +10,16 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y -CONFIG_CMD_FPGA=n +# CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y -CONFIG_CMD_NET=n -CONFIG_CMD_NFS=n +# CONFIG_CMD_NET is not set +# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=n CONFIG_CMD_FS_GENERIC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_OF_LIBFDT=y -CONFIG_SYS_MALLOC_CLEAR_ON_INIT=n -CONFIG_EFI_LOADER=n +# CONFIG_EFI_LOADER is not set -- cgit v1.2.1