linux-mips-commits — CVS Commit Patches

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4111/common Makefile,1.2,1.3 bcu.c,1.1,NONE cmu.c,1.1,NONE icu.c,1.3,NONE icu.h,1.1,NONE siu.c,1.1,NONE siu.h,1.1,NONE time.c,1.2,NONE

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4111/common

Modified Files:
	Makefile 
Removed Files:
	bcu.c cmu.c icu.c icu.h siu.c siu.h time.c 
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	10 Mar 2002 23:15:47 -0000	1.2
+++ Makefile	12 Jul 2002 20:14:27 -0000	1.3
@@ -15,6 +15,6 @@
 
 O_TARGET := vr4111.o
 
-obj-y		:= bcu.o cmu.o icu.o siu.o power.o probe-ram.o time.o
+obj-y		:= power.o probe-ram.o
 
 include $(TOPDIR)/Rules.make

--- bcu.c DELETED ---

--- cmu.c DELETED ---

--- icu.c DELETED ---

--- icu.h DELETED ---

--- siu.c DELETED ---

--- siu.h DELETED ---

--- time.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4111/clio-1000 setup.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4111/clio-1000

Modified Files:
	setup.c 
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..



Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c	11 Mar 2002 19:36:42 -0000	1.2
+++ setup.c	12 Jul 2002 20:14:27 -0000	1.3
@@ -32,8 +32,6 @@
 extern void vr41xx_restart(char *c);
 extern void vr4111_hibernate(void);
 extern void vr4111_wait(void);
-extern void vr4111_time_init(void);
-extern void vr4111_timer_setup(void);
 
 #ifdef CONFIG_IDE
 extern struct ide_ops std_ide_ops;
@@ -59,8 +57,8 @@
 	set_io_port_base(VR41XX_PORT_BASE); 
 	isa_slot_offset = VR41XX_ISAMEM_BASE;
 
-	board_time_init = vr4111_time_init;
-	board_timer_setup = vr4111_timer_setup;
+	board_time_init = vr41xx_time_init;
+	board_timer_setup = vr41xx_timer_setup;
 
 	_machine_restart = vr41xx_restart;
 	_machine_halt = vr4111_hibernate;

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/common bcu.c,NONE,1.1 cmu.c,1.2,1.3 giu.c,NONE,1.1 icu.c,NONE,1.1 serial.c,1.2,1.3 Makefile,1.8,1.9 time.c,1.3,1.4 irq.c,1.4,NONE

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/common
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/common

Modified Files:
	Makefile time.c 
Added Files:
	bcu.c cmu.c giu.c icu.c serial.c 
Removed Files:
	irq.c 
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..



--- NEW FILE: bcu.c ---
/*
 * FILE NAME
 *	arch/mips/vr41xx/common/bcu.c
 *
 * BRIEF MODULE DESCRIPTION
 *	Bus Control Unit routines for the NEC VR4100 series.
 *
 * Author: Yoichi Yuasa
 *         yy...@mv... or so...@mv...
 *
 * Copyright 2002 MontaVista Software Inc.
 *
 *  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 the
 *  Free Software Foundation; either version 2 of the License, or (at your
 *  option) any later version.
 *
 *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
 *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *  You should have received a copy of the GNU General Public License along
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
/*
 * Changes:
 *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
 *  - Added support for NEC VR4111 and VR4121.
 *
 *  Paul Mundt <le...@ch...>
 *  - Calculate mips_counter_frequency properly on VR4131.
 *
 *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
 *  - New creation, NEC VR4122 and VR4131 are supported.
 */
#include <linux/init.h>
#include <linux/types.h>

#include <asm/addrspace.h>
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/time.h>

#define VR4111_CLKSPEEDREG	KSEG1ADDR(0x0b000014)
#define VR4122_CLKSPEEDREG	KSEG1ADDR(0x0f000014)
#define VR4131_CLKSPEEDREG	VR4122_CLKSPEEDREG
 #define CLKSP(x)		((x) & 0x001f)

 #define DIV2B			0x8000
 #define DIV3B			0x4000
 #define DIV4B			0x2000

 #define DIVT(x)		(((x) & 0xf000) >> 12)
 #define DIVVT(x)		(((x) & 0x0f00) >> 8)

 #define TDIVMODE(x)		(2 << (((x) & 0x1000) >> 12))
 #define VTDIVMODE(x)		(((x) & 0x0700) >> 8)

unsigned long vr41xx_vtclock = 0;

static inline u16 read_clkspeed(void)
{
	switch (mips_cpu.cputype) {
	case CPU_VR4111:
	case CPU_VR4121: return readw(VR4111_CLKSPEEDREG);
	case CPU_VR4122: return readw(VR4122_CLKSPEEDREG);
	case CPU_VR4131: return readw(VR4131_CLKSPEEDREG);
	default:
		printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
		break;
	}

	return 0;
}

static inline unsigned long calculate_pclock(u16 clkspeed)
{
	unsigned long pclock = 0;

	switch (mips_cpu.cputype) {
	case CPU_VR4111:
	case CPU_VR4121:
		pclock = 18432000 * 64;
		break;
	case CPU_VR4122:
		pclock = 18432000 * 98;
		break;
	case CPU_VR4131:
		pclock = 18432000 * 108;
		break;
	default:
		printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
		break;
	}

	pclock /= CLKSP(clkspeed);
	printk(KERN_INFO "PClock: %ldHz\n", pclock);

	return pclock;
}

static inline unsigned long calculate_vtclock(u16 clkspeed, unsigned long pclock)
{
	switch (mips_cpu.cputype) {
	case CPU_VR4111:
		/* The NEC VR4111 doesn't have the VTClock. */
		break;
	case CPU_VR4121:
		vr41xx_vtclock = pclock;
		/* DIVVT == 9 Divide by 1.5 . VTClock = (PClock * 6) / 9 */
		if (DIVVT(clkspeed) == 9)
			vr41xx_vtclock = pclock * 6;
		/* DIVVT == 10 Divide by 2.5 . VTClock = (PClock * 4) / 10 */
		else if (DIVVT(clkspeed) == 10)
			vr41xx_vtclock = pclock * 4;
		vr41xx_vtclock /= DIVVT(clkspeed);
		printk(KERN_INFO "VTClock: %ldHz\n", vr41xx_vtclock);
		break;
	case CPU_VR4122:
		if(VTDIVMODE(clkspeed) == 7)
			vr41xx_vtclock = pclock / 1;
		else if(VTDIVMODE(clkspeed) == 1)
			vr41xx_vtclock = pclock / 2;
		else
			vr41xx_vtclock = pclock / VTDIVMODE(clkspeed);
		printk(KERN_INFO "VTClock: %ldHz\n", vr41xx_vtclock);
		break;
	case CPU_VR4131:
		vr41xx_vtclock = pclock / VTDIVMODE(clkspeed);
		printk(KERN_INFO "VTClock: %ldHz\n", vr41xx_vtclock);
		break;
	default:
		printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
		break;
	}

	return vr41xx_vtclock;
}

static inline unsigned long calculate_tclock(u16 clkspeed, unsigned long pclock,
                                             unsigned long vtclock)
{
	unsigned long tclock = 0;

	switch (mips_cpu.cputype) {
	case CPU_VR4111:
		if (!(clkspeed & DIV2B))
        		tclock = pclock / 2;
		else if (!(clkspeed & DIV3B))
        		tclock = pclock / 3;
		else if (!(clkspeed & DIV4B))
        		tclock = pclock / 4;
		break;
	case CPU_VR4121:
		tclock = pclock / DIVT(clkspeed);
		break;
	case CPU_VR4122:
	case CPU_VR4131:
		tclock = vtclock / TDIVMODE(clkspeed);
		break;
	default:
		printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
		break;
	}

	printk(KERN_INFO "TClock: %ldHz\n", tclock);

	return tclock;
}

static inline unsigned long calculate_mips_counter_frequency(unsigned long tclock)
{
	/*
	 * VR4131 Revision 2.0 and 2.1 use a value of (tclock / 2).
	 */
	if ((mips_cpu.cputype == CPU_VR4131) &&
	    (((mips_cpu.processor_id & 0xff) == PRID_REV_VR4131_REV2_0) ||
	     ((mips_cpu.processor_id & 0xff) == PRID_REV_VR4131_REV2_1)))
		tclock /= 2;
	else
		tclock /= 4;

	return tclock;
}

void __init vr41xx_bcu_init(void)
{
	unsigned long pclock, vtclock, tclock;
	u16 clkspeed;

	clkspeed = read_clkspeed();

	pclock = calculate_pclock(clkspeed);
	vtclock = calculate_vtclock(clkspeed, pclock);
	tclock = calculate_tclock(clkspeed, pclock, vtclock);

	mips_counter_frequency = calculate_mips_counter_frequency(tclock);
}


--- NEW FILE: giu.c ---
/*
 * FILE NAME
 *	arch/mips/vr41xx/common/giu.c
 *
 * BRIEF MODULE DESCRIPTION
 *	General-purpose I/O Unit Interrupt routines for NEC VR4100 series.
 *
 * Author: Yoichi Yuasa
 *         yy...@mv... or so...@mv...
 *
 * Copyright 2002 MontaVista Software Inc.
 *
 *  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 the
 *  Free Software Foundation; either version 2 of the License, or (at your
 *  option) any later version.
 *
 *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
 *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *  You should have received a copy of the GNU General Public License along
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
/*
 * Changes:
 *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
 *  - New creation, NEC VR4111, VR4121, VR4122 and VR4131 are supported.
 */
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/types.h>

#include <asm/addrspace.h>
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/vr41xx.h>

#define VR4111_GIUIOSELL	KSEG1ADDR(0x0b000100)
#define VR4122_GIUIOSELL	KSEG1ADDR(0x0f000140)

#define GIUIOSELL	0x00
#define GIUIOSELH	0x02
#define GIUINTSTATL	0x08
#define GIUINTSTATH	0x0a
#define GIUINTENL	0x0c
#define GIUINTENH	0x0e
#define GIUINTTYPL	0x10
#define GIUINTTYPH	0x12
#define GIUINTALSELL	0x14
#define GIUINTALSELH	0x16
#define GIUINTHTSELL	0x18
#define GIUINTHTSELH	0x1a

u32 vr41xx_giu_base = 0;

#define read_giuint(offset)		readw(vr41xx_giu_base + (offset))
#define write_giuint(val, offset)	writew((val), vr41xx_giu_base + (offset))

static inline u16 set_giuint(u16 offset, u16 set)
{
	u16 res;

	res = read_giuint(offset);
	res |= set;
	write_giuint(res, offset);

	return res;
}

static inline u16 clear_giuint(u16 offset, u16 clear)
{
	u16 res;

	res = read_giuint(offset);
	res &= ~clear;
	write_giuint(res, offset);

	return res;
}

void vr41xx_enable_giuint(u8 pin)
{
	if (pin < 16)
		set_giuint(GIUINTENL, (u16)1 << pin);
	else
		set_giuint(GIUINTENH, (u16)1 << (pin - 16));
}

void vr41xx_disable_giuint(u8 pin)
{
	if (pin < 16)
		clear_giuint(GIUINTENL, (u16)1 << pin);
	else
		clear_giuint(GIUINTENH, (u16)1 << (pin - 16));
}

