linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Fri, 12 Aug 2005 17:46:42 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/08/12 17:46:28

Modified files:
        arch/mips      : Makefile 
        arch/mips/configs: capcella_defconfig e55_defconfig 
                           mpc30x_defconfig tb0226_defconfig 
                           tb0229_defconfig workpad_defconfig 
        arch/mips/vr41xx: Kconfig 
        drivers/char   : Kconfig 

Log message:
        Combine TB0225 and TB0229.

diff -urN linux/arch/mips/Makefile linux/arch/mips/Makefile
--- linux/arch/mips/Makefile    2005/07/28 19:11:49     1.207
+++ linux/arch/mips/Makefile    2005/08/12 16:46:24     1.208
@@ -554,14 +554,9 @@
 load-$(CONFIG_CASIO_E55)       += 0xffffffff80004000
 
 #
-# TANBAC TB0226 Mbase (VR4131)
+# TANBAC TB0225 VR4131 Multi-chip module/TB0229 VR4131DIMM (VR4131)
 #
-load-$(CONFIG_TANBAC_TB0226)   += 0xffffffff80000000
-
-#
-# TANBAC TB0229 VR4131DIMM (VR4131)
-#
-load-$(CONFIG_TANBAC_TB0229)   += 0xffffffff80000000
+load-$(CONFIG_TANBAC_TB022X)   += 0xffffffff80000000
 
 #
 # Common Philips PNX8550
diff -urN linux/arch/mips/configs/capcella_defconfig 
linux/arch/mips/configs/capcella_defconfig
--- linux/arch/mips/configs/capcella_defconfig  2005/08/10 15:17:11     1.71
+++ linux/arch/mips/configs/capcella_defconfig  2005/08/12 16:46:27     1.72
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc6
-# Wed Aug 10 15:05:51 2005
+# Fri Aug 12 17:31:25 2005
 #
 CONFIG_MIPS=y
 
@@ -113,8 +113,7 @@
 # CONFIG_NEC_CMBVR4133 is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
-# CONFIG_TANBAC_TB0226 is not set
-# CONFIG_TANBAC_TB0229 is not set
+# CONFIG_TANBAC_TB022X is not set
 # CONFIG_VICTOR_MPC30X is not set
 CONFIG_ZAO_CAPCELLA=y
 CONFIG_PCI_VR41XX=y
diff -urN linux/arch/mips/configs/e55_defconfig 
linux/arch/mips/configs/e55_defconfig
--- linux/arch/mips/configs/e55_defconfig       2005/08/10 15:17:11     1.71
+++ linux/arch/mips/configs/e55_defconfig       2005/08/12 16:46:27     1.72
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc6
-# Wed Aug 10 15:06:01 2005
+# Fri Aug 12 17:32:20 2005
 #
 CONFIG_MIPS=y
 
@@ -113,8 +113,7 @@
 # CONFIG_NEC_CMBVR4133 is not set
 CONFIG_CASIO_E55=y
 # CONFIG_IBM_WORKPAD is not set
-# CONFIG_TANBAC_TB0226 is not set
-# CONFIG_TANBAC_TB0229 is not set
+# CONFIG_TANBAC_TB022X is not set
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
diff -urN linux/arch/mips/configs/mpc30x_defconfig 
linux/arch/mips/configs/mpc30x_defconfig
--- linux/arch/mips/configs/mpc30x_defconfig    2005/08/10 15:17:11     1.72
+++ linux/arch/mips/configs/mpc30x_defconfig    2005/08/12 16:46:27     1.73
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc6
-# Wed Aug 10 15:06:14 2005
+# Fri Aug 12 17:33:31 2005
 #
 CONFIG_MIPS=y
 
@@ -113,8 +113,7 @@
 # CONFIG_NEC_CMBVR4133 is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
-# CONFIG_TANBAC_TB0226 is not set
-# CONFIG_TANBAC_TB0229 is not set
+# CONFIG_TANBAC_TB022X is not set
 CONFIG_VICTOR_MPC30X=y
 # CONFIG_ZAO_CAPCELLA is not set
 CONFIG_PCI_VR41XX=y
