Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / configs / edison_defconfig

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index cccf1cca6f7e11b829c299ec327faf384c4f5ce2..ffb555463453813243956e909b2d5e1aaf370bdf 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -3,13 +3,14 @@ CONFIG_SYS_TEXT_BASE=0x1101000
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x300000
 CONFIG_NR_DRAM_BANKS=3
+CONFIG_ENV_OFFSET_REDUND=0x600000
 CONFIG_VENDOR_INTEL=y
 CONFIG_TARGET_EDISON=y
 CONFIG_SMP=y
+CONFIG_GENERATE_ACPI_TABLE=y
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
-# CONFIG_CMDLINE_EDITING is not set
 CONFIG_CMD_CPU=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
@@ -30,9 +31,9 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_DEFAULT_DEVICE_TREE="edison"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_OFFSET_REDUND=0x600000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_CPU=y
+CONFIG_DFU_TIMEOUT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_SUPPORT_EMMC_BOOT=y