void vr41xx_clear_giuint(u8 pin)
{
	if (pin < 16)
		write_giuint(GIUINTSTATL, (u16)1 << pin);
	else
		write_giuint(GIUINTSTATH, (u16)1 << (pin - 16));
}

void vr41xx_set_irq_trigger(u8 pin, u8 trigger, u8 hold)
{
	u16 mask;

	if (pin < 16) {
		mask = (u16)1 << pin;
		if (trigger == TRIGGER_EDGE) {
        		set_giuint(GIUINTTYPL, mask);
			if (hold == SIGNAL_HOLD)
				set_giuint(GIUINTHTSELL, mask);
			else
				clear_giuint(GIUINTHTSELL, mask);
		} else {
			clear_giuint(GIUINTTYPL, mask);
			clear_giuint(GIUINTHTSELL, mask);
		}
	} else {
		mask = (u16)1 << (pin - 16);
		if (trigger == TRIGGER_EDGE) {
			set_giuint(GIUINTTYPH, mask);
			if (hold == SIGNAL_HOLD)
				set_giuint(GIUINTHTSELH, mask);
			else
				clear_giuint(GIUINTHTSELH, mask);
		} else {
			clear_giuint(GIUINTTYPH, mask);
			clear_giuint(GIUINTHTSELH, mask);
		}
	}

	vr41xx_clear_giuint(pin);
}

void vr41xx_set_irq_level(u8 pin, u8 level)
{
	u16 mask;

	if (pin < 16) {
		mask = (u16)1 << pin;
		if (level == LEVEL_HIGH)
			set_giuint(GIUINTALSELL, mask);
		else
			clear_giuint(GIUINTALSELL, mask);
	} else {
		mask = (u16)1 << (pin - 16);
		if (level == LEVEL_HIGH)
			set_giuint(GIUINTALSELH, mask);
		else
			clear_giuint(GIUINTALSELH, mask);
	}

	vr41xx_clear_giuint(pin);
}

#define GIUINT_CASCADE_IRQ	16
#define GIUINT_NR_IRQS		32

enum {
	GIUINT_NO_CASCADE,
	GIUINT_CASCADE
};

struct vr41xx_giuint_cascade {
	unsigned int flag;
	int (*get_irq_number)(int irq);
};

static struct vr41xx_giuint_cascade giuint_cascade[GIUINT_NR_IRQS];
static struct irqaction giu_cascade = {no_action, 0, 0, "cascade", NULL, NULL};

static int no_irq_number(int irq)
{
	return -EINVAL;
}

int vr41xx_cascade_irq(unsigned int irq, int (*get_irq_number)(int irq))
{
	unsigned int pin;
	int retval;

	if (irq < GIU_IRQ(0) || irq > GIU_IRQ(31))
		return -EINVAL;

	if(!get_irq_number)
		return -EINVAL;

	pin = irq - GIU_IRQ(0);
	giuint_cascade[pin].flag = GIUINT_CASCADE;
	giuint_cascade[pin].get_irq_number = get_irq_number;

	retval = setup_irq(irq, &giu_cascade);
	if (retval) {
		giuint_cascade[pin].flag = GIUINT_NO_CASCADE;
		giuint_cascade[pin].get_irq_number = no_irq_number;
	}

	return retval;
}

extern unsigned int do_IRQ(int irq, struct pt_regs *regs);

unsigned int giuint_do_IRQ(int pin, struct pt_regs *regs)
{
	struct vr41xx_giuint_cascade *cascade;
	unsigned int retval = 0;
	int giuint_irq, cascade_irq;

	disable_irq(GIUINT_CASCADE_IRQ);
	cascade = &giuint_cascade[pin];
	giuint_irq = pin + GIU_IRQ(0);
	if (cascade->flag == GIUINT_CASCADE) {
		cascade_irq = cascade->get_irq_number(giuint_irq);
		disable_irq(giuint_irq);
		if (cascade_irq > 0)
			retval = do_IRQ(cascade_irq, regs);
		enable_irq(giuint_irq);
	} else
		retval = do_IRQ(giuint_irq, regs);
	enable_irq(GIUINT_CASCADE_IRQ);

	return retval;
}

void (*board_irq_init)(void) = NULL;

void __init vr41xx_giuint_init(void)
{
	int i;

	switch (mips_cpu.cputype) {
	case CPU_VR4111:
	case CPU_VR4121:
		vr41xx_giu_base = VR4111_GIUIOSELL;
		break;
	case CPU_VR4122:
	case CPU_VR4131:
		vr41xx_giu_base = VR4122_GIUIOSELL;
		break;
	default:
		panic("GIU: Unexpected CPU of NEC VR4100 series");
		break;
	}

	for (i = 0; i < GIUINT_NR_IRQS; i++) {
                vr41xx_disable_giuint(i);
		giuint_cascade[i].flag = GIUINT_NO_CASCADE;
		giuint_cascade[i].get_irq_number = no_irq_number;
	}

	if (setup_irq(GIUINT_CASCADE_IRQ, &giu_cascade))
		printk("GIUINT: Can not cascade IRQ %d.\n", GIUINT_CASCADE_IRQ);

	if (board_irq_init)
		board_irq_init();
}

--- NEW FILE: icu.c ---
/*
 * FILE NAME
 *	arch/mips/vr41xx/vr4122/common/icu.c
 *
 * BRIEF MODULE DESCRIPTION
 *	Interrupt Control Unit routines for the NEC VR4122 and VR4131.
 *
 * Author: Yoichi Yuasa
 *         yy...@mv... or so...@mv...
 *
 * Copyright 2001,2002 MontaVista Software Inc.
 *
 *  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 the
 *  Free Software Foundation; either version 2 of the License, or (at your
 *  option) any later version.
 *
 *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 *  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
 *  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 *  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 *  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *  You should have received a copy of the GNU General Public License along
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
/*
 * Changes:
 *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
 *  - Added support for NEC VR4111 and VR4121.
 *
 *  Paul Mundt <le...@ch...>
 *  - kgdb support.
 *
 *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
 *  - New creation, NEC VR4122 and VR4131 are supported.
 */
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/types.h>

#include <asm/addrspace.h>
#include <asm/cpu.h>
#include <asm/gdb-stub.h>
#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/vr41xx.h>

#define MIPS_CPU_IRQ_BASE	0
#define SYSINT1_IRQ_BASE	8
#define SYSINT1_IRQ_LAST	23
#define SYSINT2_IRQ_BASE	24
#define SYSINT2_IRQ_LAST	39
#define GIUINT_IRQ_BASE		GIU_IRQ(0)
#define GIUINT_IRQ_LAST		GIU_IRQ(31)

#define ICU_CASCADE_IRQ		(MIPS_CPU_IRQ_BASE + 2)

extern asmlinkage void vr41xx_handle_interrupt(void);

extern void __init init_generic_irq(void);
extern void mips_cpu_irq_init(u32 irq_base);
extern unsigned int do_IRQ(int irq, struct pt_regs *regs);

extern void vr41xx_giuint_init(void);
extern unsigned int giuint_do_IRQ(int pin, struct pt_regs *regs);

static u32 vr41xx_icu1_base = 0;
static u32 vr41xx_icu2_base = 0;

#define VR4111_SYSINT1REG	KSEG1ADDR(0x0b000080)
#define VR4111_SYSINT2REG	KSEG1ADDR(0x0b000200)

#define VR4122_SYSINT1REG	KSEG1ADDR(0x0f000080)
#define VR4122_SYSINT2REG	KSEG1ADDR(0x0f0000a0)

#define SYSINT1REG	0x00
#define GIUINTLREG	0x08
#define MSYSINT1REG	0x0c
#define MGIUINTLREG	0x14
#define NMIREG		0x18
#define SOFTREG		0x1a

#define SYSINT2REG	0x00
#define GIUINTHREG	0x02
#define MSYSINT2REG	0x06
#define MGIUINTHREG	0x08

#define read_icu1(offset)	readw(vr41xx_icu1_base + (offset))
#define write_icu1(val, offset)	writew((val), vr41xx_icu1_base + (offset))

#define read_icu2(offset)	readw(vr41xx_icu2_base + (offset))
#define write_icu2(val, offset)	writew((val), vr41xx_icu2_base + (offset))

static inline u16 set_icu1(u16 offset, u16 set)
{
	u16 res;

	res = read_icu1(offset);
	res |= set;
	write_icu1(res, offset);

	return res;
}

static inline u16 clear_icu1(u16 offset, u16 clear)
{
	u16 res;

	res = read_icu1(offset);
	res &= ~clear;
	write_icu1(res, offset);

	return res;
}

static inline u16 set_icu2(u16 offset, u16 set)
{
	u16 res;

	res = read_icu2(offset);
	res |= set;
	write_icu2(res, offset);

	return res;
}

static inline u16 clear_icu2(u16 offset, u16 clear)
{
	u16 res;

	res = read_icu2(offset);
	res &= ~clear;
	write_icu2(res, offset);

	return res;
}

/*=======================================================================*/

static void enable_sysint1_irq(unsigned int irq)
{
	set_icu1(MSYSINT1REG, (u16)1 << (irq - SYSINT1_IRQ_BASE));
}

static void disable_sysint1_irq(unsigned int irq)
{
	clear_icu1(MSYSINT1REG, (u16)1 << (irq - SYSINT1_IRQ_BASE));
}

static unsigned int startup_sysint1_irq(unsigned int irq)
{ 
	set_icu1(MSYSINT1REG, (u16)1 << (irq - SYSINT1_IRQ_BASE));

	return 0; /* never anything pending */
}

#define shutdown_sysint1_irq	disable_sysint1_irq
#define ack_sysint1_irq		disable_sysint1_irq

static void end_sysint1_irq(unsigned int irq)
{
	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
		set_icu1(MSYSINT1REG, (u16)1 << (irq - SYSINT1_IRQ_BASE));
}

static struct hw_interrupt_type sysint1_irq_type = {
	"SYSINT1",
	startup_sysint1_irq,
	shutdown_sysint1_irq,
	enable_sysint1_irq,
	disable_sysint1_irq,
	ack_sysint1_irq,
	end_sysint1_irq,
	NULL
};

/*=======================================================================*/

static void enable_sysint2_irq(unsigned int irq)
{
	set_icu2(MSYSINT2REG, (u16)1 << (irq - SYSINT2_IRQ_BASE));
}

static void disable_sysint2_irq(unsigned int irq)
{
	clear_icu2(MSYSINT2REG, (u16)1 << (irq - SYSINT2_IRQ_BASE));
}

static unsigned int startup_sysint2_irq(unsigned int irq)
{ 
	set_icu2(MSYSINT2REG, (u16)1 << (irq - SYSINT2_IRQ_BASE));

	return 0; /* never anything pending */
}

#define shutdown_sysint2_irq	disable_sysint2_irq
#define ack_sysint2_irq		disable_sysint2_irq

static void end_sysint2_irq(unsigned int irq)
{
	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
		set_icu2(MSYSINT2REG, (u16)1 << (irq - SYSINT2_IRQ_BASE));
}

static struct hw_interrupt_type sysint2_irq_type = {
	"SYSINT2",
	startup_sysint2_irq,
	shutdown_sysint2_irq,
	enable_sysint2_irq,
	disable_sysint2_irq,
	ack_sysint2_irq,
	end_sysint2_irq,
	NULL
};

