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 /include | |
| 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 'include')
| -rw-r--r-- | include/configs/socfpga_common.h | 3 | ||||
| -rw-r--r-- | include/configs/socfpga_soc64_common.h | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 05bfef7..8d10469 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -104,11 +104,8 @@ /* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#endif /* * MMC Driver diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 4afadaf..87c7345 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -150,9 +150,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* * L4 Watchdog */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#ifndef CONFIG_SPL_BUILD +#undef CONFIG_HW_WATCHDOG +#undef CONFIG_DESIGNWARE_WATCHDOG +#endif #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__ @@ -162,7 +163,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); #else #define CONFIG_DW_WDT_CLOCK_KHZ 100000 #endif -#endif /* * SPL memory layout |