[U-Boot] [PATCH 07/10] dm: wdt: Move s5p watchdog timer to drivers/watchdog/
Marek Vasut
marex at denx.de
Sat Jul 21 17:02:24 CEST 2012
Signed-off-by: Marek Vasut <marex at denx.de>
Cc: David Müller <d.mueller at elsoft.ch>
Cc: Minkyu Kang <mk7.kang at samsung.com>
Cc: Wolfgang Denk <wd at denx.de>
Cc: Albert Aribaud <albert.u.boot at aribaud.net>
Cc: U-Boot DM <u-boot-dm at lists.denx.de>
---
arch/arm/cpu/armv7/s5p-common/Makefile | 1 -
drivers/watchdog/Makefile | 1 +
arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%)
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
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/wdt.c
rename to drivers/watchdog/s5p_wdt.c
--
1.7.10.4
More information about the U-Boot
mailing list