/*=======================================================================*/

extern void vr41xx_enable_giuint(u8 pin);
extern void vr41xx_disable_giuint(u8 pin);
extern void vr41xx_clear_giuint(u8 pin);

static void enable_giuint_irq(unsigned int irq)
{
	u8 pin;

	pin = irq - GIUINT_IRQ_BASE;
	if (pin < 16)
		set_icu1(MGIUINTLREG, (u16)1 << pin);
	else
		set_icu2(MGIUINTHREG, (u16)1 << (pin - 16));

	vr41xx_enable_giuint(pin);
}

static void disable_giuint_irq(unsigned int irq)
{
	u8 pin;

	pin = irq - GIUINT_IRQ_BASE;
	vr41xx_disable_giuint(pin);

	if (pin < 16)
		clear_icu1(MGIUINTLREG, (u16)1 << pin);
	else
		clear_icu2(MGIUINTHREG, (u16)1 << (pin - 16));
}

static unsigned int startup_giuint_irq(unsigned int irq)
{ 
	vr41xx_clear_giuint(irq - GIUINT_IRQ_BASE);

	enable_giuint_irq(irq);

	return 0; /* never anything pending */
}

#define shutdown_giuint_irq	disable_giuint_irq

static void ack_giuint_irq(unsigned int irq)
{
	disable_giuint_irq(irq);

	vr41xx_clear_giuint(irq - GIUINT_IRQ_BASE);
}

static void end_giuint_irq(unsigned int irq)
{
	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
		enable_giuint_irq(irq);
}

static struct hw_interrupt_type giuint_irq_type = {
	"GIUINT",
	startup_giuint_irq,
	shutdown_giuint_irq,
	enable_giuint_irq,
	disable_giuint_irq,
	ack_giuint_irq,
	end_giuint_irq,
	NULL
};

/*=======================================================================*/

static struct irqaction icu_cascade = {no_action, 0, 0, "cascade", NULL, NULL};

static void __init vr41xx_icu_init(void)
{
	int i;

	switch (mips_cpu.cputype) {
	case CPU_VR4111:
	case CPU_VR4121:
		vr41xx_icu1_base = VR4111_SYSINT1REG;
		vr41xx_icu2_base = VR4111_SYSINT2REG;
		break;
	case CPU_VR4122:
	case CPU_VR4131:
		vr41xx_icu1_base = VR4122_SYSINT1REG;
		vr41xx_icu2_base = VR4122_SYSINT2REG;
		break;
	default:
		panic("Unexpected CPU of NEC VR4100 series");
		break;
	}

	write_icu1(0, MSYSINT1REG);
	write_icu1(0, MGIUINTLREG);

	write_icu2(0, MSYSINT2REG);
	write_icu2(0, MGIUINTHREG);

	for (i = SYSINT1_IRQ_BASE; i <= GIUINT_IRQ_LAST; i++) {
		if (i >= SYSINT1_IRQ_BASE && i <= SYSINT1_IRQ_LAST)
			irq_desc[i].handler = &sysint1_irq_type;
		else if (i >= SYSINT2_IRQ_BASE && i <= SYSINT2_IRQ_LAST)
			irq_desc[i].handler = &sysint2_irq_type;
		else if (i >= GIUINT_IRQ_BASE && i <= GIUINT_IRQ_LAST)
			irq_desc[i].handler = &giuint_irq_type;
	}

	setup_irq(ICU_CASCADE_IRQ, &icu_cascade);
}

void __init init_IRQ(void)
{
	memset(irq_desc, 0, sizeof(irq_desc));

	init_generic_irq();
	mips_cpu_irq_init(MIPS_CPU_IRQ_BASE);
	vr41xx_icu_init();

	vr41xx_giuint_init();

	set_except_vector(0, vr41xx_handle_interrupt);

#ifdef CONFIG_REMOTE_DEBUG
	printk("Setting debug traps - please connect the remote debugger.\n");
	set_debug_traps();
	breakpoint();
#endif
}

/*=======================================================================*/

static inline void giuint_irqdispatch(u16 pendl, u16 pendh, struct pt_regs *regs)
{
	int i;

	if (pendl) {
		for (i = 0; i < 16; i++) {
			if (pendl & (0x0001 << i)) {
				giuint_do_IRQ(i, regs);
				return;
			}
		}
	}
	else if (pendh) {
		for (i = 0; i < 16; i++) {
			if (pendh & (0x0001 << i)) {
				giuint_do_IRQ(i + 16, regs);
				return;
			}
		}
	}
}

asmlinkage void icu_irqdispatch(struct pt_regs *regs)
{
	u16 pend1, pend2, pendl, pendh;
	u16 mask1, mask2, maskl, maskh;
	int i;

	pend1 = read_icu1(SYSINT1REG);
	mask1 = read_icu1(MSYSINT1REG);

	pend2 = read_icu2(SYSINT2REG);
	mask2 = read_icu2(MSYSINT2REG);

	pendl = read_icu1(GIUINTLREG);
	maskl = read_icu1(MGIUINTLREG);

	pendh = read_icu2(GIUINTHREG);
	maskh = read_icu2(MGIUINTHREG);

	pend1 &= mask1;
	pend2 &= mask2;
	pendl &= maskl;
	pendh &= maskh;

	if (pend1) {
		if ((pend1 & 0x01ff) == 0x0100) {
			giuint_irqdispatch(pendl, pendh, regs);
		}
		else {
			for (i = 0; i < 16; i++) {
				if (pend1 & (0x0001 << i)) {
					do_IRQ(SYSINT1_IRQ_BASE + i, regs);
					break;
				}
			}
		}
		return;
	}
	else if (pend2) {
		for (i = 0; i < 16; i++) {
			if (pend2 & (0x0001 << i)) {
				do_IRQ(SYSINT2_IRQ_BASE + i, regs);
				break;
			}
		}
	}
}


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/common/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	14 Jun 2002 15:02:14 -0000	1.8
+++ Makefile	12 Jul 2002 20:14:27 -0000	1.9
@@ -15,8 +15,9 @@
 
 O_TARGET := vr41xx.o
 
-obj-y		:= int-handler.o reset.o irq.o
+obj-y		:= bcu.o cmu.o giu.o icu.o int-handler.o reset.o
 
+obj-$(CONFIG_SERIAL)		+= serial.o
 obj-$(CONFIG_VR41XX_TIME_C)	+= time.o
 
 obj-$(CONFIG_VR41XX_LED) += led.o

Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/common/time.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- time.c	7 Mar 2002 03:16:53 -0000	1.3
+++ time.c	12 Jul 2002 20:14:27 -0000	1.4
@@ -33,6 +33,9 @@
 /*
  * Changes:
  *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
+ *  - Added support for NEC VR4100 series RTC Unit.
+ *
+ *  MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
  *  - New creation, NEC VR4100 series are supported.
  */
 #include <linux/config.h>
@@ -40,6 +43,7 @@
 #include <linux/irq.h>
 #include <linux/types.h>
 
+#include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/param.h>
@@ -47,19 +51,37 @@
 
 #define MIPS_COUNTER_TIMER_IRQ	7
 
+#define VR4111_ETIMELREG	KSEG1ADDR(0x0b0000c0)
+#define VR4122_ETIMELREG	KSEG1ADDR(0x0f000100)
+
+u32 vr41xx_rtc_base = 0;
+
 #ifdef CONFIG_VR41XX_RTC
 extern unsigned long vr41xx_rtc_get_time(void);
-extern int vr41xx_rtc_set_time(unsigned long);
+extern int vr41xx_rtc_set_time(unsigned long sec);
 #endif
 
 void vr41xx_time_init(void)
 {
+	switch (mips_cpu.cputype) {
+	case CPU_VR4111:
+	case CPU_VR4121:
+		vr41xx_rtc_base = VR4111_ETIMELREG;
+		break;
+	case CPU_VR4122:
+	case CPU_VR4131:
+                vr41xx_rtc_base = VR4122_ETIMELREG;
+                break;
+        default:
+                panic("Unexpected CPU of NEC VR4100 series");
+                break;
+        }
+
 #ifdef CONFIG_VR41XX_RTC
-	rtc_get_time = vr41xx_rtc_get_time;
-	rtc_set_time = vr41xx_rtc_set_time;
+        rtc_get_time = vr41xx_rtc_get_time;
+        rtc_set_time = vr41xx_rtc_set_time;
 #endif
 }
-
 
 void vr41xx_timer_setup(struct irqaction *irq)
 {

--- irq.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4111/casio-e55 init.c,1.1,1.2 setup.c,1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e55
In directory usw-pr-cvs1:/tmp/cvs-serv32248/arch/mips/vr41xx/vr4111/casio-e55

Modified Files:
	init.c setup.c 
Log Message:
Merge yoichi-san's vr41xx patch. Still some cleanups needed..



Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e55/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c	7 Mar 2002 03:16:53 -0000	1.1
+++ init.c	12 Jul 2002 20:14:27 -0000	1.2
@@ -1,6 +1,6 @@
 /*
  * FILE NAME
- *	arch/mips/vr41xx/e55/init.c
+ *	arch/mips/vr41xx/vr4111/casio-e55/init.c
  *
  * BRIEF MODULE DESCRIPTION
  *	Initialisation code for the CASIO CASSIOPEIA E-55/65.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e55/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c	7 Mar 2002 03:16:53 -0000	1.1
+++ setup.c	12 Jul 2002 20:14:27 -0000	1.2
@@ -1,6 +1,6 @@
 /*
  * FILE NAME
- *	arch/mips/vr41xx/e55/setup.c
+ *	arch/mips/vr41xx/vr4111/casio-e55/setup.c
  *
  * BRIEF MODULE DESCRIPTION
  *	Setup for the CASIO CASSIOPEIA E-55/65.
@@ -63,5 +63,7 @@
 
 	vr41xx_bcu_init();
 
-	vr41xx_siu_init(0, SIU_RS232C, 0);
+	vr41xx_cmu_init(0);
+
+	vr41xx_siu_init(SIU_RS232C, 0);
 }

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4122/capcella - New directory

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/capcella
In directory usw-pr-cvs1:/tmp/cvs-serv32045/arch/mips/vr41xx/vr4122/capcella

Log Message:
Directory /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/capcella added to the repository

[Linux-mips-commits]CVS: linux/arch/mips/jmr3927/rbhma3100 setup.c,1.7,1.8

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/jmr3927/rbhma3100
In directory usw-pr-cvs1:/tmp/cvs-serv23201

Modified Files:
	setup.c 
Log Message:
Add a sane wbflush(). Based off the HCP5 implementation.



Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/jmr3927/rbhma3100/setup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- setup.c	16 May 2002 18:40:06 -0000	1.7
+++ setup.c	28 Jun 2002 16:09:16 -0000	1.8
@@ -9,6 +9,7 @@
  *     Setup file for JMR3927.
  *
  * Copyright (C) 2000-2001 Toshiba Corporation 
+ * Copyright (C) 2002 TimeSys Corp.
  *
  *  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 the
@@ -57,6 +58,7 @@
 #include <asm/cpu.h>
 #include <asm/pci_channel.h>
 #include <asm/debug.h>
+#include <asm/wbflush.h>
 
 /* Tick Timer divider */
 #define JMR3927_TIMER_CCD	0	/* 1/2 */
@@ -252,11 +254,24 @@
 {
 }
 
+static void jmr3927_wbflush(void)
+{
+	__asm__ __volatile__ (
+		".set push\n\t"
+		".set noreorder\n\t"
+		"1:\n\t"
+		"bc0f 1b\n\t"
+		"nop\n\t"
+		".set pop"
+	);
+}
+
 void __init jmr3927_setup(void)
 {
 	extern int panic_timeout;
 	char *argptr;
 
+	__wbflush = jmr3927_wbflush;
 	irq_setup = jmr3927_irq_setup;
 #ifndef JMR3927_INIT_INDIRECT_PCI
 	set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);  

[Linux-mips-commits]CVS: linux/drivers/video sfb.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv22011/drivers/video

Modified Files:
	sfb.c 
Log Message:
Nuke useless functions.



Index: sfb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/sfb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sfb.c	27 Jun 2002 21:13:06 -0000	1.3
+++ sfb.c	27 Jun 2002 21:18:48 -0000	1.4
@@ -86,8 +86,6 @@
 
 int sfb_setup(char*);
 
-static int sfb_open(struct fb_info *info, int user);
-static int sfb_release(struct fb_info *info, int user);
 static int sfb_get_fix(struct fb_fix_screeninfo *fix, int con,
 		       struct fb_info *info);
 static int sfb_get_var(struct fb_var_screeninfo *var, int con,
@@ -100,8 +98,6 @@
 			struct fb_info *info);
 static int sfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
 			struct fb_info *info);
