[U-Boot] [PATCHv2 04/13] Nomadik: move timer code to drivers/misc

Rabin Vincent
2010-04-08T13:43:11Z

The Nomadik MTU driver will also be used on the U8500 SoC, so move it
out of platform-specific code.

Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Michael Brandt <michael.brandt@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
---
cpu/arm926ejs/nomadik/Makefile | 2 +-
drivers/misc/Makefile | 1 +
.../nomadik/timer.c => drivers/misc/nomadik_mtu.c | 0
include/configs/nhk8815.h | 1 +
4 files changed, 3 insertions(+), 1 deletions(-)
rename cpu/arm926ejs/nomadik/timer.c => drivers/misc/nomadik_mtu.c (100%)

diff --git a/cpu/arm926ejs/nomadik/Makefile b/cpu/arm926ejs/nomadik/Makefile
index 0fc9f2a..180db8b 100644
--- a/cpu/arm926ejs/nomadik/Makefile
+++ b/cpu/arm926ejs/nomadik/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk

LIB = $(obj)lib$(SOC).a

-COBJS = timer.o gpio.o
+COBJS = gpio.o
SOBJS = reset.o

SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index f6df60f..5c0c6f3 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -28,6 +28,7 @@ LIB := $(obj)libmisc.a
COBJS-$(CONFIG_ALI152X) += ali512x.o
COBJS-$(CONFIG_DS4510) += ds4510.o
COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
+COBJS-$(CONFIG_NOMADIK_MTU) += nomadik_mtu.o
COBJS-$(CONFIG_NS87308) += ns87308.o
COBJS-$(CONFIG_STATUS_LED) += status_led.o
COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
diff --git a/cpu/arm926ejs/nomadik/timer.c b/drivers/misc/nomadik_mtu.c
similarity index 100%
rename from cpu/arm926ejs/nomadik/timer.c
rename to drivers/misc/nomadik_mtu.c
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 376f43d..d84e787 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -97,6 +97,7 @@
/* timing informazion */
#define CONFIG_SYS_HZ 1000 /* Mandatory... */
#define CONFIG_SYS_TIMERBASE 0x101E2000
+#define CONFIG_NOMADIK_MTU

/* serial port (PL011) configuration */
#define CONFIG_PL011_SERIAL
--
1.7.0