mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 09:48:16 +00:00
6912f2a8ae
This patch disables DM watchdog support for SPL builds and uses the legacy omap watchdog driver on TI AM335x chipsets. The following build error is reported if DM watchdog support was enabled in SPL: CC spl/drivers/usb/gadget/rndis.o LD spl/drivers/usb/gadget/built-in.o LD spl/drivers/usb/musb-new/built-in.o LD spl/drivers/built-in.o LD spl/u-boot-spl arm-linux-ld.bfd: u-boot-spl section .u_boot_list will not fit in region .sram arm-linux-ld.bfd: region .sram overflowed by 440 bytes make[1]: *** [spl/u-boot-spl] Error 1 make: *** [spl/u-boot-spl] Error 2 Adjusted WATCHDOG_RESET macro accordingly. Earlier it was pointing to hw_watchdog_reset. Since CONFIG_WATCHDOG replaces CONFIG_HW_WATCHDOG, now WATCHDOG_RESET macro points to watchdog_reset. This watchdog_reset is not defined anywhere for am33xx/omap2 and needs to be defined. Fixed this by simply calling hw_watchdog_reset in watchdog_reset. Built and tested on AM335x device (BeagleboneBlack), compile tested for all other AM33xx/omap2 based boards. Signed-off-by: Suniel Mahesh <sunil.m@techveda.org> [trini: Fix watchdog.h logic] Signed-off-by: Tom Rini <trini@konsulko.com>
87 lines
2.1 KiB
C
87 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* (C) Copyright 2001
|
|
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
|
|
*/
|
|
|
|
/*
|
|
* Watchdog functions and macros.
|
|
*/
|
|
#ifndef _WATCHDOG_H_
|
|
#define _WATCHDOG_H_
|
|
|
|
#if !defined(__ASSEMBLY__)
|
|
/*
|
|
* Reset the watchdog timer, always returns 0
|
|
*
|
|
* This function is here since it is shared between board_f() and board_r(),
|
|
* and the legacy arch/<arch>/board.c code.
|
|
*/
|
|
int init_func_watchdog_reset(void);
|
|
#endif
|
|
|
|
#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
|
|
#define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init,
|
|
#define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset,
|
|
#else
|
|
#define INIT_FUNC_WATCHDOG_INIT
|
|
#define INIT_FUNC_WATCHDOG_RESET
|
|
#endif
|
|
|
|
#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG)
|
|
# error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
|
|
#endif
|
|
|
|
/*
|
|
* Hardware watchdog
|
|
*/
|
|
#ifdef CONFIG_HW_WATCHDOG
|
|
#if defined(__ASSEMBLY__)
|
|
#define WATCHDOG_RESET bl hw_watchdog_reset
|
|
#else
|
|
extern void hw_watchdog_reset(void);
|
|
|
|
#define WATCHDOG_RESET hw_watchdog_reset
|
|
#endif /* __ASSEMBLY__ */
|
|
#else
|
|
/*
|
|
* Maybe a software watchdog?
|
|
*/
|
|
#if defined(CONFIG_WATCHDOG)
|
|
#if defined(__ASSEMBLY__)
|
|
#define WATCHDOG_RESET bl watchdog_reset
|
|
#else
|
|
/* Don't require the watchdog to be enabled in SPL */
|
|
#if defined(CONFIG_SPL_BUILD) && \
|
|
!defined(CONFIG_SPL_WATCHDOG_SUPPORT)
|
|
#define WATCHDOG_RESET() {}
|
|
#else
|
|
extern void watchdog_reset(void);
|
|
|
|
#define WATCHDOG_RESET watchdog_reset
|
|
#endif
|
|
#endif
|
|
#else
|
|
/*
|
|
* No hardware or software watchdog.
|
|
*/
|
|
#if defined(__ASSEMBLY__)
|
|
#define WATCHDOG_RESET /*XXX DO_NOT_DEL_THIS_COMMENT*/
|
|
#else
|
|
#define WATCHDOG_RESET() {}
|
|
#endif /* __ASSEMBLY__ */
|
|
#endif /* CONFIG_WATCHDOG && !__ASSEMBLY__ */
|
|
#endif /* CONFIG_HW_WATCHDOG */
|
|
|
|
/*
|
|
* Prototypes from $(CPU)/cpu.c.
|
|
*/
|
|
|
|
#if (defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)) && !defined(__ASSEMBLY__)
|
|
void hw_watchdog_init(void);
|
|
#endif
|
|
|
|
#if defined(CONFIG_MPC85xx) && !defined(__ASSEMBLY__)
|
|
void init_85xx_watchdog(void);
|
|
#endif
|
|
#endif /* _WATCHDOG_H_ */
|