projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish converting CONFIG_WATCHDOG, HW_WATCHDOG and WDT to Kconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
socfpga_soc64_common.h
diff --git
a/include/configs/socfpga_soc64_common.h
b/include/configs/socfpga_soc64_common.h
index
4a0235d
..
928582a
100644
(file)
--- a/
include/configs/socfpga_soc64_common.h
+++ b/
include/configs/socfpga_soc64_common.h
@@
-59,10
+59,7
@@
/* Flash device info */
/* Flash device info */
-/*#define CONFIG_ENV_IS_IN_SPI_FLASH*/
-
#ifndef CONFIG_SPL_BUILD
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_MTD_PARTITIONS
#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"
#endif /* CONFIG_SPL_BUILD */
#define MTDIDS_DEFAULT "nor0=ff705000.spi.0"
#endif /* CONFIG_SPL_BUILD */
@@
-150,7
+147,6
@@
unsigned int cm_get_qspi_controller_clk_hz(void);
* L4 Watchdog
*/
#ifndef CONFIG_SPL_BUILD
* L4 Watchdog
*/
#ifndef CONFIG_SPL_BUILD
-#undef CONFIG_HW_WATCHDOG
#undef CONFIG_DESIGNWARE_WATCHDOG
#endif
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#undef CONFIG_DESIGNWARE_WATCHDOG
#endif
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS