mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-02 15:33:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "Revert "ipq806x: Enabled HW Watchdog""

Browse source
This commit is contained in:
Linux Build Service Account 2018-04-06 10:31:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit 10a7bb691c
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
board/qca/arm/ipq806x/ipq806x.c
View file

@ -30,7 +30,6 @@
#include "ipq806x.h"
#include "qca_common.h"
#include <asm/arch-qca-common/scm.h>
#include <watchdog.h>
#define DLOAD_MAGIC_COOKIE_1 0xE47B337D
#define DLOAD_MAGIC_COOKIE_2 0x0501CAB0
@ -186,13 +185,6 @@ void reset_cpu(unsigned long a)
while(1);
}
#ifdef CONFIG_HW_WATCHDOG
void hw_watchdog_reset(void)
{
writel(1, APCS_WDT0_RST);
}
#endif
int board_mmc_init(bd_t *bis)
{
int node, gpio_node;

2
include/configs/ipq806x.h
View file

@ -85,7 +85,7 @@
#undef CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_HW_WATCHDOG
#undef CONFIG_HW_WATCHDOG
#define CONFIG_SYS_DEVICE_NULLDEV