diff -urN linux/arch/mips/configs/tb0226_defconfig 
linux/arch/mips/configs/tb0226_defconfig
--- linux/arch/mips/configs/tb0226_defconfig    2005/08/10 15:17:12     1.70
+++ linux/arch/mips/configs/tb0226_defconfig    2005/08/12 16:46:27     1.71
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc6
-# Wed Aug 10 15:06:35 2005
+# Fri Aug 12 17:38:17 2005
 #
 CONFIG_MIPS=y
 
@@ -113,18 +113,14 @@
 # CONFIG_NEC_CMBVR4133 is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
-CONFIG_TANBAC_TB0226=y
-# CONFIG_TANBAC_TB0229 is not set
+# CONFIG_TANBAC_TB022X is not set
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_HAVE_DEC_LOCK=y
-CONFIG_DMA_NONCOHERENT=y
 # CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
+# CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 #
@@ -149,22 +145,19 @@
 # CONFIG_CPU_RM7000 is not set
 # CONFIG_CPU_RM9000 is not set
 # CONFIG_CPU_SB1 is not set
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 
 #
 # Kernel type
 #
-CONFIG_32BIT=y
+# CONFIG_32BIT is not set
 # CONFIG_64BIT is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_MIPS_MT is not set
-# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_SYNC=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -182,8 +175,6 @@
 #
 # Bus options (PCI, PCMCIA, EISA, ISA, TC)
 #
-CONFIG_HW_HAS_PCI=y
-# CONFIG_PCI is not set
 CONFIG_MMU=y
 
 #
@@ -200,7 +191,6 @@
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
 
 #
 # Networking
diff -urN linux/arch/mips/configs/tb0229_defconfig 
linux/arch/mips/configs/tb0229_defconfig
--- linux/arch/mips/configs/tb0229_defconfig    2005/08/10 15:17:12     1.73
+++ linux/arch/mips/configs/tb0229_defconfig    2005/08/12 16:46:27     1.74
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc6
-# Wed Aug 10 15:06:36 2005
+# Fri Aug 12 17:39:34 2005
 #
 CONFIG_MIPS=y
 
@@ -113,8 +113,8 @@
 # CONFIG_NEC_CMBVR4133 is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_IBM_WORKPAD is not set
-# CONFIG_TANBAC_TB0226 is not set
-CONFIG_TANBAC_TB0229=y
+CONFIG_TANBAC_TB022X=y
+CONFIG_TANBAC_TB0226=y
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
 CONFIG_PCI_VR41XX=y
@@ -186,8 +186,8 @@
 #
 CONFIG_HW_HAS_PCI=y
 CONFIG_PCI=y
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
+# CONFIG_PCI_LEGACY_PROC is not set
+# CONFIG_PCI_NAMES is not set
 CONFIG_MMU=y
 
 #
@@ -393,26 +393,7 @@
 #
 # CONFIG_NET_TULIP is not set
 # CONFIG_HP100 is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-# CONFIG_AMD8111_ETH is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_B44 is not set
-# CONFIG_FORCEDETH is not set
-# CONFIG_DGRS is not set
-CONFIG_EEPRO100=y
-# CONFIG_E100 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_LAN_SAA9730 is not set
+# CONFIG_NET_PCI is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -426,7 +407,6 @@
 # CONFIG_R8169 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
-# CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 
@@ -557,7 +537,7 @@
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-CONFIG_TANBAC_TB0219=y
+# CONFIG_TANBAC_TB0219 is not set
 
 #
 # Ftape, the floppy tape device driver
diff -urN linux/arch/mips/configs/workpad_defconfig 
linux/arch/mips/configs/workpad_defconfig
--- linux/arch/mips/configs/workpad_defconfig   2005/08/10 15:17:12     1.71
+++ linux/arch/mips/configs/workpad_defconfig   2005/08/12 16:46:27     1.72
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.13-rc6
-# Wed Aug 10 15:06:37 2005
+# Fri Aug 12 17:39:37 2005
 #
 CONFIG_MIPS=y
 
@@ -113,8 +113,7 @@
 # CONFIG_NEC_CMBVR4133 is not set
 # CONFIG_CASIO_E55 is not set
 CONFIG_IBM_WORKPAD=y
