summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorShinya Kuribayashi <skuribay@pobox.com>2011-05-07 00:18:13 +0900
committerShinya Kuribayashi <skuribay@pobox.com>2011-05-10 00:12:31 +0900
commit68cebb8027c282a949ac0ca7dcb5baabd1c6879a (patch)
tree43082c3da2b94caab4622480520465e0855e65a9 /arch
parent660da0947abff3bc98bb0baa37a6db5050ff46d6 (diff)
downloadblackbird-obmc-uboot-68cebb8027c282a949ac0ca7dcb5baabd1c6879a.tar.gz
blackbird-obmc-uboot-68cebb8027c282a949ac0ca7dcb5baabd1c6879a.zip
MIPS: Move timer code to arch/mips/cpu/$(CPU)/
Current timer routines (arch/mips/lib/timer.c) are implemented assuming that MIPS32 coprocessor (CP0) resources, Counter and Compare registers in this case, are available. But this doesn't always work. We need to make sure that all MIPS-based systems don't necessarily use CP0 counter/compare registers as time keeping resources. And some MIPS variant processors might come with different hardware specs with genuine MIPS32 CP0 registers. With this change, each $(CPU)/ directory can have its own timer code. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/cpu/mips32/Makefile2
-rw-r--r--arch/mips/cpu/mips32/time.c (renamed from arch/mips/lib/time.c)0
-rw-r--r--arch/mips/lib/Makefile1
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/cpu/mips32/Makefile b/arch/mips/cpu/mips32/Makefile
index e315c1bb8c..eb8e00544d 100644
--- a/arch/mips/cpu/mips32/Makefile
+++ b/arch/mips/cpu/mips32/Makefile
@@ -27,7 +27,7 @@ LIB = $(obj)lib$(CPU).o
START = start.o
SOBJS-y = cache.o
-COBJS-y = cpu.o interrupts.o
+COBJS-y = cpu.o interrupts.o time.o
SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
diff --git a/arch/mips/lib/time.c b/arch/mips/cpu/mips32/time.c
index 0e6644149b..0e6644149b 100644
--- a/arch/mips/lib/time.c
+++ b/arch/mips/cpu/mips32/time.c
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 4e90704425..9244f3151a 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -33,7 +33,6 @@ COBJS-y += bootm_qemu_mips.o
else
COBJS-y += bootm.o
endif
-COBJS-y += time.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
OpenPOWER on IntegriCloud