mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Gen 5 and Watchdog fixes
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user