-static int sfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		     u_long arg, int con, struct fb_info *info);
 
 
     /*
@@ -131,15 +127,12 @@
 
 static struct fb_ops sfb_ops = {
     owner:          THIS_MODULE,
-    fb_open:	    sfb_open,
-    fb_release:	    sfb_release,
     fb_get_fix:     sfb_get_fix,
     fb_get_var:     sfb_get_var,
     fb_set_var:     sfb_set_var,
     fb_get_cmap:    sfb_get_cmap,
     fb_set_cmap:    sfb_set_cmap,
     fb_pan_display: sfb_pan_display,
-    fb_ioctl:       sfb_ioctl,
 };
 
     /*

[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-casio-be300,1.4,1.5

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/configs
In directory usw-pr-cvs1:/tmp/cvs-serv19440/arch/mips/configs

Modified Files:
	defconfig-casio-be300 
Log Message:
sfb rewrite part 1. get rid of all the platdep dependance, let platforms
specify memory locations/sizes if they need to. also use the modedb for
mode lookups. inverse/grayscale become boot options. support for obscure video
modes to come later..



Index: defconfig-casio-be300
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-be300,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- defconfig-casio-be300	14 Jun 2002 16:35:59 -0000	1.4
+++ defconfig-casio-be300	27 Jun 2002 21:13:06 -0000	1.5
@@ -359,7 +359,35 @@
 #
 # Frame-buffer support
 #
-# CONFIG_FB is not set
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_CLGEN is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_E1355 is not set
+# CONFIG_FB_MQ200 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_E1356 is not set
+# CONFIG_FB_IT8181 is not set
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SIMPLE_MEMBASE=aa200000
+CONFIG_FB_SIMPLE_MEMSIZE=0
+# CONFIG_FB_SIMPLE_GRAY is not set
+# CONFIG_FB_HPCSFB is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FBCON_ADVANCED is not set
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+# CONFIG_FBCON_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 
 #
 # Sound

[Linux-mips-commits]CVS: linux/drivers/video Config.in,1.18,1.19 sfb.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv19440/drivers/video

Modified Files:
	Config.in sfb.c 
Log Message:
sfb rewrite part 1. get rid of all the platdep dependance, let platforms
specify memory locations/sizes if they need to. also use the modedb for
mode lookups. inverse/grayscale become boot options. support for obscure video
modes to come later..



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Config.in	18 Apr 2002 00:02:04 -0000	1.18
+++ Config.in	27 Jun 2002 21:13:06 -0000	1.19
@@ -113,7 +113,7 @@
       hex '    Register Base Address' CONFIG_E1355_REG_BASE a8000000
       hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
    fi
-   bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200	 
+   bool '  MediaQ Framebuffer support' CONFIG_FB_MQ200	 
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       if [ "$CONFIG_PCI" != "n" ]; then
 	 tristate '  Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
@@ -165,6 +165,10 @@
       fi
       tristate '  ITE IT8181 framebuffer support' CONFIG_FB_IT8181
       tristate '  Simple Frame Buffer support' CONFIG_FB_SIMPLE
+      if [ "$CONFIG_FB_SIMPLE" != "n" ]; then
+         hex '    Video memory base address' CONFIG_FB_SIMPLE_MEMBASE a0000000
+         hex '    Video memory size' CONFIG_FB_SIMPLE_MEMSIZE 0
+      fi
       tristate '  Simple Frame Buffer with HPC device control (Experimental)' CONFIG_FB_HPCSFB
    fi
    if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then

Index: sfb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/sfb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sfb.c	7 Mar 2002 09:15:17 -0000	1.2
+++ sfb.c	27 Jun 2002 21:13:06 -0000	1.3
@@ -44,107 +44,16 @@
 #include <video/fbcon-cfb24.h>
 #include <video/fbcon-cfb32.h>
 
-
-/*
- * Linux VR uses SFB extensively, so params based on platform in that case
- */
-#ifdef CONFIG_CPU_VR41XX
-#include <asm/vr41xx-platdep.h>
-#endif
-
-/*
- * VIDEORAM_BASE     Address of start of video ram (virtual address)
- * VIDEORAM_SIZE     Size of video ram (default is x * y * (bpp/8)) 
- * FB_X_RES          Visible horizontal resolution in pixels
- * FB_X_VIRTUAL_RES  Horizontal resolution of framebuffer memory in pixels
- *                   (default is FB_X_RES)
- * FB_Y_RES          Visible vertical resolution in pixels
- * FB_Y_VIRTUAL_RES  Vertical resolution of framebuffer memory in pixels
- *                   (default FB_Y_RES)
- * FB_BPP            Bits per pixel
- * FB_PALETTE        The palette for a paletted device, whatever has been
- *                   initialized before boot (since sfb can't change it)
- * FB_IS_GREY        1 means greyscale device, otherwise 0 (default is 0)
- * FB_IS_INVERSE     1 means 0 color value is white instead of black,
- *                   otherwise 0 (default is 0)
- * FB_IS_TRUECOLOR   Define this as 1 to force truecolor for any mode
- *                   less than 16bpp, this is useful for 8bpp truecolor
- *                   devices (this defaults to 1 for 16bpp or greater)
- * The last three are done with 1 / 0 instead of #define / #undef in order
- * to facilitate a generic interface, if we should coose to do one in the
- * future.
- *
- * Some example settings:
- *
- * #define VIDEORAM_BASE	0x12345678
- * #define VIDEORAM_SIZE	(1024 * 1024)
- * #define FB_X_RES		800
- * #define FB_X_VIRTUAL_RES	1024
- * #define FB_Y_RES		600
- * #define FB_Y_VIRTUAL_RES	1024
- * #define FB_BPP		8
- * #define FB_PALETTE		{ {0x12,0x34,0x56,0}, {0x78,0x9a,0xbc,0}, ... }
- * #define FB_IS_GREY		0
- * #define FB_IS_INVERSE	0
- * #define FB_IS_TRUECOLOR	0
- */
-
-/*
- * Please put all hardware-specific defines (or includes) above this line, the
- * frame buffer should be completely described by above parameters.
- */
-
-#ifndef VIDEORAM_BASE
-#error "SFB frame buffer parameters have not been defined."
-#endif
-
-#ifndef FB_X_VIRTUAL_RES
-#define FB_X_VIRTUAL_RES FB_X_RES
-#endif
-
-#ifndef FB_Y_VIRTUAL_RES
-#define FB_Y_VIRTUAL_RES FB_Y_RES
-#endif
-
-#ifndef VIDEORAM_SIZE
-#define VIDEORAM_SIZE (FB_X_VIRTUAL_RES * FB_Y_VIRTUAL_RES * FB_BPP / 8)
-#endif
-
-#ifndef FB_IS_GREY
-#define FB_IS_GREY 0
-#endif
-
-#ifndef FB_IS_INVERSE
-#define FB_IS_INVERSE 0
-#endif
-
-#ifndef FB_IS_TRUECOLOR
-#if (FB_BPP >= 16)
-#define FB_IS_TRUECOLOR 1
-#else
-#define FB_IS_TRUECOLOR 0
-#endif
-#endif
-
-#define arraysize(x)	(sizeof(x)/sizeof(*(x)))
-
-const u_long videomemory = VIDEORAM_BASE, videomemorysize = VIDEORAM_SIZE;
+static unsigned long videomemory = CONFIG_FB_SIMPLE_MEMBASE;
+static unsigned long videomemorysize = CONFIG_FB_SIMPLE_MEMSIZE;
 
 static int currcon = 0;
 static struct display disp;
 static struct fb_info fb_info;
-#if !FB_IS_GREY
-#ifdef FB_PALETTE
-static struct { u_char red, green, blue, pad; } palette[256] = FB_PALETTE;
-#else
 static struct { u_char red, green, blue, pad; } palette[256];
-#endif
-#endif
 
-#if defined(FBCON_HAS_CFB8) && FB_IS_TRUECOLOR || defined(FBCON_HAS_CFB16) || \
-    defined(FBCON_HAS_CFB24) || defined(FBCON_HAS_CFB32)
 static union {
-#if defined(FBCON_HAS_CFB8) && FB_IS_TRUECOLOR
+#if defined(FBCON_HAS_CFB8)
     u8 cfb8[16];
 #endif
 #ifdef FBCON_HAS_CFB16
@@ -157,12 +66,14 @@
     u32 cfb32[16];
 #endif
 } fbcon_cmap;
-#endif
 
 static char sfb_name[16] = "Simple FB";
+static char *mode_option __initdata = 0;
+static int inverse = 0;
+static int grayscale = 0;
 
 static struct fb_var_screeninfo sfb_default = {
-    FB_X_RES, FB_Y_RES, FB_X_VIRTUAL_RES, FB_Y_VIRTUAL_RES, 0, 0, FB_BPP, FB_IS_GREY,
+    640, 480, 640, 480, 0, 0, 8, 0,
     {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0},
     0, FB_ACTIVATE_NOW, -1, -1, 0, 20000, 64, 64, 32, 32, 64, 2,
     0, FB_VMODE_NONINTERLACED, {0,0,0,0,0,0}
@@ -231,28 +142,6 @@
     fb_ioctl:       sfb_ioctl,
 };
 
-
-    /*
-     *  Open/Release the frame buffer device
-     */
-
-static int sfb_open(struct fb_info *info, int user)
-{
-    /*                                                                     
-     *  Nothing, only a usage count for the moment                          
-     */                                                                    
-
-    MOD_INC_USE_COUNT;
-    return(0);                              
-}
-        
-static int sfb_release(struct fb_info *info, int user)
-{
-    MOD_DEC_USE_COUNT;
-    return(0);                                                    
-}
-
-
     /*
      *  Get the Fixed Part of the Display
      */
@@ -374,7 +263,7 @@
 	    display->ywrapstep = fix.ywrapstep;
 	    display->line_length = fix.line_length;
 	    display->can_soft_blank = 0;
-	    display->inverse = FB_IS_INVERSE;
+	    display->inverse = inverse;
 	    display->scrollmode = SCROLL_YREDRAW;
 	    switch (var->bits_per_pixel) {
 #ifdef FBCON_HAS_MFB
@@ -507,18 +396,6 @@
     return 0;
 }
 
-
-    /*
-     *  Simple Frame Buffer Specific ioctls
-     */
-
-static int sfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
-		     u_long arg, int con, struct fb_info *info)
-{
-    return -EINVAL;
-}
-
-
 int __init sfb_setup(char *options)
 {
     char *this_opt;
@@ -528,11 +405,21 @@
     if (!options || !*options)
 	return 0;
 
-    for (this_opt = strtok(options, ","); this_opt;
-	 this_opt = strtok(NULL, ",")) {
-	if (!strncmp(this_opt, "font:", 5))
+    while ((this_opt = strsep(&options, ",")) != NULL) {
+    	if (!*this_opt)
+	    continue;
+	if (!strncmp(this_opt, "inverse", 7)) {
+	    inverse = 1;
+	    fb_invert_cmaps();
+	} else if (!strncmp(this_opt, "grayscale", 9)) {
+	    grayscale = 1;
+	} else if (!strncmp(this_opt, "font:", 5)) {
 	    strcpy(fb_info.fontname, this_opt+5);
+	} else {
+	    mode_option = this_opt;
+	}
     }
+
     return 0;
 }
 
@@ -543,6 +430,8 @@
 
 int __init sfb_init(void)
 {
+    struct fb_var_screeninfo var;
+
     strcpy(fb_info.modename, sfb_name);
     fb_info.changevar = NULL;
     fb_info.node = -1;
@@ -553,7 +442,22 @@
     fb_info.blank = &sfbcon_blank;
     fb_info.flags = FBINFO_FLAG_DEFAULT;
 
-    sfb_set_var(&sfb_default, -1, &fb_info);
+    memset(&var, 0, sizeof(var));
+
+    if (!mode_option || !fb_find_mode(&var, &fb_info,
+    				mode_option, NULL, 0, NULL, 8))
+	var = sfb_default;
+
+    /*
+     * Calculate a sane default size if none is specified.
+     */
+    if (!videomemorysize) {
+    	videomemorysize = var.xres_virtual *
+			  var.yres_virtual *
+			  var.bits_per_pixel / 8;
+    }
+
+    sfb_set_var(&var, -1, &fb_info);
 
     if (register_framebuffer(&fb_info) < 0)
 	return -EINVAL;
@@ -563,6 +467,17 @@
     return 0;
 }
 
+static void __exit sfb_exit(void)
+{
+	unregister_framebuffer(&fb_info);
+}
+
+#ifdef MODULE
+module_init(sfb_init);
+#endif
+module_exit(sfb_exit);
+
+MODULE_LICENSE("GPL");
 
 static int sfbcon_switch(int con, struct fb_info *info)
 {
@@ -701,13 +616,6 @@
     var->transp.msb_right = 0;
 }
 
-
-#if FB_IS_TRUECOLOR
-#define MAX_REGNO 15
-#else
-#define MAX_REGNO ((1 << FB_BPP) - 1)
-#endif
-
     /*
      *  Read a single color register and split it into
      *  colors/transparent. Return != 0 for invalid regno.
@@ -722,28 +630,29 @@
 static int sfb_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue,
                          u_int *transp, struct fb_info *info)
 {
-    if (regno > MAX_REGNO)
+    if (regno > 255)
 	return 1;
 
-#if FB_IS_GREY
-    {
+    if (grayscale) {
 	u_int grey;
 
 	grey = regno * 255 / MAX_REGNO;
-#if FB_IS_INVERSE
-	grey ^= 255;
-#endif
+
+	if (inverse)
+	    grey ^= 255;
+
 	grey |= grey << 8;
 	*red = grey;
 	*green = grey;
 	*blue = grey;
+    } else {
+    	*red = (palette[regno].red << 8) | palette[regno].red;
+    	*green = (palette[regno].green << 8) | palette[regno].green;
+    	*blue = (palette[regno].blue << 8) | palette[regno].blue;
     }
-#else /* either truecolor or palatted */
-    *red = (palette[regno].red << 8) | palette[regno].red;
-    *green = (palette[regno].green << 8) | palette[regno].green;
-    *blue = (palette[regno].blue << 8) | palette[regno].blue;
-#endif
+
     *transp = 0;
+
     return 0;
 }
 
@@ -760,10 +669,9 @@
 static int sfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                          u_int transp, struct fb_info *info)
 {
-    if (regno > MAX_REGNO)
+    if (regno > 255)
 	return 1;
 
-#if FB_IS_TRUECOLOR
     red >>= 8;
     green >>= 8;
     blue >>= 8;
@@ -773,36 +681,44 @@
      *  palette is read back, the actual hardware value is returned.  Also, 
      *  maintain index to RGB map for fbcon (accessed through dispsw_data)
      */
-#if (FB_BPP == 8)
-    red   &= 0xe0;
-    green &= 0xe0;
-    blue  &= 0xc0;
+    switch (info->var.bits_per_pixel) {
 #if defined(FBCON_HAS_CFB8)
-    fbcon_cmap.cfb8[regno] = red | (green >> 3) | (blue >> 6);
-#endif 
-#endif 
+	case 8:
+    	    red   &= 0xe0;
+	    green &= 0xe0;
+    	    blue  &= 0xc0;
+    	    fbcon_cmap.cfb8[regno] = red | (green >> 3) | (blue >> 6);
 
-#if (FB_BPP == 16)
-    red   &= 0xF8;
-    green &= 0xFC;
-    blue  &= 0xF8;
-#if defined(FBCON_HAS_CFB16)
-    fbcon_cmap.cfb16[regno] = (red << 8) | (green << 3) | (blue >> 3);
+	    break;
 #endif 
+#if defined(FBCON_HAS_CFB16)
+	case 16:
+    	    red   &= 0xF8;
+    	    green &= 0xFC;
+    	    blue  &= 0xF8;
+    	    fbcon_cmap.cfb16[regno] = (red << 8) | (green << 3) | (blue >> 3);
+	    
+	    break;
 #endif 
+#if defined(FBCON_HAS_CFB24)
+	case 24:
+    	    fbcon_cmap.cfb24[regno] = (red << 16) | (green << 8) | blue;
 
-#if (FB_BPP == 24) && defined(FBCON_HAS_CFB24)
-    fbcon_cmap.cfb24[regno] = (red << 16) | (green << 8) | blue;
+	    break;
 #endif
-
-#if (FB_BPP == 32) && defined(FBCON_HAS_CFB32)
-    fbcon_cmap.cfb32[regno] = (red << 16) | (green << 8) | blue;
+#if defined(FBCON_HAS_CFB32)
+	case 32:
+    	    fbcon_cmap.cfb32[regno] = (red << 16) | (green << 8) | blue;
+	    
+	    break;
 #endif
+	default:
+	    break;
+    }
 
     palette[regno].red = red;
     palette[regno].green = green;
     palette[regno].blue = blue;
-#endif /* FB_IS_TRUECOLOR */
 
     return 0;
 }
@@ -819,16 +735,3 @@
 		    sfb_setcolreg, info);
 }
 
-
-#ifdef MODULE
-int init_module(void)
-{
-    return sfb_init();
-}
-
-void cleanup_module(void)
-{
-    unregister_framebuffer(&fb_info);
-}
-
-#endif /* MODULE */

[Linux-mips-commits]CVS: linux/drivers/sound au1000.c,1.13,1.14

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv25493

Modified Files:
	au1000.c 
Log Message:
Need to completely disable/reenable DMA on playback stop/start, instead
of just a halt/restart. Halt/restart was causing the Au1000 to freeze,
not sure why.


Index: au1000.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/au1000.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- au1000.c	29 May 2002 00:23:16 -0000	1.13
+++ au1000.c	21 Jun 2002 20:57:55 -0000	1.14
@@ -442,8 +442,8 @@
 
 	spin_lock_irqsave(&s->lock, flags);
 
-	halt_dma(db->dmanr);
-
+	disable_dma(db->dmanr);
+	
 	db->stopped = 1;
 
 	spin_unlock_irqrestore(&s->lock, flags);
@@ -459,8 +459,8 @@
 
 	spin_lock_irqsave(&s->lock, flags);
 
-	halt_dma(db->dmanr);
-
+	disable_dma(db->dmanr);
+	
 	db->stopped = 1;
 
 	spin_unlock_irqrestore(&s->lock, flags);
@@ -521,6 +521,7 @@
 
 	set_xmit_slots(db->num_channels);
 
+	init_dma(db->dmanr);
 	if (get_dma_active_buffer(db->dmanr) == 0) {
 		clear_dma_done0(db->dmanr);	// clear DMA done bit
 		set_dma_addr0(db->dmanr, buf1);
@@ -534,7 +535,7 @@
 	enable_dma_buffers(db->dmanr);
 	
 	start_dma(db->dmanr);
-
+	
 #ifdef AU1000_VERBOSE_DEBUG
 	dump_au1000_dma_channel(db->dmanr);
 #endif
@@ -565,6 +566,7 @@
 
 	set_recv_slots(db->num_channels);
 
+	init_dma(db->dmanr);
 	if (get_dma_active_buffer(db->dmanr) == 0) {
 		clear_dma_done0(db->dmanr);	// clear DMA done bit
 		set_dma_addr0(db->dmanr, buf1);
@@ -578,7 +580,7 @@
 	enable_dma_buffers(db->dmanr);
 
 	start_dma(db->dmanr);
-
+	
 #ifdef AU1000_VERBOSE_DEBUG
 	dump_au1000_dma_channel(db->dmanr);
 #endif
@@ -941,6 +943,7 @@
 		tmo /= s->dma_dac.dma_bytes_per_sample;
 		au1000_delay(tmo);
 	}
+
 	if (signal_pending(current))
 		return -ERESTARTSYS;
 	return 0;
@@ -988,7 +991,7 @@
 	for (sample = 0; sample < num_samples; sample++) {
 		if (copy_from_user(usersample, userbuf,
 				   db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ "fault");
+			dbg(__FUNCTION__ ": fault");
 			return -EFAULT;
 		}
 
@@ -1052,7 +1055,7 @@
 
 		if (copy_to_user(userbuf, usersample,
 				 db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ "fault");
+			dbg(__FUNCTION__ ": fault");
 			return -EFAULT;
 		}
 
@@ -1914,8 +1917,13 @@
 	struct au1000_state *s = (struct au1000_state *)file->private_data;
 
 	lock_kernel();
-	if (file->f_mode & FMODE_WRITE)
+	
+	if (file->f_mode & FMODE_WRITE) {
+		unlock_kernel();
 		drain_dac(s, file->f_flags & O_NONBLOCK);
+		lock_kernel();
+	}
+
 	down(&s->open_sem);
 	if (file->f_mode & FMODE_WRITE) {
 		stop_dac(s);
@@ -1927,7 +1935,9 @@
 	}
 	s->open_mode &= ((~file->f_mode) & (FMODE_READ|FMODE_WRITE));
 	up(&s->open_sem);
+
 	wake_up(&s->open_wait);
+
 	unlock_kernel();
 	return 0;
 }

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1000 setup.c,1.21,1.22

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000
In directory usw-pr-cvs1:/tmp/cvs-serv26589/arch/mips/au1000/pb1000

Modified Files:
	setup.c 
Log Message:
minor cleanup


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- setup.c	18 Jun 2002 23:07:27 -0000	1.21
+++ setup.c	20 Jun 2002 18:18:18 -0000	1.22
@@ -278,11 +278,6 @@
 	au_writel(0, UART3_ADDR + UART_CLK);
 
 #ifdef CONFIG_BLK_DEV_IDE
-	if (0)
-	{
-		argptr = prom_getcmdline();
-		strcat(argptr, " ide0=noprobe");
-	}
 	ide_ops = &std_ide_ops;
 #endif
 

[Linux-mips-commits]CVS: linux/arch/mips/au1000/common serial.c,1.9,1.10

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv29442/arch/mips/au1000/common

Modified Files:
	serial.c 
Log Message:
Do not disable the serial port after an autoconfig, only after
a shutdown.


Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/serial.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serial.c	1 May 2002 18:00:29 -0000	1.9
+++ serial.c	19 Jun 2002 01:50:10 -0000	1.10
@@ -2548,11 +2548,6 @@
 	serial_outp(info, UART_FCR, 0);
 	(void)serial_in(info, UART_RX);
 	serial_outp(info, UART_IER, 0);
-
-#ifndef CONFIG_REMOTE_DEBUG
-	au_writel(0, UART_MOD_CNTRL + state->port);
-	au_sync_delay(10);
-#endif
 	restore_flags(flags);
 }
 

