summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-07-21 05:02:24 +0000
committerMinkyu Kang <mk7.kang@samsung.com>2012-11-15 21:08:19 +0900
commit2b5fdd07c51cc4f1c99f70d4753bffa45070bf5a (patch)
treedc5d0e3d7fee2bcbe419b081c1a8c0559399e01d
parentbb6527bc7322476a6f2e6cdb999b7d5165741bbd (diff)
downloadu-boot-imx-2b5fdd07c51cc4f1c99f70d4753bffa45070bf5a.zip
u-boot-imx-2b5fdd07c51cc4f1c99f70d4753bffa45070bf5a.tar.gz
u-boot-imx-2b5fdd07c51cc4f1c99f70d4753bffa45070bf5a.tar.bz2
dm: wdt: Move s5p watchdog timer to drivers/watchdog/
Signed-off-by: Marek Vasut <marex@denx.de> Cc: David Müller <d.mueller@elsoft.ch> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: U-Boot DM <u-boot-dm@lists.denx.de> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--arch/arm/cpu/armv7/s5p-common/Makefile1
-rw-r--r--drivers/watchdog/Makefile1
-rw-r--r--drivers/watchdog/s5p_wdt.c (renamed from arch/arm/cpu/armv7/s5p-common/wdt.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile
index f975f3f..1705399 100644
--- a/arch/arm/cpu/armv7/s5p-common/Makefile
+++ b/arch/arm/cpu/armv7/s5p-common/Makefile
@@ -28,7 +28,6 @@ LIB = $(obj)libs5p-common.o
COBJS-y += cpu_info.o
COBJS-y += timer.o
COBJS-y += sromc.o
-COBJS-y += wdt.o
COBJS-$(CONFIG_PWM) += pwm.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 923acb9..bc09123 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -28,6 +28,7 @@ LIB := $(obj)libwatchdog.o
COBJS-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
COBJS-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
COBJS-$(CONFIG_TNETV107X_WATCHDOG) += tnetv107x_wdt.o
+COBJS-$(CONFIG_S5P) += s5p_wdt.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/arch/arm/cpu/armv7/s5p-common/wdt.c b/drivers/watchdog/s5p_wdt.c
index 94acc1e..94acc1e 100644
--- a/arch/arm/cpu/armv7/s5p-common/wdt.c
+++ b/drivers/watchdog/s5p_wdt.c