summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brandt <michael.brandt@stericsson.com>2010-11-25 09:59:49 +0100
committerMichael BRANDT <michael.brandt@stericsson.com>2010-11-29 10:28:23 +0100
commit2c04f3663422f56daf88b643e1a3eded854860d0 (patch)
tree2f38f236aa0ec488c04d14a6493a4463984308ec
parenteb434f72d1f7deb13d3e5aacf6517897de7f95e4 (diff)
U8500: Move clock.c into SoC directory
clock.c is SoC specific, not board specific. Other db8500 based boards need it as well, therefore move it into the SoC directory. Change-Id: Ib23d44988628e8bb6a8cb89c56941cf2a815892d Signed-off-by: Michael Brandt <michael.brandt@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9399 Reviewed-by: Joakim AXELSSON <joakim.axelsson@stericsson.com> Reviewed-by: Markus HELGESSON <markus.helgesson@stericsson.com> Reviewed-by: Robert ROSENGREN <robert.rosengren@stericsson.com>
-rw-r--r--board/st/u8500/Makefile2
-rwxr-xr-xcpu/arm_cortexa9/stw8500/Makefile1
-rwxr-xr-xcpu/arm_cortexa9/stw8500/clock.c (renamed from board/st/u8500/clock.c)0
3 files changed, 2 insertions, 1 deletions
diff --git a/board/st/u8500/Makefile b/board/st/u8500/Makefile
index e28165f6e..5fe10cce4 100644
--- a/board/st/u8500/Makefile
+++ b/board/st/u8500/Makefile
@@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := u8500.o gpio.o u8500_i2c.o mmc_host.o mmc_utils.o clock.o mcde_display.o mcde_hw.o ab8500vibra.o cmd_cdump.o
+COBJS := u8500.o gpio.o u8500_i2c.o mmc_host.o mmc_utils.o mcde_display.o mcde_hw.o ab8500vibra.o cmd_cdump.o
SOBJS := mmc_fifo.o
COBJS-$(CONFIG_ITP_LOAD) += itp.o cspsa_fp.o
diff --git a/cpu/arm_cortexa9/stw8500/Makefile b/cpu/arm_cortexa9/stw8500/Makefile
index a8367ec61..180da3026 100755
--- a/cpu/arm_cortexa9/stw8500/Makefile
+++ b/cpu/arm_cortexa9/stw8500/Makefile
@@ -26,6 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).a
COBJS = timer.o interrupts.o
+COBJS += clock.o
COBJS += prcmu.o
SRCS := $(START:.o=.S) $(COBJS:.o=.c)
diff --git a/board/st/u8500/clock.c b/cpu/arm_cortexa9/stw8500/clock.c
index 41f1bb254..41f1bb254 100755
--- a/board/st/u8500/clock.c
+++ b/cpu/arm_cortexa9/stw8500/clock.c