Skip to contentSkip to conversation

linux-2.6.0-test2 h8300 archtecure support update (6/6)

PATCH New Yoshinori Sato 1 participant 1 message Jul 28, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-2.6.0-test2 h8300 archtecure support update (6/6)

build error and warning fix
blkdev location cleanup
typo fix

Signature · 57 lines
Yoshinori Sato
<[email protected]>

diff -Nru linux-2.6.0-test2/arch/h8300/lib/Makefile linux-2.6.0-test2-h8300/arch/h8300/lib/Makefile
--- linux-2.6.0-test2/arch/h8300/lib/Makefile	2003-07-14 15:00:22.000000000 +0900
+++ linux-2.6.0-test2-h8300/arch/h8300/lib/Makefile	2003-07-28 12:40:08.000000000 +0900
@@ -5,4 +5,4 @@
 .S.o:
 	$(CC) $(AFLAGS) -D__ASSEMBLY__ -c $< -o $@
 
-lib-y  = ashrdi3.o checksum.o memcpy.o memset.o abs.o
+lib-y  = ashrdi3.o checksum.o memcpy.o memset.o abs.o romfs.o
diff -Nru linux-2.6.0-test2/arch/h8300/lib/abs.S linux-2.6.0-test2-h8300/arch/h8300/lib/abs.S
--- linux-2.6.0-test2/arch/h8300/lib/abs.S	2003-07-14 15:00:22.000000000 +0900
+++ linux-2.6.0-test2-h8300/arch/h8300/lib/abs.S	2003-07-19 21:41:33.000000000 +0900
@@ -1,4 +1,4 @@
-;;; memcpy.S
+;;; abs.S
 
 #include <asm/linkage.h>
 
diff -Nru linux-2.6.0-test2/arch/h8300/lib/memset.S linux-2.6.0-test2-h8300/arch/h8300/lib/memset.S
--- linux-2.6.0-test2/arch/h8300/lib/memset.S	2003-07-14 15:00:22.000000000 +0900
+++ linux-2.6.0-test2-h8300/arch/h8300/lib/memset.S	2003-07-19 23:20:29.000000000 +0900
@@ -17,9 +17,6 @@
 ;; c   = er1(r1l)
 ;; count = er2
 SYMBOL_NAME_LABEL(memset)
-	mov.l	er2,er2
-	beq	7f
-	mov.l	er0,@-sp
 	btst	#0,r0l
 	beq	2f
 
@@ -36,8 +33,13 @@
 	cmp.l	#4,er2
 	blo	4f
 	;; count>=4 -> count/4
+#if defined(__H8300H__)
 	shlr.l	er2
 	shlr.l	er2
+#endif
+#if defined(__H8300S__)
+	shlr.l	#2,er2
+#endif
 	;; byte -> long
 	mov.b	r1l,r1h
 	mov.w	r1,e1
@@ -56,6 +58,4 @@
 	dec.b	r3l
 	bne	5b
 6:
-	mov.l	@sp+,er0
-7:
-	rts
\ No newline at end of file
+	rts