From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263039AbTJPQnT (ORCPT ); Thu, 16 Oct 2003 12:43:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263050AbTJPQnT (ORCPT ); Thu, 16 Oct 2003 12:43:19 -0400 Received: from p060080.ppp.asahi-net.or.jp ([221.113.60.80]:40682 "EHLO mitou.ysato.dip.jp") by vger.kernel.org with ESMTP id S263039AbTJPQnE (ORCPT ); Thu, 16 Oct 2003 12:43:04 -0400 Date: Fri, 17 Oct 2003 01:42:59 +0900 Message-ID: From: Yoshinori Sato To: Linus Torvalds Cc: linux kernel Mailing List Subject: [PATCH] H8/300 support update User-Agent: Wanderlust/2.11.7 (Wonderwall) SEMI/1.14.5 (Awara-Onsen) LIMIT/1.14.7 (Fujiidera) APEL/10.6 Emacs/21.3 (i386-pc-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: multipart/mixed; boundary="Multipart_Fri_Oct_17_01:42:59_2003-1" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org --Multipart_Fri_Oct_17_01:42:59_2003-1 Content-Type: text/plain; charset=US-ASCII - document update - fix semaphoe probrem - fix config -- Yoshinori Sato --Multipart_Fri_Oct_17_01:42:59_2003-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="linux-2.6.0-test7-h8300.diff" Content-Transfer-Encoding: 7bit diff -Nru linux-2.6.0-test7/arch/h8300/Kconfig linux-2.6.0-test7-h8300/arch/h8300/Kconfig --- linux-2.6.0-test7/arch/h8300/Kconfig 2003-10-17 00:07:36.000000000 +0900 +++ linux-2.6.0-test7-h8300/arch/h8300/Kconfig 2003-10-17 00:45:34.000000000 +0900 @@ -341,8 +341,8 @@ endmenu -#source drivers/misc/Config.in source "drivers/media/Kconfig" +source "sound/Kconfig" source "fs/Kconfig" diff -Nru linux-2.6.0-test7/arch/h8300/README linux-2.6.0-test7-h8300/arch/h8300/README --- linux-2.6.0-test7/arch/h8300/README 2003-10-17 00:07:45.000000000 +0900 +++ linux-2.6.0-test7-h8300/arch/h8300/README 2003-10-17 01:04:54.000000000 +0900 @@ -1,9 +1,8 @@ -uClinux-2.4 for H8/300 README +linux-2.6 for H8/300 README Yoshinori Sato * Supported CPU -H8/300H -H8S is planning. +H8/300H and H8S * Supported Target 1.simulator of GDB @@ -15,8 +14,11 @@ Akizuki Denshi Tsusho Ltd. (Japanese Only) 3.H8MAX - Under development - see http://www.strawberry-linux.com (Japanese Only) + see http://ip-sol.jp/h8max/ (Japanese Only) + +4.EDOSK2674 + see http://www.eu.renesas.com/products/mpumcu/tool/edk/support/edosk2674.html + http://www.azpower.com/H8-uClinux/ * Toolchain Version gcc-3.1 or higher and patch @@ -26,10 +28,10 @@ The environment that can compile a h8300-elf binary is necessary. * Userland Develop environment -Tempolary used h8300-hms(h8300-coff) Toolchain. -I prepare toolchain corresponding to h8300-elf. +used h8300-elf toolchains. +see http://www.uclinux.org/pub/uClinux/ports/h8/ * A few words of thanks -Porting to H8/300H is support of Information-technology Promotion Agency, Japan. +Porting to H8/300 serieses is support of Information-technology Promotion Agency, Japan. I thank support. and All developer/user. diff -Nru linux-2.6.0-test7/arch/h8300/lib/romfs.S linux-2.6.0-test7-h8300/arch/h8300/lib/romfs.S --- linux-2.6.0-test7/arch/h8300/lib/romfs.S 2003-08-23 08:54:21.000000000 +0900 +++ linux-2.6.0-test7-h8300/arch/h8300/lib/romfs.S 2003-08-27 01:53:26.000000000 +0900 @@ -1,6 +1,7 @@ /* romfs move to __ebss */ #include +#include #if defined(__H8300H__) .h8300h @@ -9,6 +10,8 @@ .h8300s #endif +#define BLKOFFSET 512 + .text .globl __move_romfs _romfs_sig_len = 8 @@ -31,6 +34,9 @@ add.l er0,er1 /* romfs image end */ mov.l #__ebss,er2 add.l er0,er2 /* distination address */ +#if defined(CONFIG_INTELFLASH) + add.l #BLKOFFSET,er2 +#endif adds #2,er0 adds #1,er0 shlr er0 diff -Nru linux-2.6.0-test7/arch/h8300/platform/h8s/ints.c linux-2.6.0-test7-h8300/arch/h8300/platform/h8s/ints.c --- linux-2.6.0-test7/arch/h8300/platform/h8s/ints.c 2003-10-17 00:07:45.000000000 +0900 +++ linux-2.6.0-test7-h8300/arch/h8300/platform/h8s/ints.c 2003-10-17 01:15:56.000000000 +0900 @@ -1,5 +1,5 @@ /* - * linux/arch/h8300/platform/h8sh/ints.c + * linux/arch/h8300/platform/h8s/ints.c * * Yoshinori Sato * @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -75,7 +74,7 @@ {H8300_GPIO_P2,H8300_GPIO_B6},{H8300_GPIO_P2,H8300_GPIO_B7}, }; -static int use_kmalloc; +static short use_kmalloc = 0; extern unsigned long *interrupt_redirect_table; diff -Nru linux-2.6.0-test7/include/asm-h8300/semaphore.h linux-2.6.0-test7-h8300/include/asm-h8300/semaphore.h --- linux-2.6.0-test7/include/asm-h8300/semaphore.h 2003-10-17 00:07:29.000000000 +0900 +++ linux-2.6.0-test7-h8300/include/asm-h8300/semaphore.h 2003-10-16 23:45:08.000000000 +0900 @@ -101,13 +101,14 @@ "mov.l er1,%0\n\t" "bpl 1f\n\t" "ldc r3l,ccr\n\t" + "mov.l %1,er0\n\t" "jsr @___down\n\t" "bra 2f\n" "1:\n\t" "ldc r3l,ccr\n" "2:" : "+m"(*count) - : + : "g"(sem) : "cc", "er1", "er2", "er3"); } @@ -129,6 +130,7 @@ "mov.l er2,%1\n\t" "bpl 1f\n\t" "ldc r1l,ccr\n\t" + "mov.l %2,er0\n\t" "jsr @___down_interruptible\n\t" "bra 2f\n" "1:\n\t" @@ -136,7 +138,7 @@ "sub.l %0,%0\n\t" "2:\n\t" : "=r" (count),"+m" (*count) - : + : "g"(sem) : "cc", "er1", "er2", "er3"); return (int)count; } @@ -161,6 +163,7 @@ "jmp @3f\n\t" LOCK_SECTION_START(".align 2\n\t") "3:\n\t" + "mov.l %2,er0\n\t" "jsr @___down_trylock\n\t" "jmp @2f\n\t" LOCK_SECTION_END @@ -169,7 +172,7 @@ "sub.l %1,%1\n" "2:" : "+m" (*count),"=r"(count) - : + : "g"(sem) : "cc", "er1","er2", "er3"); return (int)count; } @@ -199,10 +202,11 @@ "sub.l er2,er2\n\t" "cmp.l er2,er1\n\t" "bgt 1f\n\t" + "mov.l %1,er0\n\t" "jsr @___up\n" "1:" : "+m"(*count) - : + : "g"(sem) : "cc", "er1", "er2", "er3"); } --Multipart_Fri_Oct_17_01:42:59_2003-1--