Hi Marek, On Sat, 21 Jul 2012 17:02:21 +0200, Marek Vasut <ma...@denx.de> wrote:
> Signed-off-by: Marek Vasut <ma...@denx.de> > Cc: Oliver Brown <obr...@adventnetworks.com> > Cc: Wolfgang Denk <w...@denx.de> > Cc: Albert Aribaud <albert.u.b...@aribaud.net> > Cc: U-Boot DM <u-boot...@lists.denx.de> > --- > arch/arm/cpu/arm1176/tnetv107x/Makefile | 2 > +- > drivers/watchdog/Makefile | 1 + > .../cpu/arm1176/tnetv107x/wdt.c => drivers/watchdog/tnetv107x_wdt.c | 0 > include/configs/tnetv107x_evm.h | 1 + > 4 files changed, 3 insertions(+), 1 deletion(-) > rename arch/arm/cpu/arm1176/tnetv107x/wdt.c => > drivers/watchdog/tnetv107x_wdt.c (100%) > > diff --git a/arch/arm/cpu/arm1176/tnetv107x/Makefile > b/arch/arm/cpu/arm1176/tnetv107x/Makefile > index c63dc92..c1d4d67 100644 > --- a/arch/arm/cpu/arm1176/tnetv107x/Makefile > +++ b/arch/arm/cpu/arm1176/tnetv107x/Makefile > @@ -21,7 +21,7 @@ include $(TOPDIR)/config.mk > > LIB = $(obj)lib$(SOC).o > > -COBJS += aemif.o clock.o init.o mux.o timer.o wdt.o > +COBJS += aemif.o clock.o init.o mux.o timer.o > SOBJS += lowlevel_init.o > > SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 5579bf2..923acb9 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -27,6 +27,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 := $(COBJS-y) > SRCS := $(COBJS:.o=.c) > diff --git a/arch/arm/cpu/arm1176/tnetv107x/wdt.c > b/drivers/watchdog/tnetv107x_wdt.c > similarity index 100% > rename from arch/arm/cpu/arm1176/tnetv107x/wdt.c > rename to drivers/watchdog/tnetv107x_wdt.c > diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h > index 2272ad2..fd4ec84 100644 > --- a/include/configs/tnetv107x_evm.h > +++ b/include/configs/tnetv107x_evm.h > @@ -32,6 +32,7 @@ > #define CONFIG_ARM1176 > #define CONFIG_TNETV107X > #define CONFIG_TNETV107X_EVM > +#define CONFIG_TNETV107X_WATCHDOG > #define CONFIG_ARCH_CPU_INIT > #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE > #define CONFIG_DISABLE_TCM Applied to u-boot-arm/master, thanks! Amicalement, -- Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