[Linux-mips-commits]CVS: linux/include/asm-mips bootinfo.h,1.30,1.31

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv23959/include/asm-mips

Modified Files:
	bootinfo.h 
Log Message:
Fixed the pcmcia timing so the IBM Microdrive will work
(patch by Alchemy/AMD).  Moved the pcmcia chip select setup to 
setup.c instead of au1000_generic.c, since not all boards will use the
same chip select.


Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- bootinfo.h	9 May 2002 17:22:35 -0000	1.30
+++ bootinfo.h	18 Jun 2002 23:07:27 -0000	1.31
@@ -158,7 +158,8 @@
  * Valid machtype for group Alchemy
  */
 #define MACH_PB1000	0	         /* Au1000-based eval board */
-#define MACH_PB1500	1	         /* Au1500-based eval board */
+#define MACH_PB1100	1	         /* Au1100-based eval board */
+#define MACH_PB1500	2	         /* Au1500-based eval board */
 
 /*
  * Valid machtype for group IDT

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1000 setup.c,1.20,1.21

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000
In directory usw-pr-cvs1:/tmp/cvs-serv23959/arch/mips/au1000/pb1000

Modified Files:
	setup.c 
Log Message:
Fixed the pcmcia timing so the IBM Microdrive will work
(patch by Alchemy/AMD).  Moved the pcmcia chip select setup to 
setup.c instead of au1000_generic.c, since not all boards will use the
same chip select.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- setup.c	1 May 2002 18:00:29 -0000	1.20
+++ setup.c	18 Jun 2002 23:07:27 -0000	1.21
@@ -249,6 +249,11 @@
 	au_writel(0x83, MEM_STCFG1);         // ewait enabled, flash timing
 	au_writel(0x33030a10, MEM_STTIME1);   // slower timing for FPGA
 
+	/* setup the static bus controller */
+	au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
+	au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
+	au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
+
 #ifdef CONFIG_FB_E1356
 	if ((argptr = strstr(argptr, "video=")) == NULL) {
 		argptr = prom_getcmdline();

[Linux-mips-commits]CVS: linux/drivers/pcmcia au1000_generic.c,1.12,1.13

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv23959/drivers/pcmcia

Modified Files:
	au1000_generic.c 
Log Message:
Fixed the pcmcia timing so the IBM Microdrive will work
(patch by Alchemy/AMD).  Moved the pcmcia chip select setup to 
setup.c instead of au1000_generic.c, since not all boards will use the
same chip select.


Index: au1000_generic.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_generic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- au1000_generic.c	1 May 2002 18:00:30 -0000	1.12
+++ au1000_generic.c	18 Jun 2002 23:07:27 -0000	1.13
@@ -166,12 +166,7 @@
 		return -EIO;
 	}
 
