[linuxsh-dev] Sync to CVS

[NIIBE Y. <gn...@m1...>]

Here's a patch I have.


	* arch/sh/Makefile (CFLAGS, AFLAGS): Use -m4 -mno-implicit-fp for
	SH4 compile.  We used to use -m4-nofpu but it's not compatible
	to -m4 (differs in calling convention).


	* drivers/net/8139too.c (rtl8139_start_xmit): Fix merge gerbage.

	* arch/sh/kernel/setup_se.c (init_se_IRQ): Remove
	CONFIG_SH_7751_SOLUTION_ENGINE section.
	* include/asm-sh/hitachi_se.h (PA_BCR): Likewise. 


Index: arch/sh/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- arch/sh/Makefile	2001/09/16 15:42:36	1.21
+++ arch/sh/Makefile	2001/10/14 03:30:40
@@ -37,8 +37,8 @@
 AFLAGS		+= -m3
 endif
 ifdef CONFIG_CPU_SH4
-CFLAGS		+= -m4-nofpu
-AFLAGS		+= -m4-nofpu
+CFLAGS		+= -m4 -mno-implicit-fp
+AFLAGS		+= -m4 -mno-implicit-fp
 endif
 
 #
Index: arch/sh/kernel/setup_se.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/setup_se.c,v
retrieving revision 1.11
diff -u -r1.11 setup_se.c
--- arch/sh/kernel/setup_se.c	2001/05/09 08:03:40	1.11
+++ arch/sh/kernel/setup_se.c	2001/10/14 03:30:40
@@ -75,8 +75,6 @@
  */
 void __init init_se_IRQ(void)
 {
-
-#if defined(CONFIG_SH_SOLUTION_ENGINE)
 	/*
 	 * Super I/O (Just mimic PC):
 	 *  1: keyboard
@@ -108,16 +106,6 @@
 	/* NOTE: #2 and #13 are not used on PC */
 	make_ipr_irq(13, BCR_ILCRG, 1, 0x0f-13); /* SLOTIRQ2 */
 	make_ipr_irq( 2, BCR_ILCRG, 0, 0x0f- 2); /* SLOTIRQ1 */
-
-#elif defined(CONFIG_SH_7751_SOLUTION_ENGINE)
-
-	make_ipr_irq(13, BCR_ILCRD, 3, 2);
-
-	/* Add additional calls to make_ipr_irq() as drivers are added
-	 * and tested.
-	 */
-#endif
-
 }
 
 
cvs server: cannot find arch/sh/kernel/sys_sh.c-1.7
Index: drivers/net/8139too.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/drivers/net/8139too.c,v
retrieving revision 1.26
diff -u -r1.26 8139too.c
--- drivers/net/8139too.c	2001/10/11 09:18:20	1.26
+++ drivers/net/8139too.c	2001/10/14 03:30:46
@@ -1776,7 +1776,6 @@
 	assert (tp->tx_info[entry].mapping == 0);
 
 	tp->tx_info[entry].skb = skb;
-	if ( || (unsigned long) skb->data & 3) {	/* Must use alignment buffer. */
 	if ( !USE_NO_DMAMAP && !((unsigned long)skb->data & 3) && skb_shinfo(skb)->nr_frags == 0 &&
 			skb->ip_summed != CHECKSUM_HW) {
 		tp->xstats.tx_buf_mapped++;
@@ -1792,8 +1791,6 @@
 		tp->tx_info[entry].skb = NULL;
 		return 0;
   	}
-
-
 	/* Note: the chip doesn't have auto-pad! */
 	spin_lock_irq(&tp->lock);
 	RTL_W32_F (TxAddr0 + (entry * 4), dma_addr);
Index: include/asm-sh/hitachi_se.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/hitachi_se.h,v
retrieving revision 1.5
diff -u -r1.5 hitachi_se.h
--- include/asm-sh/hitachi_se.h	2001/07/10 10:07:15	1.5
+++ include/asm-sh/hitachi_se.h	2001/10/14 03:30:54
@@ -36,11 +36,7 @@
 #define PA_DIPSW0	0xb0800000	/* Dip switch 5,6 */
 #define PA_DIPSW1	0xb0800002	/* Dip switch 7,8 */
 #define PA_LED		0xb0c00000	/* LED */
-#if defined (CONFIG_SH_7751_SOLUTION_ENGINE)
-#define	PA_BCR		0xbb000000	/* FPGA on the MS7751SE01 */
-#else
 #define PA_BCR		0xb1400000	/* FPGA on the MS7750SE01 */
-#endif
 
 #define PA_MRSHPC	0xb83fffe0	/* MR-SHPC-01 PCMCIA controller */
 #define PA_MRSHPC_MW1	0xb8400000	/* MR-SHPC-01 memory window base */
--