* [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
@ 2006-03-20 4:39 ` Martin Michlmayr
2006-03-20 6:26 ` Yoichi Yuasa
2006-03-20 4:39 ` [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips Martin Michlmayr
` (10 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:39 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips
MIPS supports various NEC VR41XX chips and not just the VR4100.
Update Kconfig accordingly, thereby bringing the file in sync with
the linux-mips tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/arch/mips/Kconfig 2006-03-13 18:45:54.000000000 +0000
+++ mips.git/arch/mips/Kconfig 2006-03-20 03:22:02.000000000 +0000
@@ -503,7 +503,7 @@
ether port USB, AC97, PCI, etc.
config MACH_VR41XX
- bool "Support for NEC VR4100 series based machines"
+ bool "Support for NEC VR41XX-based machines"
select SYS_HAS_CPU_VR41XX
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
@@ -1134,7 +1134,7 @@
select CPU_SUPPORTS_32BIT_KERNEL
select CPU_SUPPORTS_64BIT_KERNEL
help
- The options selects support for the NEC VR4100 series of processors.
+ The options selects support for the NEC VR41xx series of processors.
Only choose this option if you have one of these processors as a
kernel built with this option will not run on any other type of
processor or vice versa.
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-20 4:39 ` [PATCH 1/12] [MIPS] Improve description of VR41xx based machines Martin Michlmayr
@ 2006-03-20 6:26 ` Yoichi Yuasa
2006-03-20 13:10 ` Martin Michlmayr
0 siblings, 1 reply; 25+ messages in thread
From: Yoichi Yuasa @ 2006-03-20 6:26 UTC (permalink / raw)
To: Martin Michlmayr; +Cc: yoichi_yuasa, akpm, linux-kernel, linux-mips
On Mon, 20 Mar 2006 04:39:02 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:
> MIPS supports various NEC VR41XX chips and not just the VR4100.
> Update Kconfig accordingly, thereby bringing the file in sync with
> the linux-mips tree.
The linux-mips tree is older than kernel.org about this part.
Yoichi
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
>
>
> --- linux-2.6/arch/mips/Kconfig 2006-03-13 18:45:54.000000000 +0000
> +++ mips.git/arch/mips/Kconfig 2006-03-20 03:22:02.000000000 +0000
> @@ -503,7 +503,7 @@
> ether port USB, AC97, PCI, etc.
>
> config MACH_VR41XX
> - bool "Support for NEC VR4100 series based machines"
> + bool "Support for NEC VR41XX-based machines"
> select SYS_HAS_CPU_VR41XX
> select SYS_SUPPORTS_32BIT_KERNEL
> select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
> @@ -1134,7 +1134,7 @@
> select CPU_SUPPORTS_32BIT_KERNEL
> select CPU_SUPPORTS_64BIT_KERNEL
> help
> - The options selects support for the NEC VR4100 series of processors.
> + The options selects support for the NEC VR41xx series of processors.
> Only choose this option if you have one of these processors as a
> kernel built with this option will not run on any other type of
> processor or vice versa.
>
> --
> Martin Michlmayr
> http://www.cyrius.com/
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-20 6:26 ` Yoichi Yuasa
@ 2006-03-20 13:10 ` Martin Michlmayr
2006-03-20 15:59 ` Yoichi Yuasa
0 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 13:10 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: akpm, linux-kernel, linux-mips
* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-20 15:26]:
> > MIPS supports various NEC VR41XX chips and not just the VR4100.
> > Update Kconfig accordingly, thereby bringing the file in sync with
> > the linux-mips tree.
> The linux-mips tree is older than kernel.org about this part.
Have you looked at the exact change I sent (I know that linux-mips has
some older stuff, but the patch I sent was against linux-mips+new).
IOW, is it more correct to say "VR4100" in Kconfig rather than
"VR41XX", even though more CPUs than the VR4100 are supported?
All my patch does is a a/VR4100/VR41XX/, really.
> > - bool "Support for NEC VR4100 series based machines"
> > + bool "Support for NEC VR41XX-based machines"
...
> > - The options selects support for the NEC VR4100 series of processors.
> > + The options selects support for the NEC VR41xx series of processors.
> > Only choose this option if you have one of these processors as a
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-20 13:10 ` Martin Michlmayr
@ 2006-03-20 15:59 ` Yoichi Yuasa
2006-03-20 16:29 ` Martin Michlmayr
0 siblings, 1 reply; 25+ messages in thread
From: Yoichi Yuasa @ 2006-03-20 15:59 UTC (permalink / raw)
To: Martin Michlmayr; +Cc: akpm, linux-kernel, linux-mips, yoichi_yuasa
On Mon, 20 Mar 2006 13:10:53 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:
> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-20 15:26]:
> > > MIPS supports various NEC VR41XX chips and not just the VR4100.
> > > Update Kconfig accordingly, thereby bringing the file in sync with
> > > the linux-mips tree.
> > The linux-mips tree is older than kernel.org about this part.
>
> Have you looked at the exact change I sent (I know that linux-mips has
> some older stuff, but the patch I sent was against linux-mips+new).
> IOW, is it more correct to say "VR4100" in Kconfig rather than
> "VR41XX", even though more CPUs than the VR4100 are supported?
>
> All my patch does is a a/VR4100/VR41XX/, really.
VR4131 and VR4133, .... are included in NEC VR4100 series.
These entry have no problem.
Yoichi
see:
http://www.necel.com/micro/english/product/vr/vr.html
>
>
> > > - bool "Support for NEC VR4100 series based machines"
> > > + bool "Support for NEC VR41XX-based machines"
> ...
> > > - The options selects support for the NEC VR4100 series of processors.
> > > + The options selects support for the NEC VR41xx series of processors.
> > > Only choose this option if you have one of these processors as a
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-20 15:59 ` Yoichi Yuasa
@ 2006-03-20 16:29 ` Martin Michlmayr
2006-03-21 2:10 ` Yoichi Yuasa
0 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 16:29 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: akpm, linux-kernel, linux-mips
* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-21 00:59]:
> > All my patch does is a a/VR4100/VR41XX/, really.
>
> VR4131 and VR4133, .... are included in NEC VR4100 series.
> These entry have no problem.
Right, so your're taking the NACK of this patch back?
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-20 16:29 ` Martin Michlmayr
@ 2006-03-21 2:10 ` Yoichi Yuasa
2006-03-21 2:18 ` Martin Michlmayr
0 siblings, 1 reply; 25+ messages in thread
From: Yoichi Yuasa @ 2006-03-21 2:10 UTC (permalink / raw)
To: Martin Michlmayr; +Cc: yoichi_yuasa, akpm, linux-kernel, linux-mips
On Mon, 20 Mar 2006 16:29:19 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:
> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-21 00:59]:
> > > All my patch does is a a/VR4100/VR41XX/, really.
> >
> > VR4131 and VR4133, .... are included in NEC VR4100 series.
> > These entry have no problem.
>
> Right, so your're taking the NACK of this patch back?
Yes, NACK.
These entries are right.
Yoichi
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-21 2:10 ` Yoichi Yuasa
@ 2006-03-21 2:18 ` Martin Michlmayr
2006-03-22 7:53 ` Yoichi Yuasa
0 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-21 2:18 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: akpm, linux-kernel, linux-mips
* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-21 11:10]:
> > > VR4131 and VR4133, .... are included in NEC VR4100 series.
> > > These entry have no problem.
> >
> > Right, so your're taking the NACK of this patch back?
>
> Yes, NACK.
> These entries are right.
s/NACK/ACK/ surely ;-)
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/12] [MIPS] Improve description of VR41xx based machines
2006-03-21 2:18 ` Martin Michlmayr
@ 2006-03-22 7:53 ` Yoichi Yuasa
2006-03-22 10:07 ` Martin Michlmayr
0 siblings, 1 reply; 25+ messages in thread
From: Yoichi Yuasa @ 2006-03-22 7:53 UTC (permalink / raw)
To: Martin Michlmayr; +Cc: yoichi_yuasa, akpm, linux-kernel, linux-mips
On Tue, 21 Mar 2006 02:18:26 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:
> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-21 11:10]:
> > > > VR4131 and VR4133, .... are included in NEC VR4100 series.
> > > > These entry have no problem.
> > >
> > > Right, so your're taking the NACK of this patch back?
> >
> > Yes, NACK.
> > These entries are right.
>
> s/NACK/ACK/ surely ;-)
Sorry, what meaning is it?
I think that "VR4100 series" is better than "VR41XX",
because NECEL is writing "VR4100 series".
Yoichi
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
2006-03-20 4:39 ` [PATCH 1/12] [MIPS] Improve description of VR41xx based machines Martin Michlmayr
@ 2006-03-20 4:39 ` Martin Michlmayr
2006-03-20 6:31 ` Yoichi Yuasa
2006-03-20 4:39 ` [PATCH 3/12] [MIPS] Remove tb0287_defconfig Martin Michlmayr
` (9 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:39 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips
Make some cosmetic changes in order to bring mainline in sync
with the linux-mips tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/arch/mips/Makefile 2006-03-13 18:45:54.000000000 +0000
+++ mips.git/arch/mips/Makefile 2006-03-13 18:43:52.000000000 +0000
@@ -498,6 +499,7 @@
cflags-$(CONFIG_PMC_YOSEMITE) += -Iinclude/asm-mips/mach-yosemite
load-$(CONFIG_PMC_YOSEMITE) += 0xffffffff80100000
+#
# Qemu simulating MIPS32 4Kc
#
core-$(CONFIG_QEMU) += arch/mips/qemu/
@@ -584,7 +586,7 @@
load-$(CONFIG_CASIO_E55) += 0xffffffff80004000
#
-# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
+# TANBAC TB0225 VR4131 Multi-chip module/TB0229 VR4131DIMM (VR4131)
#
load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000
--- linux-2.6/arch/mips/pci/fixup-tb0219.c 2006-03-05 19:35:02.000000000 +0000
+++ mips.git/arch/mips/pci/fixup-tb0219.c 2006-03-05 18:51:14.000000000 +0000
@@ -2,7 +2,7 @@
* fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups.
*
* Copyright (C) 2003 Megasolution Inc. <matsu@megasolution.jp>
- * Copyright (C) 2004 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips
2006-03-20 4:39 ` [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips Martin Michlmayr
@ 2006-03-20 6:31 ` Yoichi Yuasa
2006-03-20 13:11 ` Martin Michlmayr
0 siblings, 1 reply; 25+ messages in thread
From: Yoichi Yuasa @ 2006-03-20 6:31 UTC (permalink / raw)
To: Martin Michlmayr; +Cc: yoichi_yuasa, akpm, linux-kernel, linux-mips
On Mon, 20 Mar 2006 04:39:15 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:
> Make some cosmetic changes in order to bring mainline in sync
> with the linux-mips tree.
>
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
>
>
> --- linux-2.6/arch/mips/Makefile 2006-03-13 18:45:54.000000000 +0000
> +++ mips.git/arch/mips/Makefile 2006-03-13 18:43:52.000000000 +0000
> @@ -498,6 +499,7 @@
> cflags-$(CONFIG_PMC_YOSEMITE) += -Iinclude/asm-mips/mach-yosemite
> load-$(CONFIG_PMC_YOSEMITE) += 0xffffffff80100000
>
> +#
> # Qemu simulating MIPS32 4Kc
> #
> core-$(CONFIG_QEMU) += arch/mips/qemu/
> @@ -584,7 +586,7 @@
> load-$(CONFIG_CASIO_E55) += 0xffffffff80004000
>
> #
> -# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
> +# TANBAC TB0225 VR4131 Multi-chip module/TB0229 VR4131DIMM (VR4131)
The linux-mips tree is older than kernel.org about this line.
Yoichi
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips
2006-03-20 6:31 ` Yoichi Yuasa
@ 2006-03-20 13:11 ` Martin Michlmayr
2006-03-21 2:12 ` Yoichi Yuasa
0 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 13:11 UTC (permalink / raw)
To: Yoichi Yuasa; +Cc: akpm, linux-kernel, linux-mips
* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-20 15:31]:
> > -# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
> > +# TANBAC TB0225 VR4131 Multi-chip module/TB0229 VR4131DIMM (VR4131)
>
> The linux-mips tree is older than kernel.org about this line.
What about the other hunk (updating the copyright)?
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips
2006-03-20 13:11 ` Martin Michlmayr
@ 2006-03-21 2:12 ` Yoichi Yuasa
0 siblings, 0 replies; 25+ messages in thread
From: Yoichi Yuasa @ 2006-03-21 2:12 UTC (permalink / raw)
To: Martin Michlmayr; +Cc: yoichi_yuasa, akpm, linux-kernel, linux-mips
On Mon, 20 Mar 2006 13:11:24 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:
> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-03-20 15:31]:
> > > -# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
> > > +# TANBAC TB0225 VR4131 Multi-chip module/TB0229 VR4131DIMM (VR4131)
> >
> > The linux-mips tree is older than kernel.org about this line.
>
> What about the other hunk (updating the copyright)?
The others look fine for me.
Yoichi
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 3/12] [MIPS] Remove tb0287_defconfig
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
2006-03-20 4:39 ` [PATCH 1/12] [MIPS] Improve description of VR41xx based machines Martin Michlmayr
2006-03-20 4:39 ` [PATCH 2/12] [MIPS] Cosmetic updates to sync with linux-mips Martin Michlmayr
@ 2006-03-20 4:39 ` Martin Michlmayr
2006-03-20 6:23 ` Yoichi Yuasa
2006-03-20 4:39 ` [PATCH 4/12] [NET] Improve description of MV643XX_ETH Martin Michlmayr
` (8 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:39 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips
Remove the tb0287 defconfig file since this platform is no longer
supported. This brings mainline in sync with the linux-mips tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/arch/mips/configs/tb0287_defconfig 2006-03-05 19:35:02.000000000 +0000
+++ mips.git/arch/mips/configs/tb0287_defconfig 1970-01-01 01:00:00.000000000 +0100
@@ -1,1105 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.14-rc5-mm1
-# Tue Oct 25 00:20:22 2005
-#
-CONFIG_MIPS=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SWAP_PREFETCH=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_KMOD=y
-
-#
-# Machine selection
-#
-# CONFIG_MIPS_MTX1 is not set
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_MIRAGE is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MIPS_EV64120 is not set
-# CONFIG_MIPS_EV96100 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MOMENCO_JAGUAR_ATX is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
-# CONFIG_MOMENCO_OCELOT_G is not set
-# CONFIG_MIPS_XXS1500 is not set
-# CONFIG_PNX8550_V2PCI is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-CONFIG_MACH_VR41XX=y
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_QEMU is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SNI_RM200_PCI is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-# CONFIG_CASIO_E55 is not set
-# CONFIG_IBM_WORKPAD is not set
-# CONFIG_NEC_CMBVR4133 is not set
-CONFIG_TANBAC_TB022X=y
-# CONFIG_TANBAC_TB0226 is not set
-CONFIG_TANBAC_TB0287=y
-# CONFIG_VICTOR_MPC30X is not set
-# CONFIG_ZAO_CAPCELLA is not set
-CONFIG_PCI_VR41XX=y
-# CONFIG_VRC4173 is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_TX39XX is not set
-CONFIG_CPU_VR41XX=y
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_R10000 is not set
-# 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_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
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-# CONFIG_PCI_LEGACY_PROC is not set
-CONFIG_MMU=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-
-#
-# TCP congestion control
-#
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-# CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_CDROM_PKTCDVD is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_GENERIC is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_PCI_AUTO is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_SC1200 is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-CONFIG_BLK_DEV_SIIMAGE=y
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-
-#
-# SCSI Transport Attributes
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-
-#
-# SCSI Transport Layers
-#
-# CONFIG_SAS_CLASS is not set
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_SATA is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA24XX is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-# CONFIG_FUSION_SPI is not set
-# CONFIG_FUSION_FC is not set
-# CONFIG_FUSION_SAS is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-# CONFIG_IEEE1394_EXPORT_FULL_API is not set
-
-#
-# Device Drivers
-#
-
-#
-# Texas Instruments PCILynx requires I2C
-#
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
-# CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-CONFIG_R8169=y
-# CONFIG_R8169_NAPI is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_CHELSIO_T1 is not set
-# CONFIG_IXGB is not set
-# CONFIG_S2IO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-# CONFIG_HOSTAP is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_NET_FC is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_KGDBOE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_VR41XX=y
-CONFIG_SERIAL_VR41XX_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_RTC_VR41XX is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_TANBAC_TB0219 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_DRM is not set
-CONFIG_GPIO_VR41XX=y
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Misc devices
-#
-
-#
-# Multimedia Capabilities Port drivers
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_FB is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_BANDWIDTH is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# may also be needed; see USB_STORAGE Help for more information
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT=y
-# CONFIG_HID_FF is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_MTOUCH is not set
-# CONFIG_USB_ITMTOUCH is not set
-# CONFIG_USB_EGALAX is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB Multimedia devices
-#
-# CONFIG_USB_DABUSB is not set
-
-#
-# Video4Linux support is needed for USB Multimedia device support
-#
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-CONFIG_USB_MON=y
-
-#
-# USB port drivers
-#
-
-#
-# USB Serial Converter support
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_AUERSWALD is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_GOTEMP is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-
-#
-# USB DSL modem support
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
-# InfiniBand support
-#
-# CONFIG_INFINIBAND is not set
-
-#
-# SN Devices
-#
-
-#
-# EDAC - error detection and reporting (RAS)
-#
-# CONFIG_EDAC is not set
-
-#
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISER4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-CONFIG_XFS_FS=y
-CONFIG_XFS_QUOTA=y
-# CONFIG_XFS_SECURITY is not set
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_INOTIFY=y
-# CONFIG_QUOTA is not set
-CONFIG_QUOTACTL=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=y
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=m
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-# CONFIG_NLS is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-
-#
-# Hardware crypto devices
-#
-
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=m
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 4/12] [NET] Improve description of MV643XX_ETH
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (2 preceding siblings ...)
2006-03-20 4:39 ` [PATCH 3/12] [MIPS] Remove tb0287_defconfig Martin Michlmayr
@ 2006-03-20 4:39 ` Martin Michlmayr
2006-03-20 4:39 ` [PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree Martin Michlmayr
` (7 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:39 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, netdev
Slightly improve the wording of the description of MV643XX_ETH
in Kconfig. This difference was found between the mainline and
linux-mips kernel trees.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/drivers/net/Kconfig 2006-03-13 18:55:59.000000000 +0000
+++ mips.git/drivers/net/Kconfig 2006-03-13 18:43:52.000000000 +0000
@@ -2197,8 +2213,8 @@
depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
help
This driver supports the gigabit Ethernet on the Marvell MV643XX
- chipset which is used in the Momenco Ocelot C and Jaguar ATX and
- Pegasos II, amongst other PPC and MIPS boards.
+ chipset which is used in the Momenco Ocelot C Ocelot, Jaguar ATX
+ and Pegasos II, amongst other PPC and MIPS boards.
config MV643XX_ETH_0
bool "MV-643XX Port 0"
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (3 preceding siblings ...)
2006-03-20 4:39 ` [PATCH 4/12] [NET] Improve description of MV643XX_ETH Martin Michlmayr
@ 2006-03-20 4:39 ` Martin Michlmayr
2006-03-20 4:40 ` [PATCH 6/12] [NET] Support the BCM1x55 and BCM1x80 chips Martin Michlmayr
` (6 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:39 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, netdev
There are three changes between the Linus' and linux-mips git trees
regarding the declaner driver. Two are cosmetic and one fixes a
call to the wrong function.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
--- linux-2.6/drivers/net/declance.c 2006-03-05 19:35:04.000000000 +0000
+++ mips.git/drivers/net/declance.c 2006-03-05 18:51:15.000000000 +0000
@@ -704,8 +704,8 @@
return IRQ_HANDLED;
}
-static irqreturn_t
-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
+ struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct lance_private *lp = netdev_priv(dev);
@@ -1255,7 +1255,7 @@
return 0;
err_out_free_dev:
- kfree(dev);
+ free_netdev(dev);
err_out:
return ret;
@@ -1301,6 +1301,7 @@
while (root_lance_dev) {
struct net_device *dev = root_lance_dev;
struct lance_private *lp = netdev_priv(dev);
+
unregister_netdev(dev);
#ifdef CONFIG_TC
if (lp->slot >= 0)
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 6/12] [NET] Support the BCM1x55 and BCM1x80 chips
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (4 preceding siblings ...)
2006-03-20 4:39 ` [PATCH 5/12] [NET] Bring declance.c in sync with linux-mips tree Martin Michlmayr
@ 2006-03-20 4:40 ` Martin Michlmayr
2006-03-20 4:40 ` [PATCH 7/12] [IDE] Set CFLAGS only for au1xxx-ide Martin Michlmayr
` (5 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:40 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, netdev
From: Broadcom Corporation
Add support for the BCM1x55 and BCM1x80 chips. The BCM1x80 features
four Ethernet devices. This patch has been in the linux-mips tree
for several months and has also been tested by Debian.
Signed-off-by: Andy Isaacson <adi@broadcom.com>
Signed-off-by: Mark E Mason <mark.e.mason@broadcom.com>
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/drivers/net/sb1250-mac.c 2006-03-05 19:35:04.000000000 +0000
+++ mips.git/drivers/net/sb1250-mac.c 2006-03-05 18:51:16.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001,2002,2003 Broadcom Corporation
+ * Copyright (C) 2001,2002,2003,2004 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -43,6 +43,7 @@
#define SBMAC_ETH0_HWADDR "40:00:00:00:01:00"
#define SBMAC_ETH1_HWADDR "40:00:00:00:01:01"
#define SBMAC_ETH2_HWADDR "40:00:00:00:01:02"
+#define SBMAC_ETH3_HWADDR "40:00:00:00:01:03"
#endif
@@ -57,7 +58,7 @@
#define CONFIG_SBMAC_COALESCE
-#define MAX_UNITS 3 /* More are supported, limit only on options */
+#define MAX_UNITS 4 /* More are supported, limit only on options */
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (2*HZ)
@@ -85,11 +86,11 @@
The media type is usually passed in 'options[]'.
*/
#ifdef MODULE
-static int options[MAX_UNITS] = {-1, -1, -1};
+static int options[MAX_UNITS] = {-1, -1, -1, -1};
module_param_array(options, int, NULL, S_IRUGO);
MODULE_PARM_DESC(options, "1-" __MODULE_STRING(MAX_UNITS));
-static int full_duplex[MAX_UNITS] = {-1, -1, -1};
+static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1};
module_param_array(full_duplex, int, NULL, S_IRUGO);
MODULE_PARM_DESC(full_duplex, "1-" __MODULE_STRING(MAX_UNITS));
#endif
@@ -105,13 +106,26 @@
#endif
#include <asm/sibyte/sb1250.h>
-#include <asm/sibyte/sb1250_defs.h>
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
+#include <asm/sibyte/bcm1480_regs.h>
+#include <asm/sibyte/bcm1480_int.h>
+#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
#include <asm/sibyte/sb1250_regs.h>
-#include <asm/sibyte/sb1250_mac.h>
-#include <asm/sibyte/sb1250_dma.h>
#include <asm/sibyte/sb1250_int.h>
+#else
+#error invalid SiByte MAC configuation
+#endif
#include <asm/sibyte/sb1250_scd.h>
+#include <asm/sibyte/sb1250_mac.h>
+#include <asm/sibyte/sb1250_dma.h>
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
+#define UNIT_INT(n) (K_BCM1480_INT_MAC_0 + ((n) * 2))
+#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
+#define UNIT_INT(n) (K_INT_MAC_0 + (n))
+#else
+#error invalid SiByte MAC configuation
+#endif
/**********************************************************************
* Simple types
@@ -142,6 +156,10 @@
#define NUMCACHEBLKS(x) (((x)+SMP_CACHE_BYTES-1)/SMP_CACHE_BYTES)
+#define SBMAC_READCSR(t) __raw_readq((unsigned long)t)
+#define SBMAC_WRITECSR(t,v) __raw_writeq(v, (unsigned long)t)
+
+
#define SBMAC_MAX_TXDESCR 32
#define SBMAC_MAX_RXDESCR 32
@@ -1476,10 +1494,10 @@
* and make sure that RD_THRSH + WR_THRSH <=128 for pass2 and above
* Use a larger RD_THRSH for gigabit
*/
- if (periph_rev >= 2)
- th_value = 64;
- else
+ if (soc_type == K_SYS_SOC_TYPE_BCM1250 && periph_rev < 2)
th_value = 28;
+ else
+ th_value = 64;
fifo = V_MAC_TX_WR_THRSH(4) | /* Must be '4' or '8' */
((s->sbm_speed == sbmac_speed_1000)
@@ -1589,13 +1607,17 @@
* Turn on the rest of the bits in the enable register
*/
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
+ __raw_writeq(M_MAC_RXDMA_EN0 |
+ M_MAC_TXDMA_EN0, s->sbm_macenable);
+#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
__raw_writeq(M_MAC_RXDMA_EN0 |
M_MAC_TXDMA_EN0 |
M_MAC_RX_ENABLE |
M_MAC_TX_ENABLE, s->sbm_macenable);
-
-
-
+#else
+#error invalid SiByte MAC configuation
+#endif
#ifdef CONFIG_SBMAC_COALESCE
/*
@@ -1786,11 +1808,12 @@
reg &= ~M_MAC_IPHDR_OFFSET | V_MAC_IPHDR_OFFSET(15);
__raw_writeq(reg, sc->sbm_rxfilter);
- /* read system identification to determine revision */
- if (periph_rev >= 2) {
- sc->rx_hw_checksum = ENABLE;
- } else {
+ /* BCM1250 pass1 didn't have hardware checksum. Everything
+ later does. */
+ if (soc_type == K_SYS_SOC_TYPE_BCM1250 && periph_rev < 2) {
sc->rx_hw_checksum = DISABLE;
+ } else {
+ sc->rx_hw_checksum = ENABLE;
}
}
@@ -2220,7 +2243,7 @@
-#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR)
+#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
/**********************************************************************
* SBMAC_PARSE_XDIGIT(str)
*
@@ -2397,6 +2420,11 @@
sc->sbm_dev->name);
}
+ if (periph_rev >= 2) {
+ printk(KERN_INFO "%s: enabling TCP rcv checksum\n",
+ sc->sbm_dev->name);
+ }
+
/*
* Display Ethernet address (this is called during the config
* process so we need to finish off the config message that
@@ -2792,7 +2820,7 @@
-#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR)
+#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
static void
sbmac_setup_hwaddr(int chan,char *addr)
{
@@ -2818,25 +2846,7 @@
unsigned long port;
int chip_max_units;
- /*
- * For bringup when not using the firmware, we can pre-fill
- * the MAC addresses using the environment variables
- * specified in this file (or maybe from the config file?)
- */
-#ifdef SBMAC_ETH0_HWADDR
- sbmac_setup_hwaddr(0,SBMAC_ETH0_HWADDR);
-#endif
-#ifdef SBMAC_ETH1_HWADDR
- sbmac_setup_hwaddr(1,SBMAC_ETH1_HWADDR);
-#endif
-#ifdef SBMAC_ETH2_HWADDR
- sbmac_setup_hwaddr(2,SBMAC_ETH2_HWADDR);
-#endif
-
- /*
- * Walk through the Ethernet controllers and find
- * those who have their MAC addresses set.
- */
+ /* Set the number of available units based on the SOC type. */
switch (soc_type) {
case K_SYS_SOC_TYPE_BCM1250:
case K_SYS_SOC_TYPE_BCM1250_ALT:
@@ -2848,6 +2858,10 @@
case K_SYS_SOC_TYPE_BCM1250_ALT2: /* Hybrid */
chip_max_units = 2;
break;
+ case K_SYS_SOC_TYPE_BCM1x55:
+ case K_SYS_SOC_TYPE_BCM1x80:
+ chip_max_units = 4;
+ break;
default:
chip_max_units = 0;
break;
@@ -2855,6 +2869,32 @@
if (chip_max_units > MAX_UNITS)
chip_max_units = MAX_UNITS;
+ /*
+ * For bringup when not using the firmware, we can pre-fill
+ * the MAC addresses using the environment variables
+ * specified in this file (or maybe from the config file?)
+ */
+#ifdef SBMAC_ETH0_HWADDR
+ if (chip_max_units > 0)
+ sbmac_setup_hwaddr(0,SBMAC_ETH0_HWADDR);
+#endif
+#ifdef SBMAC_ETH1_HWADDR
+ if (chip_max_units > 1)
+ sbmac_setup_hwaddr(1,SBMAC_ETH1_HWADDR);
+#endif
+#ifdef SBMAC_ETH2_HWADDR
+ if (chip_max_units > 2)
+ sbmac_setup_hwaddr(2,SBMAC_ETH2_HWADDR);
+#endif
+#ifdef SBMAC_ETH3_HWADDR
+ if (chip_max_units > 3)
+ sbmac_setup_hwaddr(3,SBMAC_ETH3_HWADDR);
+#endif
+
+ /*
+ * Walk through the Ethernet controllers and find
+ * those who have their MAC addresses set.
+ */
for (idx = 0; idx < chip_max_units; idx++) {
/*
@@ -2886,7 +2926,7 @@
printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port);
- dev->irq = K_INT_MAC_0 + idx;
+ dev->irq = UNIT_INT(idx);
dev->base_addr = port;
dev->mem_end = 0;
if (sbmac_init(dev, idx)) {
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 7/12] [IDE] Set CFLAGS only for au1xxx-ide
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (5 preceding siblings ...)
2006-03-20 4:40 ` [PATCH 6/12] [NET] Support the BCM1x55 and BCM1x80 chips Martin Michlmayr
@ 2006-03-20 4:40 ` Martin Michlmayr
2006-03-20 4:40 ` [PATCH 8/12] [MTD] Re-add module description for ms02-nv to Kconfig Martin Michlmayr
` (4 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:40 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, linux-ide
Set CFLAGS only for au1xxx-ide since swarm does not reference any
include files from drivers/ide. This brings drivers/ide/mips/Makefile
in sync with the linux-mips tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/drivers/ide/mips/Makefile 2006-03-05 19:35:03.000000000 +0000
+++ mips.git/drivers/ide/mips/Makefile 2006-03-05 18:51:15.000000000 +0000
@@ -1,4 +1,4 @@
obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o
obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o
-EXTRA_CFLAGS := -Idrivers/ide
+CFLAGS_au1xxx-ide.o := -Idrivers/ide
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 8/12] [MTD] Re-add module description for ms02-nv to Kconfig
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (6 preceding siblings ...)
2006-03-20 4:40 ` [PATCH 7/12] [IDE] Set CFLAGS only for au1xxx-ide Martin Michlmayr
@ 2006-03-20 4:40 ` Martin Michlmayr
2006-03-20 4:40 ` [PATCH 9/12] [MTD] Fix #else directive in the docprobe driver Martin Michlmayr
` (3 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:40 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, linux-mtd
In an unrelated MTD commit, a description about the ms02-nv module
got removed from Kconfig. While I personally agree with this
removal, the module maintainer (Maciej W. Rozycki) would like to
see it added back. In the absense of any consistency regarding
Kconfig descriptions his wish should be followed.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
--- linux-2.6/drivers/mtd/devices/Kconfig 2006-03-05 19:35:04.000000000 +0000
+++ mips.git/drivers/mtd/devices/Kconfig 2006-03-05 18:51:15.000000000 +0000
@@ -47,6 +47,11 @@
accelerator. Say Y here if you have a DECstation 5000/2x0 or a
DECsystem 5900 equipped with such a module.
+ If you want to compile this driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read <file:Documentation/modules.txt>. The module will
+ be called ms02-nv.o.
+
config MTD_DATAFLASH
tristate "Support for AT45xxx DataFlash"
depends on MTD && SPI_MASTER && EXPERIMENTAL
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 9/12] [MTD] Fix #else directive in the docprobe driver
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (7 preceding siblings ...)
2006-03-20 4:40 ` [PATCH 8/12] [MTD] Re-add module description for ms02-nv to Kconfig Martin Michlmayr
@ 2006-03-20 4:40 ` Martin Michlmayr
2006-03-20 4:40 ` [PATCH 10/12] [MTD] LASAT depends on MTD_CFI Martin Michlmayr
` (2 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:40 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, linux-mtd
The following difference was found between the mainline and linux-mips
kernel. Fix the #else directive in the docprobe driver, and change
some space to tabs for consistency.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/drivers/mtd/devices/docprobe.c 2006-03-05 19:35:04.000000000 +0000
+++ mips.git/drivers/mtd/devices/docprobe.c 2006-03-05 18:51:15.000000000 +0000
@@ -84,10 +84,10 @@
0xe4000000,
#elif defined(CONFIG_MOMENCO_OCELOT)
0x2f000000,
- 0xff000000,
+ 0xff000000,
#elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C)
- 0xff000000,
-##else
+ 0xff000000,
+#else
#warning Unknown architecture for DiskOnChip. No default probe locations defined
#endif
0xffffffff };
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 10/12] [MTD] LASAT depends on MTD_CFI
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (8 preceding siblings ...)
2006-03-20 4:40 ` [PATCH 9/12] [MTD] Fix #else directive in the docprobe driver Martin Michlmayr
@ 2006-03-20 4:40 ` Martin Michlmayr
2006-03-20 4:41 ` [PATCH 11/12] [USB] Cosmetic changes to bring ohci-au1xxx.c in sync with linux-mips Martin Michlmayr
2006-03-20 4:41 ` [PATCH 12/12] [SCSI] mem_start is a physical address already Martin Michlmayr
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:40 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, linux-mtd
The following difference was found between the mainline and linux-mips
kernel. LASAT depends on MTD_CFI.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/drivers/mtd/maps/Kconfig 2006-03-05 19:35:04.000000000 +0000
+++ mips.git/drivers/mtd/maps/Kconfig 2006-03-05 18:51:15.000000000 +0000
@@ -200,8 +200,8 @@
Support for the flash chip on Tsunami TIG bus.
config MTD_LASAT
- tristate "Flash chips on LASAT board"
- depends on LASAT
+ tristate "LASAT flash device"
+ depends on LASAT && MTD_CFI
help
Support for the flash chips on the Lasat 100 and 200 boards.
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 11/12] [USB] Cosmetic changes to bring ohci-au1xxx.c in sync with linux-mips
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (9 preceding siblings ...)
2006-03-20 4:40 ` [PATCH 10/12] [MTD] LASAT depends on MTD_CFI Martin Michlmayr
@ 2006-03-20 4:41 ` Martin Michlmayr
2006-03-20 4:41 ` [PATCH 12/12] [SCSI] mem_start is a physical address already Martin Michlmayr
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:41 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, greg
These are two cosmetic changes which bring ohci-au1xxx.c in sync with
the linux-mips tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- linux-2.6/drivers/usb/host/ohci-au1xxx.c 2006-03-05 19:35:05.000000000 +0000
+++ mips.git/drivers/usb/host/ohci-au1xxx.c 2006-03-13 18:43:52.000000000 +0000
@@ -92,12 +92,12 @@
int retval;
struct usb_hcd *hcd;
- if(dev->resource[1].flags != IORESOURCE_IRQ) {
+ if (dev->resource[1].flags != IORESOURCE_IRQ) {
pr_debug ("resource[1] is not IORESOURCE_IRQ");
return -ENOMEM;
}
- hcd = usb_create_hcd(driver, &dev->dev, "au1xxx");
+ hcd = usb_create_hcd(driver, &dev->dev, "Au1xxx");
if (!hcd)
return -ENOMEM;
hcd->rsrc_start = dev->resource[0].start;
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 12/12] [SCSI] mem_start is a physical address already
2006-03-20 4:38 Bring mainline in sync with the linux-mips tree Martin Michlmayr
` (10 preceding siblings ...)
2006-03-20 4:41 ` [PATCH 11/12] [USB] Cosmetic changes to bring ohci-au1xxx.c in sync with linux-mips Martin Michlmayr
@ 2006-03-20 4:41 ` Martin Michlmayr
11 siblings, 0 replies; 25+ messages in thread
From: Martin Michlmayr @ 2006-03-20 4:41 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, linux-mips, linux-scsi
mem_start is a physical address already so there's no need to call
CPHYSADDR(). This brings the file in sync with the linux-mips tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
--- linux-2.6/drivers/scsi/dec_esp.c 2006-03-05 19:35:05.000000000 +0000
+++ mips.git/drivers/scsi/dec_esp.c 2006-03-05 18:51:16.000000000 +0000
@@ -230,7 +230,7 @@
mem_start = get_tc_base_addr(slot);
/* Store base addr into esp struct */
- esp->slot = CPHYSADDR(mem_start);
+ esp->slot = mem_start;
esp->dregs = 0;
esp->eregs = (void *)CKSEG1ADDR(mem_start +
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 25+ messages in thread