Finish converting CONFIG_WATCHDOG, HW_WATCHDOG and WDT to Kconfig

[platform/kernel/u-boot.git] / board / liebherr / display5 / spl.c

diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index b8658c8..5c1af1a 100644 (file)
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -273,7 +273,7 @@ static void spl_dram_init(void)
 #endif
 }
 
-#ifdef CONFIG_SPL_SPI_SUPPORT
+#ifdef CONFIG_SPL_SPI
 static void displ5_init_ecspi(void)
 {
        displ5_set_iomux_ecspi_spl();
@@ -283,7 +283,7 @@ static void displ5_init_ecspi(void)
 static inline void displ5_init_ecspi(void) { }
 #endif
 
-#ifdef CONFIG_SPL_MMC_SUPPORT
+#ifdef CONFIG_SPL_MMC
 static struct fsl_esdhc_cfg usdhc_cfg = {
        .esdhc_base = USDHC4_BASE_ADDR,
        .max_bus_width = 8,
@@ -327,8 +327,10 @@ void board_init_f(ulong dummy)
        displ5_set_iomux_misc_spl();
 
        /* Initialize and reset WDT in SPL */
+#ifdef CONFIG_SPL_WATCHDOG
        hw_watchdog_init();
        WATCHDOG_RESET();
+#endif
 
        /* load/boot image from boot device */
        board_init_r(NULL, 0);
@@ -376,7 +378,7 @@ void board_boot_order(u32 *spl_boot_list)
 #endif
 }
 
-void reset_cpu(ulong addr) {}
+void reset_cpu(void) {}
 
 #ifdef CONFIG_SPL_LOAD_FIT
 int board_fit_config_name_match(const char *name)