From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 04/10] dm: wdt: arm: Move tnetv107x into drivers/watchdog/
Date: Thu, 18 Oct 2012 06:53:26 +0200 [thread overview]
Message-ID: <20121018065326.544c97d6@lilith> (raw)
In-Reply-To: <1342882947-9174-4-git-send-email-marex@denx.de>
Hi Marek,
On Sat, 21 Jul 2012 17:02:21 +0200, Marek Vasut <marex@denx.de> wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Oliver Brown <obrown@adventnetworks.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Cc: U-Boot DM <u-boot-dm@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.
next prev parent reply other threads:[~2012-10-18 4:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 15:02 [U-Boot] [PATCH 01/10] dm: arm: Remove support for lpc2292 Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 02/10] dm: arm: Remove support for s3c4510 Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 03/10] dm: arm: Remove support for NETARM Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 04/10] dm: wdt: arm: Move tnetv107x into drivers/watchdog/ Marek Vasut
2012-10-18 4:53 ` Albert ARIBAUD [this message]
2012-07-21 15:02 ` [U-Boot] [PATCH 05/10] dm: Move s3c24xx USB driver to a proper place Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 06/10] dm: Move OMAP GPIO driver to drivers/gpio/ Marek Vasut
2012-07-23 20:31 ` Tom Rini
2012-08-31 16:27 ` Albert ARIBAUD
2012-08-31 16:33 ` Tom Rini
2012-08-31 17:28 ` Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 07/10] dm: wdt: Move s5p watchdog timer to drivers/watchdog/ Marek Vasut
2012-10-26 7:33 ` Minkyu Kang
2012-10-26 10:23 ` Marek Vasut
2012-07-21 15:02 ` [U-Boot] [PATCH 08/10] dm: tegra: Staticize local functions in usb.c Marek Vasut
2012-07-24 6:20 ` Simon Glass
2012-07-24 6:24 ` Marek Vasut
2012-07-24 15:50 ` Tom Warren
2012-07-24 19:42 ` Marek Vasut
2012-07-24 21:35 ` Tom Warren
2012-07-24 6:22 ` Simon Glass
2012-07-21 15:02 ` [U-Boot] [PATCH 09/10] dm: net: Move IXP NPE to drivers/net/ Marek Vasut
2012-09-28 15:50 ` [U-Boot] [U-Boot-DM] " Joe Hershberger
2012-07-21 15:02 ` [U-Boot] [PATCH 10/10] dm: Select CONFIG_SPL_GPIO_SUPPORT on OMAP Marek Vasut
[not found] ` <CAP9ODKqfcWr7EcM+B5DD1Q8Rimg+1g7qpkgwa2rzf7WPm_a53A@mail.gmail.com>
2012-07-21 17:50 ` Marek Vasut
2012-07-21 17:53 ` Otavio Salvador
2012-07-21 17:58 ` Marek Vasut
2012-07-21 18:02 ` Otavio Salvador
2012-07-23 20:33 ` Tom Rini
2012-07-23 22:03 ` Marek Vasut
2012-08-03 16:10 ` [U-Boot] [U-Boot-DM] " Tom Rini
2012-08-03 18:56 ` Marek Vasut
2012-09-02 15:33 ` [U-Boot] [PATCH 01/10] dm: arm: Remove support for lpc2292 Wolfgang Denk
2012-09-02 16:15 ` Marek Vasut
2012-09-02 20:26 ` Wolfgang Denk
2012-09-02 20:58 ` Marek Vasut
2012-09-05 22:55 ` Tom Rini
2012-09-06 2:44 ` Marek Vasut
2012-09-06 15:56 ` Tom Rini
2012-09-06 23:14 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121018065326.544c97d6@lilith \
--to=albert.u.boot@aribaud.net \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox