diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-06 18:02:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-06 18:02:18 -0400 |
| commit | 879396a2405d394573307adf16763cbe769c35f2 (patch) | |
| tree | 3b716926ea489e676ac45d6ea0147d841134eed4 /configs/socfpga_de1_soc_defconfig | |
| parent | dac51e9aaf6fd38298007b266feb6a80e9ec91ee (diff) | |
| parent | 5bac9c5307642400abc61a7f9ba76ac06a77fcf8 (diff) | |
Merge branch '2019-10-06-master-imports'
- Regression work-around on SoCFPGA by disabling WDT in some cases.
- Fix seg fault on 'host info' in some cases.
Diffstat (limited to 'configs/socfpga_de1_soc_defconfig')
| -rw-r--r-- | configs/socfpga_de1_soc_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index fa2bace56f..efa128ac8e 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -47,4 +47,5 @@ CONFIG_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y +# CONFIG_SPL_WDT is not set # CONFIG_EFI_LOADER is not set |