u-boot.git/drivers/watchdog, branch v2014.01

Merge branch 'iu-boot/master' into 'u-boot-arm/master'

2013-11-09T21:59:47+00:00

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	board/compulab/cm_t35/Makefile
	board/corscience/tricorder/Makefile
	board/ppcag/bg0900/Makefile
	drivers/bootcount/Makefile
	include/configs/omap4_common.h
	include/configs/pdnb3.h

Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:

	board/compulab/common/Makefile
	board/udoo/Makefile

include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.

include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.

Note: 'git show' will also list two files just because
they are new:

	include/configs/am335x_igep0033.h
	include/configs/omap3_igep00x0.h

drivers: convert makefiles to Kbuild style

2013-10-31T17:26:01+00:00

Signed-off-by: Masahiro Yamada

imx_watchdog: do not soft-reset while watchdog init

2013-10-31T16:54:03+00:00

Currently the driver clears WCR_SRS bit when enabling
the watchdog and this causes a software reset. Do not
clear WCR_SRS.

Signed-off-by: Anatolij Gustschin

microblaze: Fix watchdog initialization

2013-10-16T13:24:38+00:00

The patch:
"blackfin: Move blackfin watchdog driver out of the blackfin arch folder."
(sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63)
changed hw_watchdog_init() prototype which didn't match
with Microblaze one.
This patch fixes the driver and Microblaze initialization.

Signed-off-by: Michal Simek

Coding Style cleanup: remove trailing white space

2013-10-14T20:06:53+00:00

Signed-off-by: Wolfgang Denk

arm, am335x: add watchdog support

2013-08-28T15:44:59+00:00

Add TI OMAP 16xx & 24xx/34xx 32KHz (non-secure) watchdog support.

Signed-off-by: Heiko Schocher 
Reviewed-by: Tom Rini 
Cc: Albert Aribaud

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24T13:44:38+00:00

Signed-off-by: Wolfgang Denk 
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-06-08T12:35:10+00:00

Conflicts:
	drivers/serial/Makefile

arm: vf610: Add watchdog support for Vybrid VF610

2013-06-03T08:56:53+00:00

This patch adds watchdog support for Vybrid VF610 platform.

Signed-off-by: Alison Wang

blackfin: Move blackfin watchdog driver out of the blackfin arch folder.

2013-05-13T08:30:26+00:00

- Enable hw_watchdog_init() in watchdog.h if CONFIG_HW_WATCHDOG is defined.
- Move blackfin hw watchdog driver to the generic driver folder.
- Call hw_watchdog_init() from blackfin board init code.
- Reuse macro CONFIG_WATCHDOG_TIMEOUT_MSECS
- Update README.watchdog accordingly

Signed-off-by: Sonic Zhang