diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-08 09:19:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-08 09:19:08 -0400 |
| commit | fef408679b2f634ebfd6298d9fc99db99e60fb1d (patch) | |
| tree | 0a3e31151b3234dd39c11d1048f47fa1c1ef81bd /arch | |
| parent | 2e8fef747bf773691d174b2b8120d7aa6c637bcf (diff) | |
| parent | c07f68dd66f305baf930c660493c4db4e2a50ff2 (diff) | |
| download | u-boot-fef408679b2f634ebfd6298d9fc99db99e60fb1d.tar.gz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvellWIP/08Aug2019
- Remove unused bcm2835 watchdog driver (still non-DM)
- Cosmetic fixup of mtk_wdt.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-bcm283x/reset.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index 7712d4664c..b3da0c7cd6 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -23,11 +23,7 @@ /* max ticks timeout */ #define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff -#ifdef CONFIG_BCM2835_WDT -extern void hw_watchdog_disable(void); -#else void hw_watchdog_disable(void) {} -#endif __efi_runtime_data struct bcm2835_wdog_regs *wdog_regs = (struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR; |