-	/* setup the static bus controller */
-	timing3 = 0x100e3a07;
-	au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
-	au_writel(timing3, MEM_STTIME3); 
-	au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-	au_sync_delay(1);
+	/* NOTE: the chip select must already be setup */
 
 	pcmcia_socket = 
 		kmalloc(sizeof(struct au1000_pcmcia_socket) * socket_count, 

[Linux-mips-commits]CVS: linux/drivers/mtd/maps Config.in,1.3,1.4

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/mtd/maps
In directory usw-pr-cvs1:/tmp/cvs-serv23959/drivers/mtd/maps

Modified Files:
	Config.in 
Log Message:
Fixed the pcmcia timing so the IBM Microdrive will work
(patch by Alchemy/AMD).  Moved the pcmcia chip select setup to 
setup.c instead of au1000_generic.c, since not all boards will use the
same chip select.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/mtd/maps/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	12 Apr 2002 20:45:07 -0000	1.3
+++ Config.in	18 Jun 2002 23:07:27 -0000	1.4
@@ -42,8 +42,8 @@
    dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
    if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \
 	-o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then
-      bool '  Pb[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT 
-      bool '  Pb[15]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
+      bool '  Pb1[015]00 boot flash device' CONFIG_MTD_PB1500_BOOT 
+      bool '  Pb1[015]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
    fi
    dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS 
    if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then

[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1100 init.c,1.1,1.2 setup.c,1.4,1.5

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100
In directory usw-pr-cvs1:/tmp/cvs-serv23959/arch/mips/au1000/pb1100

Modified Files:
	init.c setup.c 
Log Message:
Fixed the pcmcia timing so the IBM Microdrive will work
(patch by Alchemy/AMD).  Moved the pcmcia chip select setup to 
setup.c instead of au1000_generic.c, since not all boards will use the
same chip select.


Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c	2 Apr 2002 22:59:39 -0000	1.1
+++ init.c	18 Jun 2002 23:07:27 -0000	1.2
@@ -59,7 +59,7 @@
 	prom_envp = envp;
 
 	mips_machgroup = MACH_GROUP_ALCHEMY;
-	mips_machtype = MACH_PB1000;  
+	mips_machtype = MACH_PB1100;  
 
 	prom_init_cmdline();
 	memsize_str = prom_getenv("memsize");

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c	1 May 2002 18:00:30 -0000	1.4
+++ setup.c	18 Jun 2002 23:07:27 -0000	1.5
@@ -173,6 +173,11 @@
 	sys_clksrc |= ((4<<2) | (0<<1) | 0 );
 	au_writel(sys_clksrc, SYS_CLKSRC);
 
+	/* setup the static bus controller */
+	au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
+	au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
+	au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
+
 	// get USB Functionality pin state (device vs host drive pins)	
 	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
 #ifndef CONFIG_AU1000_USB_DEVICE

[Linux-mips-commits]CVS: linux/drivers/pcmcia au1000_pb1x00.c,1.4,1.5

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv8574/drivers/pcmcia

Modified Files:
	au1000_pb1x00.c 
Log Message:
Dual slot bug fix.


Index: au1000_pb1x00.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_pb1x00.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- au1000_pb1x00.c	1 May 2002 18:00:30 -0000	1.4
+++ au1000_pb1x00.c	18 Jun 2002 20:09:02 -0000	1.5
@@ -313,9 +313,15 @@
 			break;
 	}
 
-	pcr &= ~(PCR_SLOT_0_RST);
-	if (configure->reset) {
-		pcr |= PCR_SLOT_0_RST;
+	if (configure->sock == 0) {
+		pcr &= ~(PCR_SLOT_0_RST);
+		if (configure->reset)
+			pcr |= PCR_SLOT_0_RST;
+	}
+	else {
+		pcr &= ~(PCR_SLOT_1_RST);
+		if (configure->reset)
+			pcr |= PCR_SLOT_1_RST;
 	}
 	au_writel(pcr, PB1000_PCR);
 	au_sync_delay(300);

[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-79EB355-be,1.1,1.2 defconfig-79EB355-le,1.1,1.2 defconfig-79S334-be,1.3,1.4 defconfig-79S334-le,1.3,1.4 defconfig-atlas,1.13,1.14 defconfig-casio-be300,1.3,1.4 defconfig-casio-e15,1.6,1.7 defconfig-casio-e55,1.1,1.2 defconfig-cobalt,1.16,1.17 defconfig-ddb5476,1.17,1.18 defconfig-ddb5477,1.17,1.18 defconfig-decstation,1.14,1.15 defconfig-eagle,1.14,1.15 defconfig-ev64120,1.13,1.14 defconfig-ev96100,1.14,1.15 defconfig-hp-lj,1.3,1.4 defconfig-ip22,1.15,1.16 defconfig-it8172,1.18,1.19 defconfig-ivr,1.3,1.4 defconfig-jmr3927,1.6,1.7 defconfig-korva,1.9,1.10 defconfig-lexra,1.1,1.2 defconfig-malta,1.13,1.14 defconfig-nino,1.17,1.18 defconfig-ocelot,1.13,1.14 defconfig-osprey,1.13,1.14 defconfig-pb1100,1.7,1.8 defconfig-pb1500,1.6,1.7 defconfig-rm200,1.13,1.14 defconfig-sb1250-swarm,1.9,1.10 defconfig-spartacus,1.2,1.3 defconfig-workpad,1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/configs
In directory usw-pr-cvs1:/tmp/cvs-serv14429

Modified Files:
	defconfig-79EB355-be defconfig-79EB355-le defconfig-79S334-be 
	defconfig-79S334-le defconfig-atlas defconfig-casio-be300 
	defconfig-casio-e15 defconfig-casio-e55 defconfig-cobalt 
	defconfig-ddb5476 defconfig-ddb5477 defconfig-decstation 
	defconfig-eagle defconfig-ev64120 defconfig-ev96100 
	defconfig-hp-lj defconfig-ip22 defconfig-it8172 defconfig-ivr 
	defconfig-jmr3927 defconfig-korva defconfig-lexra 
	defconfig-malta defconfig-nino defconfig-ocelot 
	defconfig-osprey defconfig-pb1100 defconfig-pb1500 
	defconfig-rm200 defconfig-sb1250-swarm defconfig-spartacus 
	defconfig-workpad 
Log Message:
defconfig updates all around.



Index: defconfig-79EB355-be
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-79EB355-be,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-79EB355-be	29 Apr 2002 23:05:11 -0000	1.1
+++ defconfig-79EB355-be	14 Jun 2002 16:35:59 -0000	1.2
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@@ -10,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -36,45 +54,27 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1100 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_MIPS_RC32355=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
 # CONFIG_PCI is not set
 CONFIG_NONCOHERENT_IO=y
 # CONFIG_SWAP_IO_SPACE is not set
-CONFIG_EISA=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -104,28 +104,28 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
 # CONFIG_BINFMT_IRIX is not set
 # CONFIG_FORWARD_KEYBOARD is not set
-# CONFIG_ARC_CONSOLE is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -138,6 +138,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -199,6 +205,10 @@
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -225,27 +235,11 @@
 # CONFIG_PHONE_IXJ_PCMCIA is not set
 
 #
-# ATA/IDE/MFM/RLL support
-#
-# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
 # SCSI support
 #
 # CONFIG_SCSI is not set
 
 #
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -264,7 +258,6 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_MIPS_JAZZ_SONIC is not set
 CONFIG_MIPS_RC32355_ETH=y
 # CONFIG_SUNLANCE is not set
 # CONFIG_SUNBMAC is not set
@@ -274,9 +267,6 @@
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
 # CONFIG_NET_ISA is not set
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_POCKET is not set
@@ -331,11 +321,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -361,6 +346,14 @@
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -480,11 +473,23 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -496,16 +501,44 @@
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+
+#
+#   Input core support is needed for USB HID
+#
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -538,6 +571,10 @@
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #

Index: defconfig-79EB355-le
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-79EB355-le,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-79EB355-le	29 Apr 2002 23:05:11 -0000	1.1
+++ defconfig-79EB355-le	14 Jun 2002 16:35:59 -0000	1.2
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@@ -10,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -36,46 +54,27 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1100 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_MIPS_RC32355=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
 # CONFIG_PCI is not set
 CONFIG_NONCOHERENT_IO=y
 # CONFIG_SWAP_IO_SPACE is not set
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -105,19 +104,26 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -130,6 +136,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -191,6 +203,10 @@
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -217,27 +233,11 @@
 # CONFIG_PHONE_IXJ_PCMCIA is not set
 
 #
-# ATA/IDE/MFM/RLL support
-#
-# CONFIG_IDE is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
 # SCSI support
 #
 # CONFIG_SCSI is not set
 
 #
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -319,11 +319,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -349,6 +344,14 @@
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -468,11 +471,23 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -484,16 +499,44 @@
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+
+#
+#   Input core support is needed for USB HID
+#
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -526,6 +569,10 @@
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #

Index: defconfig-79S334-be
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-79S334-be,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defconfig-79S334-be	29 Apr 2002 23:05:11 -0000	1.3
+++ defconfig-79S334-be	14 Jun 2002 16:35:59 -0000	1.4
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@@ -10,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -36,26 +54,14 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1100 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_MIPS_RC32334=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
@@ -64,20 +70,13 @@
 CONFIG_PCI_AUTO=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -107,22 +106,28 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
 # CONFIG_BINFMT_IRIX is not set
 # CONFIG_FORWARD_KEYBOARD is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
 CONFIG_PCI_NAMES=y
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -135,6 +140,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -185,6 +196,10 @@
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -347,11 +362,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -377,6 +387,14 @@
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -495,11 +513,23 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -511,16 +541,44 @@
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+
+#
+#   Input core support is needed for USB HID
+#
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -553,6 +611,10 @@
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #

Index: defconfig-79S334-le
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-79S334-le,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defconfig-79S334-le	29 Apr 2002 23:05:11 -0000	1.3
+++ defconfig-79S334-le	14 Jun 2002 16:35:59 -0000	1.4
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@@ -10,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -36,26 +54,14 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1100 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_MIPS_RC32334=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
@@ -64,20 +70,13 @@
 CONFIG_PCI_AUTO=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -107,20 +106,26 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
 CONFIG_PCI_NAMES=y
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -133,6 +138,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -193,6 +204,10 @@
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -355,11 +370,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -385,6 +395,14 @@
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -503,11 +521,23 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -519,16 +549,44 @@
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+
+#
+#   Input core support is needed for USB HID
+#
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -561,6 +619,10 @@
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #

Index: defconfig-atlas
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-atlas,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defconfig-atlas	12 Feb 2002 18:21:25 -0000	1.13
+++ defconfig-atlas	14 Jun 2002 16:35:59 -0000	1.14
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
+CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -9,22 +10,38 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 CONFIG_MIPS_ATLAS=y
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -32,42 +49,29 @@
 # CONFIG_NEC_MOBILEPRO is not set
 # CONFIG_IDT_79S334 is not set
 # CONFIG_IDT_79EB355 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
+# CONFIG_IBM_WORKPAD is not set
+# CONFIG_CASIO_E55 is not set
+# CONFIG_VICTOR_MPC303 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
-CONFIG_NEW_TIME_C=y
 CONFIG_NEW_IRQ=y
+CONFIG_NEW_TIME_C=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PCI=y
 CONFIG_SWAP_IO_SPACE=y
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -97,22 +101,29 @@
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
+# CONFIG_VR4122_CLKSPEEDREG_FIX is not set
 CONFIG_BINFMT_IRIX=y
 # CONFIG_FORWARD_KEYBOARD is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
 # CONFIG_PCI_NAMES is not set
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_SYSCTL is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -125,6 +136,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -306,6 +323,7 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -315,7 +333,6 @@
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
-# CONFIG_SUNLANCE is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_LANCE is not set
@@ -376,11 +393,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -607,6 +619,7 @@
 # CONFIG_USB_SERIAL_EMPEG is not set
 # CONFIG_USB_SERIAL_FTDI_SIO is not set
 # CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
@@ -620,6 +633,7 @@
 # CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
 # CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set

Index: defconfig-casio-be300
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-be300,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defconfig-casio-be300	9 Mar 2002 08:03:53 -0000	1.3
+++ defconfig-casio-be300	14 Jun 2002 16:35:59 -0000	1.4
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
+CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -9,22 +10,38 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 CONFIG_CASIO_BE300=y
 # CONFIG_CASIO_E15 is not set
@@ -35,25 +52,14 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_CPU_VR41XX=y
 CONFIG_VR4122=y
 CONFIG_VR4131=y
@@ -67,18 +73,13 @@
 CONFIG_NEW_PCI=y
 CONFIG_PCI_AUTO=y
 CONFIG_SERIAL=y
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 CONFIG_CPU_VR41XX=y
@@ -108,20 +109,26 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 CONFIG_VR4131_CACHE_FIX=y
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 # CONFIG_NET is not set
 # CONFIG_PCI_NAMES is not set
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_SYSCTL is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -134,6 +141,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -193,15 +206,6 @@
 # CONFIG_HAMRADIO is not set
 
 #
-# ISDN subsystem
-#
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 CONFIG_VT=y
@@ -213,6 +217,9 @@
 CONFIG_VRC4173=y
 # CONFIG_VRC4173_PS2U is not set
 # CONFIG_VRC4173_PIU is not set
+# CONFIG_TOUCH_PANEL is not set
+# CONFIG_BUTTONS is not set
+# CONFIG_ADIF is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
 

Index: defconfig-casio-e15
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-e15,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defconfig-casio-e15	13 Jun 2002 12:57:33 -0000	1.6
+++ defconfig-casio-e15	14 Jun 2002 16:35:59 -0000	1.7
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@@ -211,6 +211,10 @@
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -245,6 +249,10 @@
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_IDEDISK=y
@@ -263,6 +271,10 @@
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
+
+#
+# IDE chipset support/bugfixes
+#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -366,10 +378,18 @@
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 # CONFIG_IRDA_FAST_RR is not set
 # CONFIG_IRDA_DEBUG is not set
@@ -377,9 +397,21 @@
 #
 # Infrared-port device drivers
 #
+
+#
+# SIR device drivers
+#
 CONFIG_IRTTY_SIR=m
 CONFIG_IRPORT_SIR=m
+
+#
+# Dongle support
+#
 # CONFIG_DONGLE is not set
+
+#
+# FIR device drivers
+#
 # CONFIG_USB_IRDA is not set
 # CONFIG_NSC_FIR is not set
 # CONFIG_WINBOND_FIR is not set
@@ -432,6 +464,14 @@
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -674,11 +714,23 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -690,16 +742,44 @@
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+
+#
+#   Input core support is needed for USB HID
+#
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -732,6 +812,10 @@
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #

Index: defconfig-casio-e55
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-e55,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-casio-e55	7 Mar 2002 03:16:52 -0000	1.1
+++ defconfig-casio-e55	14 Jun 2002 16:35:59 -0000	1.2
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
+CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -9,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -35,25 +54,14 @@
 # CONFIG_IBM_WORKPAD is not set
 CONFIG_CASIO_E55=y
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_CPU_VR41XX=y
 CONFIG_VR4111=y
 CONFIG_NEW_IRQ=y
@@ -66,19 +74,13 @@
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_DUMMY_KEYB=y
 # CONFIG_SCSI is not set
-CONFIG_EISA=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 CONFIG_CPU_VR41XX=y
@@ -108,25 +110,25 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
+# CONFIG_PCI is not set
+CONFIG_EISA=y
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -139,6 +141,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -268,15 +276,6 @@
 # CONFIG_SCSI is not set
 
 #
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -359,6 +358,9 @@
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_TOUCH_PANEL is not set
+# CONFIG_BUTTONS is not set
+# CONFIG_ADIF is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
 
@@ -407,6 +409,21 @@
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_INDYDOG is not set
 # CONFIG_VR41XX_WDT is not set
+# CONFIG_TX4927_WDT is not set
+# CONFIG_INTEL_RNG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_MIPS_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
 
 #
 # Multimedia devices

Index: defconfig-cobalt
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-cobalt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- defconfig-cobalt	12 Feb 2002 18:21:25 -0000	1.16
+++ defconfig-cobalt	14 Jun 2002 16:35:59 -0000	1.17
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
+CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -9,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -32,39 +51,24 @@
 # CONFIG_NEC_MOBILEPRO is not set
 # CONFIG_IDT_79S334 is not set
 # CONFIG_IDT_79EB355 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
+# CONFIG_IBM_WORKPAD is not set
+# CONFIG_CASIO_E55 is not set
+# CONFIG_VICTOR_MPC303 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -93,19 +97,27 @@
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-# CONFIG_CPU_FREQ is not set
+# CONFIG_VR4122_CLKSPEEDREG_FIX is not set
 CONFIG_NET=y
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -118,6 +130,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -195,66 +213,11 @@
 # CONFIG_PHONE_IXJ_PCMCIA is not set
 
 #
-# ATA/IDE/MFM/RLL support
-#
-CONFIG_IDE=y
-
-#
-# IDE, ATA and ATAPI Block devices
-#
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
-# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
-# CONFIG_BLK_DEV_IDEDISK_IBM is not set
-# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
-# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
-# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
-# CONFIG_BLK_DEV_IDEDISK_WD is not set
-# CONFIG_BLK_DEV_COMMERIAL is not set
-# CONFIG_BLK_DEV_TIVO is not set
-# CONFIG_BLK_DEV_IDECS 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
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-# CONFIG_BLK_DEV_ISAPNP is not set
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_IDE_MODES is not set
-# CONFIG_BLK_DEV_ATARAID is not set
-# CONFIG_BLK_DEV_ATARAID_PDC is not set
-# CONFIG_BLK_DEV_ATARAID_HPT is not set
-
-#
 # SCSI support
 #
 # CONFIG_SCSI is not set
 
 #
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -267,6 +230,7 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -275,7 +239,6 @@
 # CONFIG_SUNLANCE is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
-# CONFIG_SUNLANCE is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_LANCE is not set
@@ -335,11 +298,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -503,6 +461,10 @@
 #
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -565,6 +527,7 @@
 # CONFIG_USB_SERIAL_EMPEG is not set
 # CONFIG_USB_SERIAL_FTDI_SIO is not set
 # CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
@@ -578,6 +541,7 @@
 # CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
 # CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set

Index: defconfig-ddb5476
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5476,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- defconfig-ddb5476	12 Feb 2002 18:21:25 -0000	1.17
+++ defconfig-ddb5476	14 Jun 2002 16:35:59 -0000	1.18
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
+CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -9,22 +10,38 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+CONFIG_DDB5476=y
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -32,25 +49,17 @@
 # CONFIG_NEC_MOBILEPRO is not set
 # CONFIG_IDT_79S334 is not set
 # CONFIG_IDT_79EB355 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-CONFIG_DDB5476=y
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
+# CONFIG_IBM_WORKPAD is not set
+# CONFIG_CASIO_E55 is not set
+# CONFIG_VICTOR_MPC303 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_ISA=y
 CONFIG_PCI=y
 CONFIG_PC_KEYB=y
@@ -62,17 +71,13 @@
 CONFIG_PCI_AUTO=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NONCOHERENT_IO=y
-CONFIG_EISA=y
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -101,26 +106,26 @@
 CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_CPU_FREQ is not set
+# CONFIG_VR4122_CLKSPEEDREG_FIX is not set
 CONFIG_NET=y
 # CONFIG_PCI_NAMES is not set
+CONFIG_EISA=y
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 # CONFIG_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -133,6 +138,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -318,6 +329,7 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -327,7 +339,6 @@
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
-# CONFIG_SUNLANCE is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_LANCE is not set
@@ -343,12 +354,12 @@
 # CONFIG_AC3200 is not set
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
+# CONFIG_TC35815 is not set
 CONFIG_TULIP=y
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_DE4X5 is not set
 # CONFIG_DGRS is not set
-# CONFIG_TC35815 is not set
 # CONFIG_DM9102 is not set
 CONFIG_EEPRO100=y
 # CONFIG_LNE390 is not set
@@ -362,6 +373,7 @@
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_NEW_RX_RESET is not set
 # CONFIG_SIS900 is not set
 # CONFIG_EPIC100 is not set
 # CONFIG_SUNDANCE is not set
@@ -597,9 +609,11 @@
 # CONFIG_FB_SIS is not set
 CONFIG_FB_3DFX=y
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_E1356 is not set
 # CONFIG_FB_IT8181 is not set
 # CONFIG_FB_SIMPLE is not set
+# CONFIG_FB_HPCSFB is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
 CONFIG_FBCON_CFB8=y
@@ -632,6 +646,10 @@
 #
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -694,6 +712,7 @@
 # CONFIG_USB_SERIAL_EMPEG is not set
 # CONFIG_USB_SERIAL_FTDI_SIO is not set
 # CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
@@ -707,6 +726,7 @@
 # CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
 # CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_PL2303 is not set
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set

Index: defconfig-ddb5477
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5477,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- defconfig-ddb5477	12 Feb 2002 18:21:25 -0000	1.17
+++ defconfig-ddb5477	14 Jun 2002 16:35:59 -0000	1.18
@@ -2,6 +2,7 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
+CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -9,22 +10,38 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is n...
 
[truncated message content]

[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-pb1000,1.23,1.24

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/configs
In directory usw-pr-cvs1:/tmp/cvs-serv12064/arch/mips/configs

Modified Files:
	defconfig-pb1000 
Log Message:
update


Index: defconfig-pb1000
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1000,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- defconfig-pb1000	1 May 2002 18:00:30 -0000	1.23
+++ defconfig-pb1000	14 Jun 2002 16:25:53 -0000	1.24
@@ -10,22 +10,41 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+CONFIG_MIPS_PB1000=y
+CONFIG_PCI_AUTO=y
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
@@ -36,47 +55,28 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_DDB5476 is not set
-# CONFIG_DDB5477 is not set
-# CONFIG_NEC_OSPREY is not set
-# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
+# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-CONFIG_MIPS_PB1000=y
-CONFIG_PCI_AUTO=y
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1100 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_MIPS_AU1000=y
 CONFIG_NEW_IRQ=y
 CONFIG_PCI=y
 CONFIG_NEW_PCI=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PC_KEYB=y
-# CONFIG_ISA is not set
-# CONFIG_EISA is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+CONFIG_SWAP_IO_SPACE=y
+CONFIG_AU1000_USB_DEVICE=y
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 # CONFIG_CPU_VR41XX is not set
@@ -95,6 +95,7 @@
 # CONFIG_CPU_MIPS64 is not set
 # CONFIG_CPU_RC32300 is not set
 CONFIG_CPU_HAS_PREFETCH=y
+# CONFIG_VTAG_ICACHE is not set
 CONFIG_64BIT_PHYS_ADDR=y
 CONFIG_CPU_ADVANCED=y
 CONFIG_CPU_HAS_LLSC=y
@@ -108,15 +109,13 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
-CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_PM is not set
-# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
 CONFIG_PCI_NAMES=y
+# CONFIG_ISA is not set
+# CONFIG_EISA is not set
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
 CONFIG_HOTPLUG=y
 
 #
@@ -140,6 +139,13 @@
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_CPU_FREQ is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -211,6 +217,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -495,11 +507,6 @@
 # CONFIG_ISDN is not set
 
 #
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
 # Character devices
 #
 CONFIG_VT=y
@@ -527,6 +534,8 @@
 # CONFIG_SERIAL_TX3912_CONSOLE is not set
 CONFIG_AU1000_UART=y
 CONFIG_AU1000_SERIAL_CONSOLE=y
+# CONFIG_AU1000_USB_TTY is not set
+# CONFIG_AU1000_USB_RAW is not set
 # CONFIG_TXX927_SERIAL is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
@@ -696,7 +705,7 @@
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_TRIDENT is not set
 CONFIG_FB_E1356=y
-# CONFIG_PB1000_CRT is not set
+CONFIG_PB1000_CRT=y
 # CONFIG_PB1000_NTSC is not set
 # CONFIG_PB1000_TFT is not set
 # CONFIG_FB_IT8181 is not set

[Linux-mips-commits]CVS: linux/include/asm-mips vr41xx.h,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv20226/include/asm-mips

Modified Files:
	vr41xx.h 
Log Message:
Kill off the need for platform specific vr41xx_board_irq_init(). Calling
vr41xx_board_irq_init() will be a nop on platforms that don't specifically
assign a value to board_irq_init. See eagle for an example.



Index: vr41xx.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/vr41xx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vr41xx.h	7 Mar 2002 03:16:55 -0000	1.3
+++ vr41xx.h	14 Jun 2002 15:02:16 -0000	1.4
@@ -6,6 +6,7 @@
  * Copyright (C) 1999 Michael Klar
  * Copyright (C) 2001, 2002 Paul Mundt
  * Copyright (C) 2002 MontaVista Software, Inc.
+ * Copyright (C) 2002 TimeSys Corp.
  *
  * 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 the
@@ -65,6 +66,7 @@
 	int (*get_irq_number)(int irq);
 };
 
+extern void (*board_irq_init)(void);
 extern void vr41xx_board_irq_init(void);
 extern void vr41xx_cascade_irq(unsigned int irq, int (*get_irq_number)(int irq));
 

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4181/osprey Makefile,1.2,1.3 irq.c,1.1,NONE

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4181/osprey
In directory usw-pr-cvs1:/tmp/cvs-serv20226/arch/mips/vr41xx/vr4181/osprey

Modified Files:
	Makefile 
Removed Files:
	irq.c 
Log Message:
Kill off the need for platform specific vr41xx_board_irq_init(). Calling
vr41xx_board_irq_init() will be a nop on platforms that don't specifically
assign a value to board_irq_init. See eagle for an example.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4181/osprey/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	14 Jun 2002 14:12:19 -0000	1.2
+++ Makefile	14 Jun 2002 15:02:16 -0000	1.3
@@ -13,7 +13,7 @@
 
 O_TARGET := osprey.o
 
-obj-y	 := setup.o prom.o irq.o
+obj-y	 := setup.o prom.o
 
 obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o
 

--- irq.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4121/workpad Makefile,1.1,1.2 irq.c,1.1,NONE

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad
In directory usw-pr-cvs1:/tmp/cvs-serv20226/arch/mips/vr41xx/vr4121/workpad

Modified Files:
	Makefile 
Removed Files:
	irq.c 
Log Message:
Kill off the need for platform specific vr41xx_board_irq_init(). Calling
vr41xx_board_irq_init() will be a nop on platforms that don't specifically
assign a value to board_irq_init. See eagle for an example.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/workpad/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	7 Mar 2002 03:16:54 -0000	1.1
+++ Makefile	14 Jun 2002 15:02:15 -0000	1.2
@@ -15,7 +15,7 @@
 
 all: workpad.o
 
-obj-y	:= init.o irq.o setup.o
+obj-y	:= init.o setup.o
 
 obj-$(CONFIG_IDE)	+= ide-workpad.o
 

--- irq.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4111/casio-e55 Makefile,1.1,1.2 irq.c,1.1,NONE

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e55
In directory usw-pr-cvs1:/tmp/cvs-serv20226/arch/mips/vr41xx/vr4111/casio-e55

Modified Files:
	Makefile 
Removed Files:
	irq.c 
Log Message:
Kill off the need for platform specific vr41xx_board_irq_init(). Calling
vr41xx_board_irq_init() will be a nop on platforms that don't specifically
assign a value to board_irq_init. See eagle for an example.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e55/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	7 Mar 2002 03:16:53 -0000	1.1
+++ Makefile	14 Jun 2002 15:02:15 -0000	1.2
@@ -15,7 +15,7 @@
 
 all: casio-e55.o
 
-obj-y	:= init.o irq.o setup.o
+obj-y	:= init.o setup.o
 
 obj-$(CONFIG_IDE)	+= ide-e55.o
 

--- irq.c DELETED ---

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4122/mp-c303 Makefile,1.1,1.2 irq.c,1.1,NONE

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/mp-c303
In directory usw-pr-cvs1:/tmp/cvs-serv20226/arch/mips/vr41xx/vr4122/mp-c303

Modified Files:
	Makefile 
Removed Files:
	irq.c 
Log Message:
Kill off the need for platform specific vr41xx_board_irq_init(). Calling
vr41xx_board_irq_init() will be a nop on platforms that don't specifically
assign a value to board_irq_init. See eagle for an example.



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/mp-c303/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	7 Mar 2002 03:16:54 -0000	1.1
+++ Makefile	14 Jun 2002 15:02:15 -0000	1.2
@@ -15,7 +15,7 @@
 
 all: mp-c303.o
 
-obj-y	:= init.o irq.o setup.o
+obj-y	:= init.o setup.o
 
 obj-$(CONFIG_IDE)	+= ide-mpc303.o
 obj-$(CONFIG_PCI)	+= pci_fixup.o

--- irq.c DELETED ---