summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-01-09 08:51:57 -0500
committerTom Rini <trini@konsulko.com>2020-01-09 08:51:57 -0500
commita74a2134b245d19a999c796d29285597a22954ed (patch)
tree0838cf4adc01fe969bbcf7dc53d41611546429a2 /configs
parent7086de4948ba2bc46cdd3001f7d845535f05f7fe (diff)
parent3a117e721cc5b4a366dbd5fbbf8df0a80cbb0fa2 (diff)
downloadu-boot-a74a2134b245d19a999c796d29285597a22954ed.tar.gz
u-boot-a74a2134b245d19a999c796d29285597a22954ed.tar.xz
u-boot-a74a2134b245d19a999c796d29285597a22954ed.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
- DFU updates
Diffstat (limited to 'configs')
-rw-r--r--configs/edison_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index cccf1cca6f..14b2eec3ba 100644
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -33,6 +33,7 @@ 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