diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-06 23:18:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-06 23:18:42 -0500 |
| commit | 457faef262c5c9533c344f25eafb10e757149a34 (patch) | |
| tree | 9c1b2e777e37d997410b5f4e97b883fa0bb2ad7d /configs | |
| parent | 8a6ffeda97dfda5263ef40e1a4efb25b032ce04c (diff) | |
| parent | 9a5a90ad9b3234c4739427cbe11219c51f0e9bd1 (diff) | |
| download | u-boot-457faef262c5c9533c344f25eafb10e757149a34.zip u-boot-457faef262c5c9533c344f25eafb10e757149a34.tar.gz u-boot-457faef262c5c9533c344f25eafb10e757149a34.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Gen 5 and Watchdog fixes
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/socfpga_stratix10_defconfig | 2 | ||||
| -rw-r--r-- | configs/socfpga_vining_fpga_defconfig | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index c7286d5..26db40f 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -58,4 +58,6 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_DESIGNWARE_WATCHDOG=y +CONFIG_WDT=y # CONFIG_SPL_USE_TINY_PRINTF is not set diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 5b2801b..0dcae81 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -96,4 +96,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y -# CONFIG_SPL_WDT is not set +CONFIG_DESIGNWARE_WATCHDOG=y +CONFIG_WDT=y |