sh: Update sh timer function

PATCH New Nobuhiro Iwamatsu 1 participant 1 message Nov 20, 2008

lore

Share & tools

lore

Nobuhiro Iwamatsu

author

2008-11-20 07:44 UTC #0 lore raw

PATCH v2 1/1 sh: Update sh timer function

Change to write/readX fcuntion and fix timer bug.

Signed-off-by Nobuhiro Iwamatsu <[email protected]>

---
 cpu/sh2/Makefile                    |    2 +-
 cpu/sh3/Makefile                    |    2 +-
 cpu/sh3/time.c                      |  103 -----------------------------------
 cpu/sh4/Makefile                    |    2 +-
 cpu/sh4/time.c                      |   98 ---------------------------------
 lib_sh/Makefile                     |    6 ++-
 lib_sh/time.c                       |   83 ++++++++++++++++++++++------
 cpu/sh2/time.c => lib_sh/time_sh2.c |    0
 8 files changed, 74 insertions(+), 222 deletions(-)
 delete mode 100644 cpu/sh3/time.c
 delete mode 100644 cpu/sh4/time.c
 rename cpu/sh2/time.c => lib_sh/time_sh2.c (100%)

cpu/sh2/Makefile +1 -1

index 50f6720..b0fca96 100644
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o
-OBJS	= cpu.o interrupts.o watchdog.o time.o # cache.o
+OBJS	= cpu.o interrupts.o watchdog.o
 
 all:	.depend $(START) $(LIB)

cpu/sh3/Makefile +1 -1

index 587413d..35e8f51 100644
@@ -32,7 +32,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 SOBJS	= start.o
-COBJS	= cpu.o interrupts.o watchdog.o time.o cache.o
+COBJS	= cpu.o interrupts.o watchdog.o cache.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

cpu/sh3/time.c deleted +0 ~~-103~~

103 lines not on this page · raw message

cpu/sh4/Makefile +1 -1

index d3c5eef..3c96a49 100644
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 SOBJS	= start.o
-COBJS	= cpu.o interrupts.o watchdog.o time.o cache.o
+COBJS	= cpu.o interrupts.o watchdog.o cache.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

cpu/sh4/time.c deleted +0 ~~-98~~

98 lines not on this page · raw message

lib_sh/Makefile +5 -1

index 4034381..f7c6479 100644
@@ -26,7 +26,11 @@ SOBJS-y	+=
 
 COBJS-y	+= board.o
 COBJS-y	+= bootm.o
-# COBJS-y	+= time.o
+ifeq ($(CONFIG_SH2),y)
+COBJS-y	+= time_sh2.o
+else
+COBJS-y	+= time.o
+endif
 
 SRCS	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))

lib_sh/time.c +66 ~~-17~~

122 lines not on this page · raw message

lib_sh/time_sh2.c renamed from cpu/sh2/time.c +0 -0

similarity index 100%
rename from cpu/sh2/time.c
rename to lib_sh/time_sh2.c

Signature · 1 line

1.5.6.5