-# CONFIG_TANBAC_TB0226 is not set
-# CONFIG_TANBAC_TB0229 is not set
+# CONFIG_TANBAC_TB022X is not set
 # CONFIG_VICTOR_MPC30X is not set
 # CONFIG_ZAO_CAPCELLA is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
diff -urN linux/arch/mips/vr41xx/Kconfig linux/arch/mips/vr41xx/Kconfig
--- linux/arch/mips/vr41xx/Kconfig      2005/07/15 17:19:02     1.6
+++ linux/arch/mips/vr41xx/Kconfig      2005/08/12 16:46:27     1.7
@@ -38,8 +38,8 @@
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config TANBAC_TB0226
-       bool "Support for TANBAC TB0226 (Mbase)"
+config TANBAC_TB022X
+       bool "Support for TANBAC TB0225 (VR4131 multichip module) and TB0229 
(VR4131DIMM)"
        depends on MACH_VR41XX
        select DMA_NONCOHERENT
        select HW_HAS_PCI
@@ -48,22 +48,19 @@
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        help
-         The TANBAC TB0226 (Mbase) is a MIPS-based platform manufactured by
-         TANBAC.  Please refer to <http://www.tanbac.co.jp/> about Mbase.
+         The TANBAC TB0225 (VR4131 multichip module) and TB0229 (VR4131DIMM)
+         are MIPS-based platforms manufactured by TANBAC.
+         Please refer to <http://www.tanbac.co.jp/> about
+         VR4131 Multi-chip module and VR4131DIMM.
 
-config TANBAC_TB0229
-       bool "Support for TANBAC TB0229 (VR4131DIMM)"
-       depends on MACH_VR41XX
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
+config TANBAC_TB0226
+       bool "Support for TANBAC TB0226 (Mbase)"
+       depends on TANBAC_TB022X
+       select PCI
+       select PCI_VR41XX
        help
-         The TANBAC TB0229 (VR4131DIMM) is a MIPS-based platform manufactured
-         by TANBAC.  Please refer to <http://www.tanbac.co.jp/> about
-         VR4131DIMM.
+         The TANBAC TB0226 (Mbase) is a MIPS-based platform manufactured by
+         TANBAC.  Please refer to <http://www.tanbac.co.jp/> about Mbase.
 
 config VICTOR_MPC30X
        bool "Support for Victor MP-C303/304"
diff -urN linux/drivers/char/Kconfig linux/drivers/char/Kconfig
--- linux/drivers/char/Kconfig  2005/08/01 18:24:03     1.55
+++ linux/drivers/char/Kconfig  2005/08/12 16:46:28     1.56
@@ -97,7 +97,7 @@
        tristate "Comtrol RocketPort support"
        depends on SERIAL_NONSTANDARD
        help
-         This driver supports Comtrol RocketPort and RocketModem PCI boards.   
+         This driver supports Comtrol RocketPort and RocketModem PCI boards.
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
           modems.  For information about the RocketPort/RocketModem  boards
           and this driver read <file:Documentation/rocket.txt>.
@@ -886,8 +886,14 @@
          module will be called sonypi.
 
 config TANBAC_TB0219
-       tristate "TANBAC TB0219 base board support"
-       depends TANBAC_TB0229
+       tristate "TANBAC TB0219 (VR4131DIMM-EK) Evaluation board support"
+       depends TANBAC_TB022X
+       select PCI
+       select PCI_VR41XX
+       help
+         The TANBAC TB0219 (VR4131DIMM-EK) is a Evaluation board for VR4131DIMM
+         manufactured by TANBAC.
+         Please refer to <http://www.tanbac.co.jp/> about VR4131DIMM-EK.
 
 
 menu "Ftape, the floppy tape device driver"
@@ -981,8 +987,8 @@
 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
        help
-         The raw driver permits block devices to be bound to /dev/raw/rawN. 
-         Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
+         The raw driver permits block devices to be bound to /dev/raw/rawN.
+         Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
          See the raw(8) manpage for more details.
 
           The raw driver is deprecated and will be removed soon.

<Prev in Thread] Current Thread [Next in Thread>