diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-22 12:09:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-22 12:09:33 -0400 |
| commit | 5eea874b5e989e62519824ad140aa086432d01ee (patch) | |
| tree | 0d6a3538406d23917874a9087c896b7ff809d91c /configs | |
| parent | bdf97b5d393fc94666a847e9bac1c358b2c63c59 (diff) | |
| parent | c974a3d1550557f246c98480083651c0a502e7e7 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- boot failure fix for Intel edison
- tangier wdt conversion to driver model
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/edison_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/edison_defconfig b/configs/edison_defconfig index 840c87ac5a..468754493e 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -39,5 +39,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x8087 CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99 CONFIG_USB_GADGET_DOWNLOAD=y # CONFIG_USB_HOST_ETHER is not set +CONFIG_WDT=y +CONFIG_WDT_TANGIER=y CONFIG_FAT_WRITE=y CONFIG_SHA1=y |