linux-mips-commits Mailing List for Linux Mips (Page 28)

Brought to you by: jsimmons, lethal

linux-mips-commits — CVS Commit Patches

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (165)	Sep (240)	Oct (424)	Nov (526)	Dec (293)
2002	Jan (242)	Feb (149)	Mar (143)	Apr (143)	May (76)	Jun (59)	Jul (20)	Aug (2)	Sep (49)	Oct (1)	Nov (4)	Dec
2003	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2004	Jan	Feb	Mar	Apr (2)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (3)	Nov	Dec
2009	Jan	Feb	Mar	Apr	May (1)	Jun (72)	Jul (36)	Aug (9)	Sep (16)	Oct (23)	Nov (9)	Dec (3)
2010	Jan	Feb (1)	Mar (35)	Apr (44)	May (56)	Jun (71)	Jul (41)	Aug (41)	Sep (22)	Oct (3)	Nov (1)	Dec (1)
2011	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2014	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct (1)	Nov (1)	Dec
2016	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar (1)	Apr (1)	May (1)	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov	Dec
2021	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (25)	Oct (105)	Nov (15)	Dec
2025	Jan (1)	Feb	Mar	Apr	May (4)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 26 27 28 29 30 .. 105 > >> (Page 28 of 105)

[Linux-mips-commits]CVS: linux/arch/mips64 config.in,1.13,1.14

From: James S. <jsi...@us...> - 2002-02-14 20:42:07

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

Modified Files:
	config.in 
Log Message:
Cleanup Sibyte config.in fragment. Remove duplicate CONFIG_SMP statement for Sibyte. Sibyte uses 32-bit ELF for booting.

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- config.in	28 Jan 2002 20:31:57 -0000	1.13
+++ config.in	14 Feb 2002 20:42:00 -0000	1.14
@@ -23,11 +23,11 @@
    bool '  Support for SGI-IP22 (Indy/Indigo2)' CONFIG_SGI_IP22
    bool '  Support for SGI-IP32 (O2)' CONFIG_SGI_IP32
 fi
-bool '  Support for SiByte SWARM board' CONFIG_SIBYTE_SWARM
-   if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
-      bool '  Support for SB1250 onchip PCI controller' CONFIG_PCI
-      bool '  Support for SB1250 profiling - SB1/SCD perf counters' CONFIG_SIBYTE_SB1250_PROF
-      bool '  Support for BCM1250 profiling using trace buffer' CONFIG_BCM1250_TBPROF
+bool 'Support for SiByte SB1250 SOC' CONFIG_SIBYTE_SB1250
+if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
+   bool '  Support for SB1250 onchip PCI controller' CONFIG_PCI
+   bool '  Support for SB1250 profiling - SB1/SCD perf counters' CONFIG_SIBYTE_SB1250_PROF
+   bool '  Support for BCM1250 profiling using trace buffer' CONFIG_BCM1250_TBPROF
    bool '  Remote debugging (kgdb over UART 1)' CONFIG_REMOTE_DEBUG
    bool '  Support for SiByte SWARM board' CONFIG_SIBYTE_SWARM
    if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
@@ -38,7 +38,6 @@
    fi
 fi
 
-
 if [ "$CONFIG_SGI_IP27" = "y" ]; then
    bool '  IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
    bool '  Discontiguous Memory Support' CONFIG_DISCONTIGMEM
@@ -49,9 +48,6 @@
    bool '  Multi-Processing support' CONFIG_SMP
    #bool '  IP27 XXL' CONFIG_SGI_SN0_XXL
 fi
-if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
-   bool '  Multi-Processing support' CONFIG_SMP
-fi
 endmenu
 
 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
@@ -113,7 +109,7 @@
 fi
 
 if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
-   define_bool CONFIG_BOOT_ELF64 y
+   define_bool CONFIG_BOOT_ELF32 y
    define_bool CONFIG_SWAP_IO_SPACE y
    define_bool CONFIG_CFE y
    define_bool CONFIG_SIBYTE_SB1250 y

[Linux-mips-commits]CVS: linux/arch/mips/mm ioremap.c,1.3,1.4

From: James S. <jsi...@us...> - 2002-02-14 20:40:36

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

Modified Files:
	ioremap.c 
Log Message:
Change type of last_addr to phys_t.

Index: ioremap.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/ioremap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ioremap.c	2 Jan 2002 18:20:18 -0000	1.3
+++ ioremap.c	14 Feb 2002 20:40:30 -0000	1.4
@@ -111,9 +111,10 @@
 
 void * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
 {
-	void * addr;
 	struct vm_struct * area;
-	unsigned long offset, last_addr;
+	unsigned long offset;
+	phys_t last_addr;
+	void * addr;
 
 	/* Don't allow wraparound or zero size */
 	last_addr = phys_addr + size - 1;

[Linux-mips-commits]CVS: linux/include/asm-mips spinlock.h,1.5,1.6

From: James S. <jsi...@us...> - 2002-02-14 20:39:04

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

Modified Files:
	spinlock.h 
Log Message:
Remove semicolons from do { ... } while(0); style macros.

Index: spinlock.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/spinlock.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spinlock.h	7 Dec 2001 22:54:04 -0000	1.5
+++ spinlock.h	14 Feb 2002 20:38:59 -0000	1.6
@@ -19,10 +19,10 @@
 
 #define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
 
-#define spin_lock_init(x)	do { (x)->lock = 0; } while(0);
+#define spin_lock_init(x)	do { (x)->lock = 0; } while(0)
 
 #define spin_is_locked(x)	((x)->lock != 0)
-#define spin_unlock_wait(x)	({ do { barrier(); } while ((x)->lock); })
+#define spin_unlock_wait(x)	do { barrier(); } while ((x)->lock);
 
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's

[Linux-mips-commits]CVS: linux/arch/mips/sni pci.c,1.2,1.3

From: James S. <jsi...@us...> - 2002-02-14 20:39:04

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

Added Files:
	pci.c 
Log Message:
Remove semicolons from do { ... } while(0); style macros.

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

From: James S. <jsi...@us...> - 2002-02-14 20:39:04

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

Modified Files:
	spinlock.h 
Log Message:
Remove semicolons from do { ... } while(0); style macros.

Index: spinlock.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/spinlock.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spinlock.h	7 Dec 2001 22:54:04 -0000	1.3
+++ spinlock.h	14 Feb 2002 20:38:59 -0000	1.4
@@ -19,10 +19,10 @@
 
 #define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
 
-#define spin_lock_init(x)	do { (x)->lock = 0; } while(0);
+#define spin_lock_init(x)	do { (x)->lock = 0; } while(0)
 
 #define spin_is_locked(x)	((x)->lock != 0)
-#define spin_unlock_wait(x)	({ do { barrier(); } while ((x)->lock); })
+#define spin_unlock_wait(x)	do { barrier(); } while ((x)->lock);
 
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's

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

From: James S. <jsi...@us...> - 2002-02-14 20:37:05

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

Modified Files:
	zs.c 
Log Message:
Fix jiffy comparison.

Index: zs.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/tc/zs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- zs.c	30 Nov 2001 18:34:10 -0000	1.3
+++ zs.c	14 Feb 2002 20:36:59 -0000	1.4
@@ -1473,7 +1473,7 @@
 		schedule_timeout(char_time);
 		if (signal_pending(current))
 			break;
-		if (timeout && ((orig_jiffies + timeout) < jiffies))
+		if (timeout && time_after(jiffies, orig_jiffies + timeout))
 			break;
 	}
 	current->state = TASK_RUNNING;

[Linux-mips-commits]CVS: linux/drivers/sound hal2.c,1.2,1.3 hal2.h,1.1,1.2

From: James S. <jsi...@us...> - 2002-02-14 20:36:27

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

Modified Files:
	hal2.c hal2.h 
Log Message:
Yes another HAL2 update.

Index: hal2.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/hal2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hal2.c	5 Feb 2002 17:25:11 -0000	1.2
+++ hal2.c	14 Feb 2002 20:36:20 -0000	1.3
@@ -1,6 +1,6 @@
 /*
  *  Driver for HAL2 sound processors
- *  Copyright (c) 2001 Ladislav Michl <la...@ps...>
+ *  Copyright (c) 2001, 2002 Ladislav Michl <la...@ps...>
  *  
  *  Based on Ulf Carlsson's code.
  *
@@ -21,7 +21,7 @@
  *  /dev/dsp    standard dsp device, (mostly) OSS compatible
  *  /dev/mixer	standard mixer device, (mostly) OSS compatible
  *
- *  Driver curretly supports indigo mode only. Recording is not supported.
+ *  Driver currently supports indigo mode only. Recording doesn't work. Why?
  */
 
 #include <linux/module.h>
@@ -54,10 +54,9 @@
 #define H2_READ_ADDR(addr)	(addr | (1<<7))
 #define H2_WRITE_ADDR(addr)	(addr)
 
-#define H2_DAC_BUFFERS		128
-#define H2_ADC_BUFFERS		32
-
 static char *hal2str = "HAL2 audio";
+static int ibuffers = 32;
+static int obuffers = 32;
 
 /* I doubt anyone has a machine with two HAL2 cards. It's possible to
  * have two HPC's, so it is probably possible to have two HAL2 cards.
@@ -73,15 +72,7 @@
 	[SOUND_MIXER_MIC] = { H2_MIX_INPUT_GAIN, 1 },	/* mic */
 };
 
-static void hal2_start_dac(hal2_card_t *hal2);
-static void hal2_stop_dac(hal2_card_t *hal2);
-
-#define H2_SUPPORTED_FORMATS	(AFMT_U8 | AFMT_S16_LE | AFMT_S16_BE)
-
-static inline unsigned int hal2_get_sample_size(unsigned int format)
-{
-	return (format & AFMT_U8) ? 1 : 2;
-}
+#define H2_SUPPORTED_FORMATS	(AFMT_S16_LE | AFMT_S16_BE)
 
 static inline void hal2_isr_write(hal2_card_t *hal2, u32 val)
 {
@@ -221,10 +212,10 @@
 	printk("syn ctl: %04hx ", hal2_i_look16(hal2, H2I_SYNTH_C));
 	printk("aesrx ctl: %04hx ", hal2_i_look16(hal2, H2I_AESRX_C));
 	printk("aestx ctl: %04hx ", hal2_i_look16(hal2, H2I_AESTX_C));
-	printk("codeca ctl1: %04hx ", hal2_i_look16(hal2, H2I_CODEC_A_C1));
-	printk("codeca ctl2: %08lx ", hal2_i_look32(hal2, H2I_CODEC_A_C2));
-	printk("codecb ctl1: %04hx ", hal2_i_look16(hal2, H2I_CODEC_B_C1));
-	printk("codecb ctl2: %08lx ", hal2_i_look32(hal2, H2I_CODEC_B_C2));
+	printk("dac ctl1: %04hx ", hal2_i_look16(hal2, H2I_ADC_C1));
+	printk("dac ctl2: %08lx ", hal2_i_look32(hal2, H2I_ADC_C2));
+	printk("adc ctl1: %04hx ", hal2_i_look16(hal2, H2I_DAC_C1));
+	printk("adc ctl2: %08lx ", hal2_i_look32(hal2, H2I_DAC_C2));
 	printk("syn map: %04hx\n", hal2_i_look16(hal2, H2I_SYNTH_MAP_C));
 	printk("bres1 ctl1: %04hx ", hal2_i_look16(hal2, H2I_BRES1_C1));
 	printk("bres1 ctl2: %04lx ", hal2_i_look32(hal2, H2I_BRES1_C2));
@@ -280,8 +271,23 @@
 
 static void hal2_adc_interrupt(hal2_codec_t *adc)
 {
+	int running;
+	
 	spin_lock(&adc->lock);
-	/* TODO :)) */
+
+	/* if head buffer contains nonzero samples DMA stream was already
+	 * stopped */
+	running = !adc->head->info.cnt;
+	adc->head->info.cnt = H2_BUFFER_SIZE;
+	adc->head->info.desc.cntinfo = HPCDMA_XIE | HPCDMA_EOX;
+	dma_cache_wback_inv((unsigned long) adc->head,
+			    sizeof(struct hpc_dma_desc));
+	/* we just proccessed empty buffer, don't update head pointer */
+	if (running) {
+		dma_cache_inv((unsigned long) adc->head->data, H2_BUFFER_SIZE);
+		adc->head = adc->head->info.next;
+	}
+
 	spin_unlock(&adc->lock);
 
 	wake_up(&adc->dma_wait);
@@ -367,23 +373,25 @@
 
 static void hal2_setup_dac(hal2_card_t *hal2)
 {
-	int sample_size;
+	unsigned int fifobeg, fifoend, highwater, sample_size;
 	hal2_pbus_t *pbus = &hal2->dac.pbus;
 
+	DEBUG("hal2_setup_dac\n");
+	
 	/* Now we set up some PBUS information. The PBUS needs information about
 	 * what portion of the fifo it will use. If it's receiving or
 	 * transmitting, and finally whether the stream is little endian or big
 	 * endian. The information is written later, on the start call.
 	 */
-	sample_size = hal2_get_sample_size(hal2->dac.format) * hal2->dac.voices;
+	sample_size = 2 * hal2->dac.voices;
 
 	/* Fifo should be set to hold exactly four samples. Highwater mark
 	 * should be set to two samples. */
-	pbus->highwater = (sample_size * 2) / 2;	/* halfwords */
-	pbus->fifobeg = 0;				/* playback is first */
-	pbus->fifoend = (sample_size * 4) / 8;		/* doublewords */
-	pbus->ctrl = HPC3_PDMACTRL_RT |	
-		     (hal2->dac.format & AFMT_S16_BE) ?  0 : HPC3_PDMACTRL_SEL;
+	highwater = (sample_size * 2) >> 1;	/* halfwords */
+	fifobeg = 0;				/* playback is first */
+	fifoend = (sample_size * 4) >> 3;	/* doublewords */
+	pbus->ctrl = HPC3_PDMACTRL_RT | HPC3_PDMACTRL_LD |
+		     (highwater << 8) | (fifobeg << 16) | (fifoend << 24);
 	/* We disable everything before we do anything at all */
 	pbus->pbus->pbdma_ctrl = HPC3_PDMACTRL_LD;
 	hal2_i_clearbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECTX);
@@ -391,80 +399,75 @@
 	/* Setup the HAL2 for playback */
 	hal2_set_dac_rate(hal2);
 	/* We are using 1st Bresenham clock generator for playback */
-	hal2_i_write16(hal2, H2I_CODEC_A_C1, (pbus->pbusnr << H2I_C1_DMA_SHIFT)
+	hal2_i_write16(hal2, H2I_DAC_C1, (pbus->pbusnr << H2I_C1_DMA_SHIFT)
 			| (1 << H2I_C1_CLKID_SHIFT)
 			| (hal2->dac.voices << H2I_C1_DATAT_SHIFT));
 }
 
 static void hal2_setup_adc(hal2_card_t *hal2)
 {
-	int sample_size;
-	hal2_pbus_t *pbus = &hal2->dac.pbus;
+	unsigned int fifobeg, fifoend, highwater, sample_size;
+	hal2_pbus_t *pbus = &hal2->adc.pbus;
 
-	sample_size = hal2_get_sample_size(hal2->adc.format) * hal2->adc.voices;
+	DEBUG("hal2_setup_adc\n");
+	
+	sample_size = 2 * hal2->adc.voices;
 
-	pbus->highwater = (sample_size * 2) >> 1;	/* halfwords */
-	pbus->fifobeg = (4 * 4) >> 3;			/* record is second */
-	pbus->fifoend = (sample_size * 4) >> 3;		/* doublewords */
-	pbus->ctrl = HPC3_PDMACTRL_RT | HPC3_PDMACTRL_RCV |
-		     (hal2->adc.format & AFMT_S16_BE) ?  0 : HPC3_PDMACTRL_SEL;
+	highwater = (sample_size * 2) >> 1;	/* halfwords */
+	fifobeg = (4 * 4) >> 3;			/* record is second */
+	fifoend = (sample_size * 4) >> 3;	/* doublewords */
+	pbus->ctrl = HPC3_PDMACTRL_RT | HPC3_PDMACTRL_RCV | HPC3_PDMACTRL_LD |
+		     (highwater << 8) | (fifobeg << 16) | (fifoend << 24);
 	pbus->pbus->pbdma_ctrl = HPC3_PDMACTRL_LD;
-	hal2_i_clearbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECRX);
+	hal2_i_clearbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECR);
 	hal2_i_clearbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
 	/* Setup the HAL2 for record */
 	hal2_set_adc_rate(hal2);
 	/* We are using 2nd Bresenham clock generator for record */
-	hal2_i_write16(hal2, H2I_CODEC_B_C1, (pbus->pbusnr << H2I_C1_DMA_SHIFT)
+	hal2_i_write16(hal2, H2I_ADC_C1, (pbus->pbusnr << H2I_C1_DMA_SHIFT)
 			| (2 << H2I_C1_CLKID_SHIFT)
 			| (hal2->adc.voices << H2I_C1_DATAT_SHIFT));
+
 }
 
 static void hal2_start_dac(hal2_card_t *hal2)
 {
-	unsigned long fifobeg, fifoend, highwater;
 	hal2_pbus_t *pbus = &hal2->dac.pbus;
 
 	DEBUG("hal2_start_dac\n");
 	
-	fifobeg = pbus->fifobeg;
-	fifoend = pbus->fifoend;
-	highwater = pbus->highwater;
-
 	pbus->pbus->pbdma_dptr = PHYSADDR(hal2->dac.tail);
-	/* We can not activate the PBUS at the same time as we configure
-	 * it. We have to write the configuration bits first and then
-	 * write both the configuration bits and the activation bits.
-	 * If we do not do so, we might get noise in the DMA stream. */
-	pbus->ctrl |= ((highwater << 8) | (fifobeg << 16) | (fifoend << 24) |
-			HPC3_PDMACTRL_LD);
-	pbus->pbus->pbdma_ctrl = pbus->ctrl;
-	pbus->ctrl |= (HPC3_PDMACTRL_ACT);
-	pbus->pbus->pbdma_ctrl = pbus->ctrl;
+	pbus->pbus->pbdma_ctrl = pbus->ctrl | HPC3_PDMACTRL_ACT;
 
+	/* set endianess */
+	if (hal2->dac.format & AFMT_S16_LE)
+		hal2_i_setbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECTX);
+	else
+		hal2_i_clearbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECTX);
+	/* set DMA bus */
 	hal2_i_setbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
+	/* enable DAC */
 	hal2_i_setbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECTX);
 }
 
 static void hal2_start_adc(hal2_card_t *hal2)
 {
-	unsigned long fifobeg, fifoend, highwater;
 	hal2_pbus_t *pbus = &hal2->adc.pbus;
 
 	DEBUG("hal2_start_adc\n");
 	
-	fifobeg = pbus->fifobeg;
-	fifoend = pbus->fifoend;
-	highwater = pbus->highwater;
-
-	pbus->pbus->pbdma_dptr = PHYSADDR(hal2->adc.tail);
-	pbus->ctrl |= ((highwater << 8) | (fifobeg << 16) | (fifoend << 24) |
-			HPC3_PDMACTRL_LD);
-	pbus->pbus->pbdma_ctrl = pbus->ctrl;
-	pbus->ctrl |= (HPC3_PDMACTRL_ACT);
-	pbus->pbus->pbdma_ctrl = pbus->ctrl;
-
+	pbus->pbus->pbdma_dptr = PHYSADDR(hal2->adc.head);
+	pbus->pbus->pbdma_ctrl = pbus->ctrl | HPC3_PDMACTRL_ACT;
+	
+	/* set endianess */
+	if (hal2->adc.format & AFMT_S16_LE)
+		hal2_i_setbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECR);
+	else
+		hal2_i_clearbit16(hal2, H2I_DMA_END, H2I_DMA_END_CODECR);
+	/* set DMA bus */
 	hal2_i_setbit16(hal2, H2I_DMA_DRV, (1 << pbus->pbusnr));
-	hal2_i_setbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECRX);
+	/* enable ADC */
+	hal2_i_setbit16(hal2, H2I_DMA_PORT_EN, H2I_DMA_PORT_EN_CODECR);
 }
 
 static inline void hal2_stop_dac(hal2_card_t *hal2)
@@ -482,28 +485,40 @@
 	hal2->adc.pbus.pbus->pbdma_ctrl = HPC3_PDMACTRL_LD;
 }
 
-static int hal2_alloc_dac_dmabuf(hal2_card_t *hal2, int buffers)
+#define hal2_alloc_dac_dmabuf(hal2)	hal2_alloc_dmabuf(hal2, 1)
+#define hal2_alloc_adc_dmabuf(hal2)	hal2_alloc_dmabuf(hal2, 0)
+static int hal2_alloc_dmabuf(hal2_card_t *hal2, int is_dac)
 {
+	int buffers;
 	hal2_buf_t *buf, *prev;
-	hal2_codec_t *dac = &hal2->dac;
+	hal2_codec_t *codec;
 
+	if (is_dac) {
+		codec = &hal2->dac;
+		buffers = obuffers;
+	} else {
+		codec = &hal2->adc;
+		buffers = ibuffers;
+	}
+	
 	DEBUG("allocating %d DMA buffers.\n", buffers);
 	
 	buf = (hal2_buf_t*) get_zeroed_page(GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
-	dac->head = buf;
-	dac->tail = buf;
+	codec->head = buf;
+	codec->tail = buf;
 	
 	while (--buffers) {
 		buf->info.desc.pbuf = PHYSADDR(&buf->data);
-		buf->info.desc.cntinfo = HPCDMA_XIE | HPCDMA_EOX;
+		buf->info.desc.cntinfo = HPCDMA_XIE | (is_dac) ?
+					 HPCDMA_EOX : H2_BUFFER_SIZE;
 		buf->info.cnt = 0;
 		prev = buf;
 		buf = (hal2_buf_t*) get_zeroed_page(GFP_KERNEL);
 		if (!buf) {
 			printk("HAL2: Not enough memory for DMA buffer.\n");
-			buf = dac->head;
+			buf = codec->head;
 			while (buf) {
 				prev = buf;
 				free_page((unsigned long) buf);
@@ -519,34 +534,96 @@
 		dma_cache_wback_inv((unsigned long) prev, PAGE_SIZE);
 	}
 	buf->info.desc.pbuf = PHYSADDR(&buf->data);
-	buf->info.desc.cntinfo = HPCDMA_XIE | HPCDMA_EOX;
+	buf->info.desc.cntinfo = HPCDMA_XIE | (is_dac) ?
+				 HPCDMA_EOX : H2_BUFFER_SIZE;
 	buf->info.cnt = 0;
-	buf->info.next = dac->head;
-	buf->info.desc.pnext = PHYSADDR(dac->head);
+	buf->info.next = codec->head;
+	buf->info.desc.pnext = PHYSADDR(codec->head);
 	dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE);
 	
 	return 0;
 }
 
-static void hal2_free_dac_dmabuf(hal2_card_t *hal2)
+#define hal2_free_dac_dmabuf(hal2)	hal2_free_dmabuf(hal2, 1)
+#define hal2_free_adc_dmabuf(hal2)	hal2_free_dmabuf(hal2, 0)
+static void hal2_free_dmabuf(hal2_card_t *hal2, int is_dac)
 {
 	hal2_buf_t *buf, *next;
-	hal2_codec_t *dac = &hal2->dac;
+	hal2_codec_t *codec = (is_dac) ? &hal2->dac : &hal2->adc;
 
-	if (!dac->head)
+	if (!codec->head)
 		return;
 	
-	buf = dac->head->info.next;
-	dac->head->info.next = NULL;
+	buf = codec->head->info.next;
+	codec->head->info.next = NULL;
 	while (buf) {
 		next = buf->info.next;
 		free_page((unsigned long) buf);
 		buf = next;
 	}
-	dac->head = dac->tail = NULL;
+	codec->head = codec->tail = NULL;
 }
 
 /* 
+ * Add 'count' bytes to 'buffer' from DMA ring buffers. Return number of
+ * bytes added or -EFAULT if copy_from_user failed.
+ */
+static int hal2_get_buffer(hal2_card_t *hal2, char *buffer, int count)
+{
+	unsigned long flags;
+	int size, ret = 0;
+	hal2_codec_t *adc = &hal2->adc;
+	
+	spin_lock_irqsave(&adc->lock, flags);
+	
+	DEBUG("getting %d bytes ", count);
+
+	/* enable DMA stream if there are no data */
+	if (!(adc->pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT) &&
+	    adc->tail->info.cnt == 0)
+		hal2_start_adc(hal2);
+
+	DEBUG("... ");
+
+	while (adc->tail->info.cnt > 0 && count > 0) {
+		size = min(adc->tail->info.cnt, count);
+		spin_unlock_irqrestore(&adc->lock, flags);
+
+		if (copy_to_user(buffer, &adc->tail->data[H2_BUFFER_SIZE-size],
+				 size)) {
+			ret = -EFAULT;
+			goto out;
+		}
+
+		spin_lock_irqsave(&adc->lock, flags);
+		
+		adc->tail->info.cnt -= size;
+		/* buffer is empty, update tail pointer */
+		if (adc->tail->info.cnt == 0) {
+			adc->tail->info.desc.cntinfo = HPCDMA_XIE |
+						       H2_BUFFER_SIZE;
+			dma_cache_wback_inv((unsigned long) adc->tail,
+					    sizeof(struct hpc_dma_desc));
+			adc->tail = adc->tail->info.next;
+			/* enable DMA stream again if needed */
+			if (!(adc->pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT))
+				hal2_start_adc(hal2);
+
+		}
+		buffer += size;
+		ret += size;
+		count -= size;
+
+		DEBUG("(%d) ", size);
+	}
+	spin_unlock_irqrestore(&adc->lock, flags);
+out:	
+	DEBUG("\n");
+	
+	return ret;
+} 
+
+/* 
  * Add 'count' bytes from 'buffer' to DMA ring buffers. Return number of
  * bytes added or -EFAULT if copy_from_user failed.
  */
@@ -581,46 +658,75 @@
 
 		DEBUG("(%d) ", size);
 	}
-		
-	DEBUG("\n");
-	
 	if (!(dac->pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT) && ret > 0)
 		hal2_start_dac(hal2);
 	
 	spin_unlock_irqrestore(&dac->lock, flags);
 out:	
+	DEBUG("\n");
+	
 	return ret;
 }
 
-static int hal2_sync_dac(hal2_card_t *hal2)
-{
-	return 0;
-}
-
-static void hal2_reset_dac_pointer(hal2_card_t *hal2)
+#define hal2_reset_dac_pointer(hal2)	hal2_reset_pointer(hal2, 1)
+#define hal2_reset_adc_pointer(hal2)	hal2_reset_pointer(hal2, 0)
+static void hal2_reset_pointer(hal2_card_t *hal2, int is_dac)
 {
-	hal2_codec_t *dac = &hal2->dac;
-
-	DEBUG("hal2_reset_dac_pointer\n");
+	hal2_codec_t *codec = (is_dac) ? &hal2->dac : &hal2->adc;
+	
+	DEBUG("hal2_reset_pointer\n");
 
-	dac->tail = dac->head;
+	codec->tail = codec->head;
 	do {
-		dac->tail->info.desc.cntinfo = HPCDMA_EOX | HPCDMA_XIE;
-		dac->tail->info.cnt = 0;
-		dma_cache_wback_inv((unsigned long) dac->tail, 
+		codec->tail->info.desc.cntinfo = HPCDMA_XIE | (is_dac) ? 
+						 HPCDMA_EOX : H2_BUFFER_SIZE;
+		codec->tail->info.cnt = 0;
+		dma_cache_wback_inv((unsigned long) codec->tail, 
 				    sizeof(struct hpc_dma_desc));
-		dac->tail = dac->tail->info.next;
-	} while (dac->head != dac->tail);
+		codec->tail = codec->tail->info.next;
+	} while (codec->tail != codec->head);
 }
 
-static void hal2_reset_adc_pointer(hal2_card_t *hal2)
+static int hal2_sync_dac(hal2_card_t *hal2)
 {
+	DECLARE_WAITQUEUE(wait, current);
+	hal2_codec_t *dac = &hal2->dac;
+	int ret = 0;
+	signed long timeout = 1 + 1000 * H2_BUFFER_SIZE * 2 * dac->voices *
+			      HZ / dac->sample_rate / 900;
+
+	down(&dac->sem);
+	
+	while (dac->tail->info.cnt > 0 && ret == 0) {
+		add_wait_queue(&dac->dma_wait, &wait);
+		set_current_state(TASK_INTERRUPTIBLE);
+		if (!schedule_timeout(timeout))
+			/* We may get bogus timeout when system is 
+			 * heavily loaded */
+			if (dac->tail->info.cnt) {
+				printk("HAL2: timeout...\n");
+				ret = -ETIME;
+			}
+		if (signal_pending(current))
+			ret = -ERESTARTSYS;
+		remove_wait_queue(&dac->dma_wait, &wait);
+	}
+
+	/* Make sure that DMA is stopped */
+	if (dac->pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT) {
+		hal2_stop_dac(hal2);
+		hal2_reset_dac_pointer(hal2);
+	}
+	
+	up(&dac->sem);
+	
+	return ret;
 }
 
 static int hal2_write_mixer(hal2_card_t *hal2, int index, int vol)
 {
 	unsigned int l, r;
-	
+
 	DEBUG_MIX("mixer %d write\n", index);
 	
 	if (index >= SOUND_MIXER_NRDEVICES || !mixtable[index].avail)
@@ -641,7 +747,7 @@
 		DEBUG_MIX("output attenuator %d,%d\n", l, r);
 
 		if (r | l) {
-			unsigned int tmp = hal2_i_look32(hal2, H2I_CODEC_A_C2); 
+			unsigned int tmp = hal2_i_look32(hal2, H2I_DAC_C2); 
 		
 			tmp &= ~(H2I_C2_L_ATT_M | H2I_C2_R_ATT_M | H2I_C2_MUTE);
 
@@ -653,9 +759,9 @@
 
 			tmp |= (l << H2I_C2_L_ATT_SHIFT) & H2I_C2_L_ATT_M;
 			tmp |= (r << H2I_C2_R_ATT_SHIFT) & H2I_C2_R_ATT_M;
-			hal2_i_write32(hal2, H2I_CODEC_A_C2, tmp);
+			hal2_i_write32(hal2, H2I_DAC_C2, tmp);
 		} else 
-			hal2_i_setbit32(hal2, H2I_CODEC_A_C2, H2I_C2_MUTE);
+			hal2_i_setbit32(hal2, H2I_DAC_C2, H2I_C2_MUTE);
 	}
 	case H2_MIX_INPUT_GAIN: {
 		/* TODO */
@@ -669,7 +775,7 @@
 	int i;
 
 	for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)
-		hal2_write_mixer(hal2, i, 50 | (50 << 8));
+		hal2_write_mixer(hal2, i, 100 | (100 << 8));
 		
 }
 
@@ -709,7 +815,7 @@
 		case SOUND_MIXER_RECSRC:
 			val = 0;	/* FIXME */
 			break;
-		/* Give the supported mixers, all of them supports stereo */
+		/* Give the supported mixers, all of them support stereo */
                 case SOUND_MIXER_DEVMASK:
                 case SOUND_MIXER_STEREODEVS: {
 			int i;
@@ -800,23 +906,28 @@
 		return 0;
 
 	case SNDCTL_DSP_GETCAPS:
-		return put_user(DSP_CAP_DUPLEX | DSP_CAP_REALTIME | 
-				DSP_CAP_TRIGGER | DSP_CAP_MULTI, (int *)arg);
+		return put_user(DSP_CAP_DUPLEX | DSP_CAP_MULTI, (int *)arg);
 		
 	case SNDCTL_DSP_RESET:
-		if (file->f_mode & FMODE_WRITE) {
-			hal2_stop_dac(hal2);
-			hal2_reset_dac_pointer(hal2);
-		}
 		if (file->f_mode & FMODE_READ) {
 			hal2_stop_adc(hal2);
 			hal2_reset_adc_pointer(hal2);
 		}
+		if (file->f_mode & FMODE_WRITE) {
+			hal2_stop_dac(hal2);
+			hal2_reset_dac_pointer(hal2);
+		}
 		return 0;
 
  	case SNDCTL_DSP_SPEED:
 		if (get_user(val, (int *)arg))
 			return -EFAULT;
+		if (file->f_mode & FMODE_READ) {
+			hal2_stop_adc(hal2);
+			val = hal2_compute_rate(&hal2->adc, val);
+			hal2->adc.sample_rate = val;
+			hal2_set_adc_rate(hal2);
+		}
 		if (file->f_mode & FMODE_WRITE) {
 			hal2_stop_dac(hal2);
 			val = hal2_compute_rate(&hal2->dac, val);
@@ -893,41 +1004,67 @@
 	case SNDCTL_DSP_POST:
 		return 0;
 
-	case SNDCTL_DSP_GETTRIGGER:
-		val = 0;
-		if ((file->f_mode & FMODE_READ) && 
-		    (hal2->adc.pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT))
-			val |= PCM_ENABLE_INPUT;
-		if ((file->f_mode & FMODE_WRITE) && 
-		    (hal2->dac.pbus.pbus->pbdma_ctrl & HPC3_PDMACTRL_ISACT))
-			val |= PCM_ENABLE_OUTPUT;
-		return put_user(val, (int *)arg);
+	case SNDCTL_DSP_GETOSPACE: {
+		unsigned long flags;
+		audio_buf_info info;
+		hal2_buf_t *buf;
+		hal2_codec_t *dac = &hal2->dac;
 		
-	case SNDCTL_DSP_SETTRIGGER:
-		if (get_user(val, (int *)arg))
-			return -EFAULT;
-		if (file->f_mode & FMODE_READ) {
-			if (val & PCM_ENABLE_INPUT) {
-				if (!(hal2->adc.pbus.pbus->pbdma_ctrl & 
-				      HPC3_PDMACTRL_ISACT))
-					hal2_start_adc(hal2);
-			} else
-				hal2_stop_adc(hal2);
+		if (!(file->f_mode & FMODE_WRITE))
+			return -EINVAL;
+		
+		spin_lock_irqsave(&dac->lock, flags);
+		info.fragments = 0;
+		buf = dac->head;
+		while (buf->info.cnt == 0 && buf != dac->tail) {
+			info.fragments++;
+			buf = buf->info.next;
 		}
-		if (file->f_mode & FMODE_WRITE) {
-			if (val & PCM_ENABLE_OUTPUT) {
-		                if (!(hal2->dac.pbus.pbus->pbdma_ctrl &
-				      HPC3_PDMACTRL_ISACT))
-		                        hal2_start_dac(hal2);
-			} else
-				hal2_stop_dac(hal2);
+		spin_unlock_irqrestore(&dac->lock, flags);
+		
+		info.fragstotal = obuffers;
+		info.fragsize = H2_BUFFER_SIZE;
+                info.bytes = info.fragsize * info.fragments;
+
+		return copy_to_user((void *)arg, &info, sizeof(info)) ? -EFAULT : 0;
+	}
+			   
+	case SNDCTL_DSP_GETISPACE: {
+		unsigned long flags;
+		audio_buf_info info;
+		hal2_buf_t *buf;
+		hal2_codec_t *adc = &hal2->adc;
+			
+		if (!(file->f_mode & FMODE_READ))
+			return -EINVAL;
+		
+		spin_lock_irqsave(&adc->lock, flags);
+		info.fragments = 0;
+		info.bytes = 0;
+		buf = adc->tail;
+		while (buf->info.cnt > 0 && buf != adc->head) {
+			info.fragments++;
+			info.bytes += buf->info.cnt;
+			buf = buf->info.next;
 		}
-		return 0;
+		spin_unlock_irqrestore(&adc->lock, flags);
+
+		info.fragstotal = ibuffers;
+		info.fragsize = H2_BUFFER_SIZE;
+		
+		return copy_to_user((void *)arg, &info, sizeof(info)) ? -EFAULT : 0;
+	}
+
 	case SNDCTL_DSP_NONBLOCK:
 		file->f_flags |= O_NONBLOCK;
 		return 0;
+		
 	case SNDCTL_DSP_GETBLKSIZE:
 		return put_user(H2_BUFFER_SIZE, (int *)arg);
+	
+	case SNDCTL_DSP_SETFRAGMENT:
+		return 0;
+
 	case SOUND_PCM_READ_RATE:
 		val = -EINVAL;
 		if (file->f_mode & FMODE_READ)
@@ -945,35 +1082,77 @@
 		return put_user(val, (int *)arg);
 
 	case SOUND_PCM_READ_BITS:
-		val = -EINVAL;
-		if (file->f_mode & FMODE_READ)
-			val = hal2_get_sample_size(hal2->adc.format) * 8;
-		if (file->f_mode & FMODE_WRITE)
-			val = hal2_get_sample_size(hal2->dac.format) * 8;
+		val = 16;
 		return put_user(val, (int *)arg);
 	}
+	
 	return hal2_mixer_ioctl(hal2, cmd, arg);
 }
 
 static ssize_t hal2_read(struct file *file, char *buffer,
 			 size_t count, loff_t *ppos)
 {
+	ssize_t err;
 	hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
 	hal2_codec_t *adc = &hal2->adc;
-	
+
+	if (count == 0)
+		return 0;
 	if (ppos != &file->f_pos)
 		return -ESPIPE;
-	down(&adc->sem);	
-
+	
+	down(&adc->sem);
+	
+	if (file->f_flags & O_NONBLOCK) {
+		err = hal2_get_buffer(hal2, buffer, count);
+		err = err == 0 ? -EAGAIN : err;
+	} else {
+		do {
+			/* ~10% longer */
+			signed long timeout = 1 + 1000 * H2_BUFFER_SIZE *
+				2 * adc->voices * HZ / adc->sample_rate / 900;
+			DECLARE_WAITQUEUE(wait, current);
+			ssize_t cnt = 0;
+			
+			err = hal2_get_buffer(hal2, buffer, count);
+			if (err > 0) {
+				count -= err;
+				cnt += err;
+				buffer += err;
+				err = cnt;
+			}
+			if (count > 0 && err >= 0) {
+				add_wait_queue(&adc->dma_wait, &wait);
+				set_current_state(TASK_INTERRUPTIBLE);
+				/* Well, it is possible, that interrupt already
+				 * arrived. Hmm, shit happens, we have one more
+				 * buffer filled ;) */
+				if (!schedule_timeout(timeout))
+					/* We may get bogus timeout when system
+					 * is heavily loaded */
+					if (!adc->tail->info.cnt) {
+						printk("HAL2: timeout...\n");
+						hal2_stop_adc(hal2);
+						hal2_reset_adc_pointer(hal2);
+						err = -EAGAIN;
+					}
+				if (signal_pending(current))
+					err = -ERESTARTSYS;
+				remove_wait_queue(&adc->dma_wait, &wait);
+			}
+		} while (count > 0 && err >= 0);
+	
+	}
+	
 	up(&adc->sem);
-	return 0;
+	
+	return err;
 }
 
 static ssize_t hal2_write(struct file *file, const char *buffer,
 			  size_t count, loff_t *ppos)
 {
-	DECLARE_WAITQUEUE(wait, current);
-	ssize_t err, cnt = 0;
+	ssize_t err;
 	char *buf = (char*) buffer;
 	hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
 	hal2_codec_t *dac = &hal2->dac;
@@ -991,10 +1170,11 @@
 	} else {
 		do {
 			/* ~10% longer */
-			signed long timeout = 1 + 1000 * H2_BUFFER_SIZE * 
-				hal2_get_sample_size(dac->format) * 
-				dac->voices * HZ / dac->sample_rate / 900;
-
+			signed long timeout = 1 + 1000 * H2_BUFFER_SIZE *
+				2 * dac->voices * HZ / dac->sample_rate / 900;
+			DECLARE_WAITQUEUE(wait, current);
+			ssize_t cnt = 0;
+			
 			err = hal2_add_buffer(hal2, buf, count);
 			if (err > 0) {
 				count -= err;
@@ -1035,6 +1215,16 @@
 	unsigned int mask = 0;
 	hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
 
+	if (file->f_mode & FMODE_READ) {
+		hal2_codec_t *adc = &hal2->adc;
+		
+		poll_wait(file, &hal2->adc.dma_wait, wait);
+		spin_lock_irqsave(&adc->lock, flags);
+		if (adc->tail->info.cnt > 0)
+			mask |= POLLIN;
+		spin_unlock_irqrestore(&adc->lock, flags);
+	}
+	
 	if (file->f_mode & FMODE_WRITE) {
 		hal2_codec_t *dac = &hal2->dac;
 		
@@ -1044,12 +1234,7 @@
 			mask |= POLLOUT;
 		spin_unlock_irqrestore(&dac->lock, flags);
 	}
-#if 0
-	if (file->f_mode & FMODE_READ) {
-		poll_wait(file, &hal2->adc.dma_wait, wait);
-		mask |= POLLIN;
-	}
-#endif
+	
 	return mask;
 }
 
@@ -1070,18 +1255,17 @@
 		if (hal2->adc.usecount)
 			return -EBUSY;
 		
-		/* OSS spec wanted us to use 8 bit, 8 kHz mono by default */
-		hal2->adc.format = AFMT_U8;
+		/* OSS spec wanted us to use 8 bit, 8 kHz mono by default,
+		 * but HAL2 can't do 8bit audio */
+		hal2->adc.format = AFMT_S16_BE;
 		hal2->adc.voices = 1;
 		hal2->adc.sample_rate = hal2_compute_rate(&hal2->adc, 8000);
 		hal2_set_adc_rate(hal2);
 
 		/* alloc DMA buffers */
-#if 0
-		err = hal2_alloc_adc_dmabuf(hal2, H2_ADC_BUFFERS);
+		err = hal2_alloc_adc_dmabuf(hal2);
 		if (err)
 			return err;
-#endif
 		hal2_setup_adc(hal2);
 
 		hal2->adc.usecount++;
@@ -1091,14 +1275,13 @@
 		if (hal2->dac.usecount)
 			return -EBUSY;
 
-		/* OSS spec wanted us to use 8 bit, 8 kHz mono by default */
-		hal2->dac.format = AFMT_U8;
+		hal2->dac.format = AFMT_S16_BE;
 		hal2->dac.voices = 1;
 		hal2->dac.sample_rate = hal2_compute_rate(&hal2->dac, 8000);
 		hal2_set_dac_rate(hal2);
 
 		/* alloc DMA buffers */
-		err = hal2_alloc_dac_dmabuf(hal2, H2_DAC_BUFFERS);
+		err = hal2_alloc_dac_dmabuf(hal2);
 		if (err)
 			return err;
 		hal2_setup_dac(hal2);
@@ -1106,8 +1289,6 @@
 		hal2->dac.usecount++;
 	}
 	
-	DEBUG("playback open ok!\n");
-
 	return 0;
 }
 
@@ -1116,17 +1297,17 @@
 	hal2_card_t *hal2 = (hal2_card_t *) file->private_data;
 
 	if (file->f_mode & FMODE_READ) {
+		hal2_stop_adc(hal2);
+		hal2_free_adc_dmabuf(hal2);
 		hal2->adc.usecount--;
 	}
 
 	if (file->f_mode & FMODE_WRITE) {
-		hal2_stop_dac(hal2);
+		hal2_sync_dac(hal2);
 		hal2_free_dac_dmabuf(hal2);
 		hal2->dac.usecount--;
 	}
 
-	DEBUG("playback close ok!\n");
-
 	return 0;
 }
 
@@ -1168,14 +1349,14 @@
 	hal2_pbus_t *pbus;
 
 	pbus = &hal2->dac.pbus;
-	pbus->pbusnr = 1;
+	pbus->pbusnr = 0;
 	pbus->pbus = &hpc3->pbdma[pbus->pbusnr];
 	/* The spec says that we should write 0x08248844 but that's WRONG. HAL2
 	 * does 8 bit DMA, not 16 bit even if it generates 16 bit audio. */
 	hpc3->pbus_dmacfgs[pbus->pbusnr][0] = 0x08208844;	/* Magic :-) */
 
 	pbus = &hal2->adc.pbus;
-	pbus->pbusnr = 2;
+	pbus->pbusnr = 1;
 	pbus->pbus = &hpc3->pbdma[pbus->pbusnr];
 	hpc3->pbus_dmacfgs[pbus->pbusnr][0] = 0x08208844;	/* Magic :-) */
 
@@ -1311,6 +1492,6 @@
 module_init(init_hal2);
 module_exit(exit_hal2);
 
-MODULE_AUTHOR("Ladislav Michl");
 MODULE_DESCRIPTION("OSS compatible driver for SGI HAL2 audio");
+MODULE_AUTHOR("Ladislav Michl");
 MODULE_LICENSE("GPL");

Index: hal2.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/hal2.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hal2.h	28 Jan 2002 21:00:02 -0000	1.1
+++ hal2.h	14 Feb 2002 20:36:20 -0000	1.2
@@ -24,6 +24,7 @@
 #include <asm/addrspace.h>
 #include <asm/sgi/sgihpc.h>
 #include <linux/spinlock.h>
+#include <linux/types.h>
 
 #define H2_HAL2_BASE		0x58000
 #define H2_CTL_PIO		(H2_HAL2_BASE + 0 * 0x400)
@@ -115,14 +116,14 @@
 #define H2I_DMA_PORT_EN_AESRX	0x02		/* AES receiver DMA port */
 #define H2I_DMA_PORT_EN_AESTX	0x04		/* AES transmitter DMA port */
 #define H2I_DMA_PORT_EN_CODECTX	0x08		/* CODEC transmit DMA port */
-#define H2I_DMA_PORT_EN_CODECRX	0x10		/* CODEC receive DMA port */
+#define H2I_DMA_PORT_EN_CODECR	0x10		/* CODEC receive DMA port */
 
 #define H2I_DMA_END		0x9108 		/* global dma endian select */
 #define H2I_DMA_END_SY_IN	0x01		/* Synth_in DMA port */
 #define H2I_DMA_END_AESRX	0x02		/* AES receiver DMA port */
 #define H2I_DMA_END_AESTX	0x04		/* AES transmitter DMA port */
 #define H2I_DMA_END_CODECTX	0x08		/* CODEC transmit DMA port */
-#define H2I_DMA_END_CODECRX	0x10		/* CODEC receive DMA port */
+#define H2I_DMA_END_CODECR	0x10		/* CODEC receive DMA port */
 						/* 0=b_end 1=l_end */
 
 #define H2I_DMA_DRV		0x910C  	/* global PBUS DMA enable */
@@ -130,9 +131,10 @@
 #define H2I_SYNTH_C		0x1104		/* Synth DMA control */
 
 #define H2I_AESRX_C		0x1204	 	/* AES RX dma control */
-#define H2I_AESRX_C_TS_EN	0x20		/* timestamp enable */
-#define H2I_AESRX_C_TS_FMT	0x40		/* timestamp format */
-#define H2I_AESRX_C_NAUDIO	0x80		/* PBUS DMA data format */
+
+#define H2I_C_TS_EN		0x20		/* Timestamp enable */
+#define H2I_C_TS_FRMT		0x40		/* Timestamp format */
+#define H2I_C_NAUDIO		0x80		/* Sign extend */
 
 /* AESRX CTL, 16 bit */
 
@@ -142,13 +144,12 @@
 #define H2I_AESTX_C_DATAT_SHIFT	8		/* 1=mono 2=stereo (3=quad) */
 #define H2I_AESTX_C_DATAT_M	0x300
 
-/* CODEC registers. Specification calls them DAC_CTRL and ADC_CTRL, but this
- * is braindamaged. It doesn't explain their meaning. */
+/* CODEC registers */
 
-#define H2I_CODEC_A_C1		0x1404 		/* CODEC_A DMA control, 16 bit */
-#define H2I_CODEC_A_C2		0x1408		/* CODEC_A DMA control, 32 bit */
-#define H2I_CODEC_B_C1		0x1504 		/* CODEC_B DMA control, 16 bit */
-#define H2I_CODEC_B_C2		0x1508		/* CODEC_B DMA control, 32 bit */
+#define H2I_DAC_C1		0x1404 		/* DAC DMA control, 16 bit */
+#define H2I_DAC_C2		0x1408		/* DAC DMA control, 32 bit */
+#define H2I_ADC_C1		0x1504 		/* ADC DMA control, 16 bit */
+#define H2I_ADC_C2		0x1508		/* ADC DMA control, 32 bit */
 
 /* Bits in CTL1 register */
 
@@ -284,11 +285,7 @@
 struct stru_hal2_pbus {
 	struct hpc3_pbus_dmacregs *pbus;
 	int pbusnr;
-	unsigned int fifobeg;
-	unsigned int fifoend;
-	unsigned int highwater;
-
-	unsigned long ctrl;		/* Current state of pbus->pbdma_ctrl */
+	unsigned int ctrl;		/* Current state of pbus->pbdma_ctrl */
 };
 
 typedef struct stru_hal2_binfo hal2_binfo_t;

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

From: Paul M. <le...@us...> - 2002-02-12 22:08:05

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

Modified Files:
	vr41xxwdt.c 
Log Message:
MINOR() -> minor(), and some other general cleanup.



Index: vr41xxwdt.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/vr41xxwdt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vr41xxwdt.c	20 Jan 2002 03:26:07 -0000	1.4
+++ vr41xxwdt.c	12 Feb 2002 22:03:37 -0000	1.5
@@ -128,17 +128,12 @@
  */
 static int vr41xx_wdt_open(struct inode *inode, struct file *file)
 {
-	switch (MINOR(inode->i_rdev)) {
-		case WATCHDOG_MINOR:
-			if (test_and_set_bit(0, &vr41xx_wdt_is_open))
-				return -EBUSY;
-
-			vr41xx_wdt_start();
+	if (minor(inode->i_rdev) != WATCHDOG_MINOR)
+		return -ENODEV;
+	if (test_and_set_bit(0, &vr41xx_wdt_is_open))
+		return -EBUSY;
 
-			break;
-		default:
-			return -ENODEV;
-	}
+	vr41xx_wdt_start();
 
 	return 0;
 }
@@ -153,7 +148,7 @@
  */
 static int vr41xx_wdt_close(struct inode *inode, struct file *file)
 {
-	if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
+	if (minor(inode->i_rdev) == WATCHDOG_MINOR) {
 #ifndef CONFIG_WATCHDOG_NOWAYOUT
 		vr41xx_wdt_stop();
 #endif

[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-korva,1.8,1.9

From: James S. <jsi...@us...> - 2002-02-12 18:25:15

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

Modified Files:
	defconfig-korva 
Log Message:
Updated default configs.

Index: defconfig-korva
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-korva,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defconfig-korva	27 Nov 2001 23:31:02 -0000	1.8
+++ defconfig-korva	12 Feb 2002 18:25:12 -0000	1.9
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_MIPS=y
 
@@ -14,11 +14,13 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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=y
+CONFIG_NEC_KORVA_8MB=y
+# CONFIG_NEC_MARKHAM_32MB is not set
 # CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
 # CONFIG_MIPS_ATLAS is not set
@@ -27,7 +29,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -39,8 +45,10 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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
@@ -49,13 +57,12 @@
 CONFIG_SERIAL=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_NEW_IRQ=y
+CONFIG_IRQ_CPU=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NONCOHERENT_IO=y
 # CONFIG_SCSI is not set
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -78,11 +85,13 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
 # CONFIG_CPU_ADVANCED is not set
 # CONFIG_CPU_HAS_LLSC is not set
 # CONFIG_CPU_HAS_LLDSCD is not set
@@ -92,14 +101,18 @@
 # General setup
 #
 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_NET=y
 # 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
@@ -145,7 +158,7 @@
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+CONFIG_NETLINK_DEV=y
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -158,16 +171,13 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
 # 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
@@ -329,14 +339,6 @@
 # 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
 
 #
@@ -346,6 +348,7 @@
 # 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
@@ -370,11 +373,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -412,6 +419,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 CONFIG_ROOT_NFS=y
@@ -449,17 +457,9 @@
 # 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
 # CONFIG_USB_STORAGE is not set
@@ -473,44 +473,16 @@
 # 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
 
 #
@@ -541,10 +513,6 @@
 # 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
 
 #

[Linux-mips-commits]CVS: linux/arch/mips64/configs defconfig-atlas,1.2,1.3 defconfig-ip22,1.7,1.8 defconfig-ip27,1.7,1.8 defconfig-ip32,1.7,1.8 defconfig-malta,1.2,1.3 defconfig-sb1250-swarm,1.3,1.4

From: James S. <jsi...@us...> - 2002-02-12 18:22:37

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

Modified Files:
	defconfig-atlas defconfig-ip22 defconfig-ip27 defconfig-ip32 
	defconfig-malta defconfig-sb1250-swarm 
Log Message:
Updated default configs.

Index: defconfig-atlas
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-atlas,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defconfig-atlas	15 Dec 2001 00:13:45 -0000	1.2
+++ defconfig-atlas	12 Feb 2002 18:22:34 -0000	1.3
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_MIPS=y
 
 #
 # Code maturity level options
@@ -10,57 +11,108 @@
 #
 # Machine selection
 #
+# CONFIG_ACER_PICA_61 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_ATLAS=y
 # CONFIG_MIPS_MALTA is not set
-# CONFIG_SGI_IP27 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
+# CONFIG_VADEM_CLIO_1000 is not set
+# 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_SGI_IP22 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_SWARM 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_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_BOOT_ELF32=y
-CONFIG_L1_CACHE_SHIFT=5
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
+CONFIG_NEW_TIME_C=y
+CONFIG_NEW_IRQ=y
 CONFIG_NONCOHERENT_IO=y
+CONFIG_PCI=y
+CONFIG_SWAP_IO_SPACE=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
 
 #
 # CPU selection
 #
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
 # CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
 CONFIG_CPU_R5000=y
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5900 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_MIPS_FPU_EMULATOR 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_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 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_BINFMT_ELF=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_BINFMT_ELF32=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -103,7 +155,7 @@
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -116,6 +168,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -184,11 +237,13 @@
 #
 # SCSI low-level drivers
 #
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -197,6 +252,7 @@
 # CONFIG_SCSI_AM53C974 is not set
 # CONFIG_SCSI_MEGARAID is not set
 # CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_DTC3280 is not set
 # CONFIG_SCSI_EATA is not set
@@ -209,18 +265,35 @@
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NCR53C7xx is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_NCR53C8XX is not set
+# CONFIG_SCSI_SYM53C8XX is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PCI2000 is not set
 # CONFIG_SCSI_PCI2220I is not set
 # CONFIG_SCSI_PSI240I is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_SIM710 is not set
 # CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI 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
@@ -239,6 +312,7 @@
 #
 CONFIG_NET_ETHERNET=y
 # CONFIG_SUNLANCE is not set
+# CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
 # CONFIG_SUNLANCE is not set
@@ -247,6 +321,7 @@
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL 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
@@ -348,6 +423,7 @@
 # CONFIG_INTEL_RNG is not set
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
+# CONFIG_MIPS_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -446,7 +522,6 @@
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
-CONFIG_KCORE_ELF=y
 
 #
 # Sound
@@ -569,5 +644,7 @@
 #
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
+# CONFIG_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set

Index: defconfig-ip22
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip22,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-ip22	13 Dec 2001 21:05:10 -0000	1.7
+++ defconfig-ip22	12 Feb 2002 18:22:34 -0000	1.8
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_MIPS=y
 
 #
 # Code maturity level options
@@ -10,47 +11,106 @@
 #
 # Machine selection
 #
+# CONFIG_ACER_PICA_61 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_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
-# CONFIG_SGI_IP27 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
+# CONFIG_VADEM_CLIO_1000 is not set
+# 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_SGI_IP22=y
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_SWARM 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_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_ARC32=y
-CONFIG_ARC_CONSOLE=y
-CONFIG_ARC_MEMORY=y
 CONFIG_BOARD_SCACHE=y
+CONFIG_IRQ_CPU=y
 CONFIG_PC_KEYB=y
-CONFIG_BOOT_ELF32=y
-CONFIG_NONCOHERENT_IO=y
 CONFIG_SGI=y
-CONFIG_L1_CACHE_SHIFT=5
+CONFIG_NEW_IRQ=y
+CONFIG_NEW_TIME_C=y
+CONFIG_NONCOHERENT_IO=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
 
 #
 # CPU selection
 #
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
 # CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
 CONFIG_CPU_R5000=y
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5900 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_MIPS_FPU_EMULATOR 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_BINFMT_IRIX is not set
+# CONFIG_FORWARD_KEYBOARD is not set
+CONFIG_ARC_CONSOLE=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_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
@@ -58,18 +118,6 @@
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-CONFIG_ARC_CONSOLE=y
-CONFIG_BINFMT_ELF=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_BINFMT_ELF32=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
 
 #
 # Memory Technology Devices (MTD)
@@ -112,8 +160,6 @@
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK=y
-CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
@@ -165,13 +211,6 @@
 # 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=y
@@ -205,6 +244,7 @@
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -366,6 +406,7 @@
 # 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
@@ -383,6 +424,12 @@
 # CONFIG_VIDEO_DEV is not set
 
 #
+# SGI Character devices
+#
+CONFIG_SGI_NEWPORT_CONSOLE=y
+CONFIG_FONT_8x16=y
+
+#
 # File systems
 #
 # CONFIG_QUOTA is not set
@@ -481,14 +528,13 @@
 #
 # Console drivers
 #
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_MDA_CONSOLE is not set
 
 #
 # Frame-buffer support
 #
 # CONFIG_FB is not set
-CONFIG_SGI_NEWPORT_CONSOLE=y
-CONFIG_FONT_8x16=y
-CONFIG_KCORE_ELF=y
 
 #
 # Sound
@@ -618,7 +664,8 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
-# CONFIG_MIPS_FPE_MODULE is not set
 # CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
+# CONFIG_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set

Index: defconfig-ip27
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip27,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-ip27	13 Dec 2001 21:05:10 -0000	1.7
+++ defconfig-ip27	12 Feb 2002 18:22:34 -0000	1.8
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_MIPS=y
 
 #
 # Code maturity level options
@@ -10,46 +11,73 @@
 #
 # Machine selection
 #
-CONFIG_SGI_IP27=y
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SGI_SN0_N_MODE is not set
-CONFIG_DISCONTIGMEM=y
-CONFIG_NUMA=y
-# CONFIG_MAPPED_KERNEL is not set
-# CONFIG_REPLICATE_KTEXT is not set
-# CONFIG_REPLICATE_EXHANDLERS is not set
-CONFIG_SMP=y
+# 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_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_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_BOOT_ELF64=y
-CONFIG_ARC64=y
-CONFIG_MAPPED_PCI_IO=y
-CONFIG_PCI=y
-CONFIG_QL_ISP_A64=y
-CONFIG_L1_CACHE_SHIFT=7
-# CONFIG_ISA is not set
-# CONFIG_EISA 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 is not set
 
 #
 # CPU selection
 #
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
 # CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5900 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 CONFIG_CPU_R10000=y
 # CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
-# CONFIG_MIPS_INSANE_LARGE is not set
 # 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_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_HOTPLUG is not set
@@ -58,16 +86,6 @@
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-CONFIG_BINFMT_ELF=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_BINFMT_ELF32=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-CONFIG_PCI_NAMES=y
 
 #
 # Memory Technology Devices (MTD)
@@ -110,8 +128,6 @@
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK=y
-CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
@@ -227,6 +243,16 @@
 # CONFIG_SCSI_U14_34F is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI 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
@@ -466,7 +492,6 @@
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
-CONFIG_KCORE_ELF=y
 
 #
 # Sound
@@ -589,4 +614,6 @@
 #
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
+# CONFIG_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set

Index: defconfig-ip32
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip32,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-ip32	5 Feb 2002 17:29:27 -0000	1.7
+++ defconfig-ip32	12 Feb 2002 18:22:34 -0000	1.8
@@ -2,7 +2,6 @@
 # Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
-CONFIG_MIPS64=y
 
 #
 # Code maturity level options
@@ -12,45 +11,96 @@
 #
 # Machine selection
 #
+# CONFIG_ACER_PICA_61 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_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
-# CONFIG_SGI_IP27 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
+# CONFIG_VADEM_CLIO_1000 is not set
+# 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_SGI_IP22 is not set
-CONFIG_SGI_IP32=y
-# CONFIG_SIBYTE_SWARM 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_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_BOOT_ELF32=y
-CONFIG_ARC32=y
-CONFIG_PC_KEYB=y
-CONFIG_PCI=y
-# CONFIG_MAPPED_PCI_IO is not set
-CONFIG_NONCOHERENT_IO=y
-CONFIG_ARC_MEMORY=y
-CONFIG_L1_CACHE_SHIFT=5
-# CONFIG_ISA is not set
-# CONFIG_EISA 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 is not set
 
 #
 # CPU selection
 #
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
 # CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
 CONFIG_CPU_R5000=y
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5900 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_MIPS_FPU_EMULATOR 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_BINFMT_IRIX is not set
+# CONFIG_FORWARD_KEYBOARD is not set
+CONFIG_ARC_CONSOLE=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+# CONFIG_CPU_FREQ is not set
 CONFIG_NET=y
 CONFIG_PCI_NAMES=y
 # CONFIG_HOTPLUG is not set
@@ -59,17 +109,6 @@
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
-CONFIG_ARC_CONSOLE=y
-CONFIG_BINFMT_ELF=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_BINFMT_ELF32=y
-CONFIG_BINFMT_MISC=y
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-CONFIG_PCI_NAMES=y
 
 #
 # Memory Technology Devices (MTD)
@@ -245,6 +284,16 @@
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI 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
@@ -257,7 +306,6 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -487,7 +535,6 @@
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
-CONFIG_KCORE_ELF=y
 
 #
 # Sound
@@ -610,5 +657,7 @@
 #
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
+# CONFIG_DEBUG is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MIPS_UNCACHED=y

Index: defconfig-malta
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-malta,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defconfig-malta	15 Dec 2001 00:13:45 -0000	1.2
+++ defconfig-malta	12 Feb 2002 18:22:34 -0000	1.3
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_MIPS=y
 
 #
 # Code maturity level options
@@ -10,57 +11,108 @@
 #
 # Machine selection
 #
+# CONFIG_ACER_PICA_61 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_ATLAS is not set
 CONFIG_MIPS_MALTA=y
-# CONFIG_SGI_IP27 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
+# CONFIG_VADEM_CLIO_1000 is not set
+# 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_SGI_IP22 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_SWARM 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_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_BOOT_ELF32=y
-CONFIG_L1_CACHE_SHIFT=5
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
+CONFIG_I8259=y
+CONFIG_PCI=y
+CONFIG_HAVE_STD_PC_SERIAL_PORT=y
+CONFIG_NEW_IRQ=y
+CONFIG_NEW_TIME_C=y
 CONFIG_NONCOHERENT_IO=y
+CONFIG_SWAP_IO_SPACE=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
 
 #
 # CPU selection
 #
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
 CONFIG_CPU_R4X00=y
+# CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5900 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_MIPS_FPU_EMULATOR 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_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_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_BINFMT_ELF=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_BINFMT_ELF32=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -103,7 +155,7 @@
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -116,6 +168,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -184,11 +237,13 @@
 #
 # SCSI low-level drivers
 #
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_ACARD is not set
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -197,6 +252,7 @@
 # CONFIG_SCSI_AM53C974 is not set
 # CONFIG_SCSI_MEGARAID is not set
 # CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_DTC3280 is not set
 # CONFIG_SCSI_EATA is not set
@@ -209,18 +265,35 @@
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NCR53C7xx is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_NCR53C8XX is not set
+# CONFIG_SCSI_SYM53C8XX is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PCI2000 is not set
 # CONFIG_SCSI_PCI2220I is not set
 # CONFIG_SCSI_PSI240I is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_SIM710 is not set
 # CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_PCI 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
@@ -239,6 +312,7 @@
 #
 CONFIG_NET_ETHERNET=y
 # CONFIG_SUNLANCE is not set
+# CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
 # CONFIG_SUNLANCE is not set
@@ -247,6 +321,7 @@
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL 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
@@ -348,6 +423,7 @@
 # CONFIG_INTEL_RNG is not set
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
+# CONFIG_MIPS_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -446,7 +522,6 @@
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
-CONFIG_KCORE_ELF=y
 
 #
 # Sound
@@ -569,5 +644,7 @@
 #
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
+# CONFIG_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set

Index: defconfig-sb1250-swarm
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-sb1250-swarm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defconfig-sb1250-swarm	13 Dec 2001 21:05:10 -0000	1.3
+++ defconfig-sb1250-swarm	12 Feb 2002 18:22:34 -0000	1.4
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_MIPS=y
 
 #
 # Code maturity level options
@@ -10,39 +11,80 @@
 #
 # Machine selection
 #
-# CONFIG_SGI_IP27 is not set
-CONFIG_SIBYTE_SWARM=y
-CONFIG_SMP=y
+# 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_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_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_BOOT_ELF64=y
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
+CONFIG_NEW_IRQ=y
 CONFIG_SWAP_IO_SPACE=y
-CONFIG_CFE=y
-CONFIG_SIBYTE_SB1250=y
-CONFIG_L1_CACHE_SHIFT=5
+CONFIG_NEW_TIME_C=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
 
 #
 # CPU selection
 #
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_R4300 is not set
 # CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R5900 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R8000 is not set
 # CONFIG_CPU_R10000 is not set
 CONFIG_CPU_SB1=y
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_SB1_PASS_1_WORKAROUNDS is not set
+# CONFIG_SB1_CACHE_ERROR is not set
+CONFIG_VTAG_ICACHE=y
+CONFIG_CPU_HAS_PREFETCH=y
+# CONFIG_64BIT_PHYS_ADDR is not set
+# CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # 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_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_HOTPLUG is not set
 # CONFIG_PCMCIA is not set
@@ -50,15 +92,6 @@
 # CONFIG_SYSVIPC is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_SYSCTL is not set
-CONFIG_BINFMT_ELF=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_BINFMT_ELF32=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -84,6 +117,7 @@
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
+# CONFIG_EMBEDDED_RAMDISK is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -101,7 +135,7 @@
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -147,6 +181,15 @@
 # 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
@@ -294,6 +337,7 @@
 # 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
@@ -406,7 +450,6 @@
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_SMB_NLS is not set
 # CONFIG_NLS is not set
-CONFIG_KCORE_ELF=y
 
 #
 # Sound
@@ -529,4 +572,6 @@
 #
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
+# CONFIG_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set

[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-79S334-be,1.1,1.2 defconfig-79S334-le,1.1,1.2 defconfig-atlas,1.12,1.13 defconfig-casio-be300,1.1,1.2 defconfig-cobalt,1.15,1.16 defconfig-ddb5476,1.16,1.17 defconfig-ddb5477,1.16,1.17 defconfig-decstation,1.13,1.14 defconfig-eagle,1.12,1.13 defconfig-ev64120,1.12,1.13 defconfig-ev96100,1.13,1.14 defconfig-hp-lj,1.2,1.3 defconfig-ip22,1.13,1.14 defconfig-it8172,1.16,1.17 defconfig-ivr,1.2,1.3 defconfig-jmr3927,1.4,1.5 defconfig-malta,1.12,1.13 defconfig-nino,1.16,1.17 defconfig-ocelot,1.12,1.13 defconfig-osprey,1.12,1.13 defconfig-pb1000,1.17,1.18 defconfig-pb1500,1.1,1.2 defconfig-rm200,1.12,1.13 defconfig-sb1250-swarm,1.5,1.6 defconfig-spartacus,1.1,1.2

From: James S. <jsi...@us...> - 2002-02-12 18:21:28

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

Modified Files:
	defconfig-79S334-be defconfig-79S334-le defconfig-atlas 
	defconfig-casio-be300 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-malta defconfig-nino 
	defconfig-ocelot defconfig-osprey defconfig-pb1000 
	defconfig-pb1500 defconfig-rm200 defconfig-sb1250-swarm 
	defconfig-spartacus 
Log Message:
Updated default configs.

Index: defconfig-79S334-be
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-79S334-be,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-79S334-be	15 Jan 2002 00:34:06 -0000	1.1
+++ defconfig-79S334-be	12 Feb 2002 18:21:25 -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
 
@@ -14,21 +14,22 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_NINO is not set
-# CONFIG_MIPS_LXPB20K 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
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# CONFIG_NEC_MOBILEPRO is not set
 CONFIG_IDT_79S334=y
 # CONFIG_IDT_79EB355 is not set
 # CONFIG_MIPS_MAGNUM_4000 is not set
@@ -45,21 +46,22 @@
 # CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_HP_LASERJET is not set
+# CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_MCA is not set
 # CONFIG_SBUS is not set
+CONFIG_CPU_RC32334=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
 CONFIG_PCI=y
 CONFIG_NEW_PCI=y
 CONFIG_PCI_AUTO=y
 CONFIG_NONCOHERENT_IO=y
+CONFIG_SWAP_IO_SPACE=y
 CONFIG_PC_KEYB=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -72,7 +74,6 @@
 # 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
@@ -83,6 +84,7 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
@@ -98,6 +100,8 @@
 # General setup
 #
 # 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_BINFMT_IRIX is not set
@@ -105,6 +109,7 @@
 # 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_HOTPLUG is not set
@@ -175,6 +180,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
@@ -235,7 +244,6 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -259,11 +267,11 @@
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
 CONFIG_TULIP=y
-# CONFIG_TC35815 is not set
 # 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 is not set
 # CONFIG_LNE390 is not set
@@ -368,6 +376,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
 
 #
@@ -497,10 +513,17 @@
 # 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
-# CONFIG_USB_NON_PCI_OHCI is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH is not set
 # CONFIG_USB_STORAGE is not set
@@ -514,16 +537,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
 
 #
@@ -554,6 +605,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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-79S334-le	15 Jan 2002 00:34:06 -0000	1.1
+++ defconfig-79S334-le	12 Feb 2002 18:21:25 -0000	1.2
@@ -1,8 +1,7 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
-CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -15,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -30,7 +29,7 @@
 # CONFIG_CASIO_BE300 is not set
 # CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# CONFIG_NEC_MOBILEPRO is not set
 CONFIG_IDT_79S334=y
 # CONFIG_IDT_79EB355 is not set
 # CONFIG_MIPS_MAGNUM_4000 is not set
@@ -52,12 +51,14 @@
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 # CONFIG_MCA is not set
 # CONFIG_SBUS is not set
+CONFIG_CPU_RC32334=y
 CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
 CONFIG_PCI=y
 CONFIG_NEW_PCI=y
 CONFIG_PCI_AUTO=y
 CONFIG_NONCOHERENT_IO=y
+CONFIG_SWAP_IO_SPACE=y
 CONFIG_PC_KEYB=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
@@ -83,6 +84,7 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
@@ -98,6 +100,8 @@
 # General setup
 #
 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
@@ -184,6 +188,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
@@ -267,11 +275,11 @@
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
 CONFIG_TULIP=y
-# CONFIG_TC35815 is not set
 # 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
@@ -376,6 +384,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
 
 #
@@ -549,9 +565,17 @@
 # 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
 # CONFIG_USB_STORAGE is not set
@@ -565,16 +589,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
 
 #
@@ -605,6 +657,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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defconfig-atlas	27 Nov 2001 23:31:02 -0000	1.12
+++ defconfig-atlas	12 Feb 2002 18:21:25 -0000	1.13
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -27,7 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -39,18 +43,21 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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_NONCOHERENT_IO=y
 CONFIG_PCI=y
 CONFIG_SWAP_IO_SPACE=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -71,20 +78,25 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_WB is not set
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # 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_BINFMT_IRIX=y
@@ -92,10 +104,12 @@
 # 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_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
@@ -141,7 +155,7 @@
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -154,6 +168,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -228,6 +243,7 @@
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -249,6 +265,7 @@
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NCR53C7xx is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_NCR53C8XX is not set
 # CONFIG_SCSI_SYM53C8XX is not set
 # CONFIG_SCSI_PAS16 is not set
@@ -406,6 +423,7 @@
 # CONFIG_INTEL_RNG is not set
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
+# CONFIG_MIPS_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -430,11 +448,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -472,6 +494,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 CONFIG_ROOT_NFS=y

Index: defconfig-casio-be300
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-be300,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-casio-be300	20 Jan 2002 03:22:13 -0000	1.1
+++ defconfig-casio-be300	12 Feb 2002 18:21:25 -0000	1.2
@@ -1,8 +1,7 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
-CONFIG_MIPS32=y
 
 #
 # Code maturity level options
@@ -15,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -30,7 +29,7 @@
 CONFIG_CASIO_BE300=y
 # CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# 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
@@ -228,6 +227,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
 
 #
@@ -349,9 +356,17 @@
 # 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
 # CONFIG_USB_STORAGE is not set
@@ -365,11 +380,43 @@
 # 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
+#
+
+#
+#   Networking support is needed for USB Networking device support
+#
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -400,6 +447,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-cobalt
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-cobalt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- defconfig-cobalt	1 Dec 2001 00:58:25 -0000	1.15
+++ defconfig-cobalt	12 Feb 2002 18:21:25 -0000	1.16
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-CONFIG_COBALT_MICRO_SERVER=y
+# CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 # CONFIG_NEC_EAGLE is not set
@@ -27,8 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# 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
@@ -40,24 +43,16 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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
-COBALT_MICRO_SERVER=y
-CONFIG_NO_SWAPPER=y
-CONFIG_COBALT_27=y
-CONFIG_NO_KEYBOARD=y
-CONFIG_NO_VIDEO_CONSOLE=y
-CONFIG_COBALT_LCD=y
-CONFIG_PCI=y
-CONFIG_NONCOHERENT_IO=y
-CONFIG_NEW_TIME_C=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -80,11 +75,13 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 CONFIG_CPU_NEVADA=y
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
 CONFIG_CPU_ADVANCED=y
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
@@ -94,15 +91,18 @@
 # General setup
 #
 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_NET=y
-# CONFIG_PCI_NAMES 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
@@ -148,7 +148,7 @@
 #
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 CONFIG_FILTER=y
 CONFIG_UNIX=y
@@ -158,12 +158,17 @@
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 CONFIG_INET_ECN=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_IPV6 is not set
 # 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
@@ -198,6 +203,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
@@ -216,44 +225,15 @@
 # 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_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_SHARE_IRQ is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_ADMA=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_IDEDMA_PCI_AUTO is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_PCI_WIP is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_AEC62XX_TUNING is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_WDC_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_AMD74XX_OVERRIDE is not set
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_HPT34X_AUTODMA is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_PDC202XX is not set
-# CONFIG_PDC202XX_BURST is not set
-# CONFIG_PDC202XX_FORCE is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIS5513 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_IVB is not set
 # CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_IDE_MODES is not set
 # CONFIG_BLK_DEV_ATARAID is not set
@@ -269,7 +249,6 @@
 # I2O device support
 #
 # CONFIG_I2O is not set
-# CONFIG_I2O_PCI is not set
 # CONFIG_I2O_BLOCK is not set
 # CONFIG_I2O_LAN is not set
 # CONFIG_I2O_SCSI is not set
@@ -294,7 +273,6 @@
 #
 CONFIG_NET_ETHERNET=y
 # CONFIG_SUNLANCE is not set
-# CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
 # CONFIG_SUNLANCE is not set
@@ -303,39 +281,8 @@
 # CONFIG_LANCE is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_HP100 is not set
 # CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_APRICOT is not set
-# CONFIG_CS89x0 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 is not set
-# CONFIG_LNE390 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NE3210 is not set
-# CONFIG_ES3210 is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_SIS900 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_LAN_SAA9730 is not set
+# CONFIG_NET_PCI is not set
 # CONFIG_NET_POCKET is not set
 
 #
@@ -417,6 +364,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
 
 #
@@ -426,7 +381,6 @@
 # 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
@@ -451,11 +405,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -493,6 +451,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 # CONFIG_ROOT_NFS is not set
@@ -531,9 +490,17 @@
 # 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
 # CONFIG_USB_STORAGE is not set
@@ -547,16 +514,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
 
 #
@@ -587,6 +582,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-ddb5476
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5476,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- defconfig-ddb5476	28 Nov 2001 19:00:10 -0000	1.16
+++ defconfig-ddb5476	12 Feb 2002 18:21:25 -0000	1.17
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -27,8 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# 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
@@ -40,8 +43,10 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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
@@ -78,29 +83,35 @@
 CONFIG_CPU_R5432=y
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_WB is not set
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 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_NET=y
 # CONFIG_PCI_NAMES 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
@@ -152,7 +163,7 @@
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -165,6 +176,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -355,6 +367,7 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_NET_POCKET is not set
@@ -485,11 +498,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -527,6 +544,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 CONFIG_ROOT_NFS=y
@@ -581,6 +599,7 @@
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_E1356 is not set
 # CONFIG_FB_IT8181 is not set
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
 CONFIG_FBCON_CFB8=y

Index: defconfig-ddb5477
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5477,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- defconfig-ddb5477	5 Dec 2001 01:46:07 -0000	1.16
+++ defconfig-ddb5477	12 Feb 2002 18:21:25 -0000	1.17
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_MIPS=y
 
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -27,8 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# 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
@@ -43,6 +46,7 @@
 # CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_HP_LASERJET 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
@@ -57,7 +61,6 @@
 CONFIG_DUMMY_KEYB=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -78,11 +81,13 @@
 CONFIG_CPU_R5432=y
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_LLDSCD=y
@@ -92,11 +97,14 @@
 # General setup
 #
 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_NET=y
 # CONFIG_PCI_NAMES is not set
 # CONFIG_HOTPLUG is not set
@@ -147,7 +155,7 @@
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -160,12 +168,17 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
 # 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
@@ -249,11 +262,11 @@
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
 CONFIG_TULIP=y
-# CONFIG_TC35815 is not set
 # 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 is not set
 # CONFIG_LNE390 is not set
@@ -357,6 +370,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
 
 #
@@ -484,6 +505,7 @@
 # CONFIG_SOUND_ICH is not set
 # CONFIG_SOUND_RME96XX is not set
 # CONFIG_SOUND_SONICVIBES is not set
+# CONFIG_SOUND_HAL2 is not set
 CONFIG_SOUND_VRC5477=y
 # CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
@@ -497,9 +519,17 @@
 # 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
 # CONFIG_USB_STORAGE is not set
@@ -513,16 +543,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-decstation
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-decstation,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defconfig-decstation	27 Nov 2001 23:31:02 -0000	1.13
+++ defconfig-decstation	12 Feb 2002 18:21:25 -0000	1.14
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
+# CONFIG_MIPS_COBALT is not set
 CONFIG_DECSTATION=y
 # CONFIG_DDB5074 is not set
 # CONFIG_NEC_EAGLE is not set
@@ -27,7 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -39,16 +43,17 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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_NONCOHERENT_IO=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -71,11 +76,13 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
 # CONFIG_CPU_ADVANCED is not set
 # CONFIG_CPU_HAS_LLSC is not set
 # CONFIG_CPU_HAS_LLDSCD is not set
@@ -85,14 +92,18 @@
 # General setup
 #
 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_NET=y
 # 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
@@ -139,7 +150,7 @@
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -152,6 +163,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -220,6 +232,7 @@
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -399,7 +412,6 @@
 #
 # DECStation Character devices
 #
-# CONFIG_VT is not set
 CONFIG_SERIAL=y
 # CONFIG_DZ is not set
 CONFIG_ZS=y
@@ -414,11 +426,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -456,6 +472,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3 is not set
 # CONFIG_ROOT_NFS is not set

Index: defconfig-eagle
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-eagle,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defconfig-eagle	18 Jan 2002 21:22:14 -0000	1.12
+++ defconfig-eagle	12 Feb 2002 18:21:25 -0000	1.13
@@ -14,22 +14,25 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER is not set
+# CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
 CONFIG_NEC_EAGLE=y
 CONFIG_NEC_EAGLE_MEM_SIZE=64
+# CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_MALTA is not set
 # CONFIG_NINO is not set
-# CONFIG_MIPS_LXPB20K 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
 # CONFIG_VADEM_CLIO_1000 is not set
-# CONFIG_NEC_MOBILEPRO_780 is not set
+# 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
@@ -44,9 +47,9 @@
 # CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_HP_LASERJET is not set
+# CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_MCA is not set
 # CONFIG_SBUS is not set
 CONFIG_CPU_VR41XX=y
@@ -60,7 +63,6 @@
 CONFIG_PCI_AUTO=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -73,7 +75,6 @@
 # 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
@@ -84,11 +85,13 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
 # CONFIG_CPU_ADVANCED is not set
 # CONFIG_CPU_HAS_LLSC is not set
 # CONFIG_CPU_HAS_LLDSCD is not set
@@ -98,11 +101,14 @@
 # General setup
 #
 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_NET=y
 # CONFIG_PCI_NAMES is not set
 CONFIG_HOTPLUG=y
@@ -114,6 +120,7 @@
 CONFIG_CARDBUS=y
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
+# CONFIG_PCMCIA_IRQ_REMAP is not set
 # CONFIG_TCIC is not set
 
 #
@@ -324,7 +331,6 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -348,9 +354,9 @@
 # CONFIG_APRICOT is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_TULIP is not set
-# CONFIG_TC35815 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 is not set
 # CONFIG_LNE390 is not set
@@ -638,7 +644,6 @@
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_CLGEN is not set
 # CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_E1355 is not set
 CONFIG_FB_MQ200=y
@@ -651,6 +656,7 @@
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_E1356 is not set
 # CONFIG_FB_IT8181 is not set
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 # CONFIG_FBCON_MFB is not set
@@ -703,7 +709,6 @@
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
-# CONFIG_USB_NON_PCI_OHCI is not set
 
 #
 # USB Device Class drivers

Index: defconfig-ev64120
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ev64120,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defconfig-ev64120	27 Nov 2001 23:31:02 -0000	1.12
+++ defconfig-ev64120	12 Feb 2002 18:21:25 -0000	1.13
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -31,7 +31,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -43,8 +47,10 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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
@@ -52,11 +58,11 @@
 CONFIG_PCI=y
 # CONFIG_ISA is not set
 CONFIG_MIPS_GT64120=y
+CONFIG_NEW_IRQ=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_OLD_TIME_C=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -79,20 +85,25 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_WB is not set
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # 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_BINFMT_IRIX is not set
@@ -100,10 +111,12 @@
 # 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_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
@@ -148,7 +161,7 @@
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -161,6 +174,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -275,6 +289,7 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_NET_POCKET is not set
@@ -407,11 +422,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -449,6 +468,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 CONFIG_ROOT_NFS=y

Index: defconfig-ev96100
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ev96100,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defconfig-ev96100	27 Nov 2001 23:31:02 -0000	1.13
+++ defconfig-ev96100	12 Feb 2002 18:21:25 -0000	1.14
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -27,7 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -39,21 +43,23 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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_PCI=y
 CONFIG_MIPS_GT96100=y
-CONFIG_SWAP_IO_SPACE=y
+CONFIG_NEW_IRQ=y
 CONFIG_NEW_PCI=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PCI_AUTO=y
+CONFIG_SWAP_IO_SPACE=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -76,20 +82,26 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 CONFIG_CPU_RM7000=y
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+CONFIG_CPU_HAS_PREFETCH=y
+# CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_WB is not set
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # 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_BINFMT_IRIX is not set
@@ -97,10 +109,12 @@
 # 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_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
@@ -145,7 +159,7 @@
 # Networking options
 #
 # CONFIG_PACKET is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 # CONFIG_UNIX is not set
@@ -158,6 +172,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -275,6 +290,7 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_NET_POCKET is not set
@@ -400,11 +416,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -442,6 +462,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 CONFIG_ROOT_NFS=y

Index: defconfig-hp-lj
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-hp-lj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defconfig-hp-lj	27 Nov 2001 23:31:02 -0000	1.2
+++ defconfig-hp-lj	12 Feb 2002 18:21:25 -0000	1.3
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -27,7 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -39,23 +43,22 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-CONFIG_HP_LASERJET=y
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+CONFIG_HP_LASERJET=y
+# 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_PCI=y
 CONFIG_IRQ_CPU=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NEW_IRQ=y
-CONFIG_IRQ_CPU=y
 CONFIG_NEW_PCI=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_PCI=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -78,29 +81,36 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_WB is not set
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 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_NET=y
 # CONFIG_PCI_NAMES 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
@@ -146,6 +156,7 @@
 CONFIG_MTD_PHYSMAP_START=10040000
 CONFIG_MTD_PHYSMAP_LEN=00fc0000
 CONFIG_MTD_PHYSMAP_BUSWIDTH=4
+# CONFIG_MTD_PB1000 is not set
 # CONFIG_MTD_CSTM_MIPS_IXX is not set
 # CONFIG_MTD_OCELOT is not set
 
@@ -208,7 +219,7 @@
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK is not set
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
@@ -221,6 +232,7 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_IPV6 is not set
@@ -409,6 +421,7 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_NET_POCKET is not set
@@ -519,6 +532,7 @@
 # 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
@@ -543,11 +557,15 @@
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -586,6 +604,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y

Index: defconfig-ip22
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ip22,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defconfig-ip22	27 Nov 2001 23:31:02 -0000	1.13
+++ defconfig-ip22	12 Feb 2002 18:21:25 -0000	1.14
@@ -14,7 +14,7 @@
 # CONFIG_ACER_PICA_61 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
-# CONFIG_COBALT_MICRO_SERVER 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
@@ -27,7 +27,11 @@
 # CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
+# CONFIG_CASIO_E15 is not set
 # CONFIG_VADEM_CLIO_1000 is not set
+# 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
@@ -39,8 +43,10 @@
 # CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_IVR is not set
 # CONFIG_MIPS_PB1000 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_HP_LASERJET 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
@@ -55,8 +61,6 @@
 CONFIG_NONCOHERENT_IO=y
 # CONFIG_ISA is not set
 # CONFIG_EISA is not set
-# CONFIG_PCI is not set
-# CONFIG_I8259 is not set
 
 #
 # Loadable module support
@@ -79,20 +83,25 @@
 # CONFIG_CPU_R5432 is not set
 # CONFIG_CPU_R5900 is not set
 # CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_SR7100 is not set
 # CONFIG_CPU_NEVADA is not set
 # CONFIG_CPU_R10000 is not set
 # CONFIG_CPU_SB1 is not set
 # CONFIG_CPU_MIPS32 is not set
 # CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_RC32300 is not set
+# CONFIG_64BIT_PHYS_ADDR is not set
 # CONFIG_CPU_ADVANCED is not set
 CONFIG_CPU_HAS_LLSC=y
-# CONFIG_CPU_HAS_WB is not set
 CONFIG_CPU_HAS_LLDSCD=y
+# CONFIG_CPU_HAS_WB is not set
 
 #
 # General setup
 #
 # 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_BINFMT_IRIX=y
@@ -101,9 +110,11 @@
 # 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_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
@@ -149,8 +160,6 @@
 #
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK=y
-CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
@@ -235,6 +244,7 @@
 # CONFIG_SCSI_AHA152X is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -279,7 +289,6 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -399,6 +408,7 @@
 # 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
@@ -420,10 +430,6 @@
 #
 CONFIG_SGI_NEWPORT_CONSOLE=y
 CONFIG_FONT_8x16=y
-CONFIG_PSMOUSE=y
-CONFIG_MOUSE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
 
 #
 # File systems
@@ -433,11 +439,15 @@
 CONFIG_AUTOFS4_FS=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_JBD_DEBUG is not set
 # CONFIG_FAT_FS is not set
 # CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
@@ -475,6 +485,7 @@
 # Network File Systems
 #
 # CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 CONFIG_ROOT_NFS=y
@@ -655,6 +666,8 @@
 # Kernel hacking
 #
 CONFIG_CROSSCOMPILE=y
+# CONFIG_REMOTE_DEBUG is not set
+# CONFIG_GDB_CONSOLE is not set
 # CONFIG_DEBUG is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MIPS_UNCACHED is not set

Index: defconfig-it8172
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-it8172,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- defconfig-it8172	27 Nov 2001 23:31:02 -0000	1.16
+++ defconfig-it8172	12 Feb 2002 18:21:25 -0000	1.17
@@ -14,7 +14,7 @@
 # CONFI...
 
[truncated message content]

[Linux-mips-commits]CVS: linux/drivers/net ioc3-eth.c,1.7,1.8

From: James S. <jsi...@us...> - 2002-02-12 18:16:18

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

Modified Files:
	ioc3-eth.c 
Log Message:
Use __devexit_p().

Index: ioc3-eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/ioc3-eth.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ioc3-eth.c	5 Feb 2002 17:05:28 -0000	1.7
+++ ioc3-eth.c	12 Feb 2002 18:16:14 -0000	1.8
@@ -340,14 +340,15 @@
 }
 
 /*
- * Read the NIC (Number-In-a-Can) device.
+ * Read the NIC (Number-In-a-Can) device used to store the MAC address on
+ * SN0 / SN00 nodeboards and PCI cards.
  */
-static void ioc3_get_eaddr(struct ioc3_private *ip)
+static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
 {
 	struct ioc3 *ioc3 = ip->regs;
 	u8 nic[14];
-	int i;
 	int tries = 2; /* There may be some problem with the battery?  */
+	int i;
 
 	ioc3_w(gpcr_s, (1 << 21));
 
@@ -370,15 +371,122 @@
 	for (i = 13; i >= 0; i--)
 		nic[i] = nic_read_byte(ioc3);
 
-	printk("Ethernet address is ");
-	for (i = 2; i < 8; i++) {
+	for (i = 2; i < 8; i++)
 		ip->dev->dev_addr[i - 2] = nic[i];
-		printk("%02x", nic[i]);
+}
+
+#if defined(CONFIG_IA64_SGI_SN1) || defined(CONFIG_IA64_SGI_SN2)
+/*
+ * Get the ether-address on SN1 nodes
+ */
+static void ioc3_get_eaddr_sn(struct ioc3_private *ip)
+{
+	int ibrick_mac_addr_get(nasid_t, char *);
+	struct ioc3 *ioc3 = ip->regs;
+	nasid_t nasid_of_ioc3;
+	char io7eaddr[20];
+	long mac;
+	int err_val;
+
+	/*
+	 * err_val = ibrick_mac_addr_get(get_nasid(), io7eaddr );
+	 * 
+	 * BAD!!  The above call uses get_nasid() and assumes that
+	 * the ioc3 pointed to by struct ioc3 is hooked up to the
+	 * cbrick that we're running on.  The proper way to make this call
+	 * is to figure out which nasid the ioc3 is connected to
+	 * and use that to call ibrick_mac_addr_get.  Below is
+	 * a hack to do just that.
+	 */
+
+	/*
+	 * Get the nasid of the ioc3 from the ioc3's base addr.
+	 * FIXME: the 8 at the end assumes we're in memory mode, 
+	 * not node mode (for that, we'd change it to a 9).
+	 * Is there a call to extract this info from a physical
+	 * addr somewhere in an sn header file already?  If so,
+	 * we should probably use that, or restructure this routine
+	 * to use pci_dev and generic numa nodeid getting stuff.
+	 */
+	nasid_of_ioc3 = (((unsigned long)ioc3 >> 33) & ~(-1 << 8));
+	err_val = ibrick_mac_addr_get(nasid_of_ioc3, io7eaddr );
+
+
+	if (err_val) {
+		/* Couldn't read the eeprom; try OSLoadOptions. */
+		printk("WARNING: ibrick_mac_addr_get failed: %d\n", err_val);
+
+		/* this is where we hardwire the mac address
+ 		 * 1st ibrick had 08:00:69:11:34:75
+ 		 * 2nd ibrick had 08:00:69:11:35:35
+ 		 *
+ 		 * Eagan Machines:
+ 		 *      mankato1 08:00:69:11:BE:95
+ 		 *      warroad  08:00:69:11:bd:60
+ 		 *      duron    08:00:69:11:34:60
+ 		 *
+ 		 * an easy way to get the mac address is to hook
+ 		 * up an ip35, then from L1 do 'cti serial'
+ 		 * and then look for MAC line XXX THIS DOESN"T QUITE WORK!!
+ 		 */
+		printk("ioc3_get_eaddr: setting ethernet address to:\n -----> ");
+		ip->dev->dev_addr[0] = 0x8;
+		ip->dev->dev_addr[1] = 0x0;
+		ip->dev->dev_addr[2] = 0x69;
+		ip->dev->dev_addr[3] = 0x11;
+		ip->dev->dev_addr[4] = 0x34;
+		ip->dev->dev_addr[5] = 0x60;
+	}
+	else {
+		long simple_strtol(const char *,char **,unsigned int);
+
+		mac = simple_strtol(io7eaddr, (char **)0, 16);
+		ip->dev->dev_addr[0] = (mac >> 40) & 0xff;
+		ip->dev->dev_addr[1] = (mac >> 32) & 0xff;
+		ip->dev->dev_addr[2] = (mac >> 24) & 0xff;
+		ip->dev->dev_addr[3] = (mac >> 16) & 0xff;
+		ip->dev->dev_addr[4] = (mac >> 8) & 0xff;
+		ip->dev->dev_addr[5] = mac & 0xff;
+	}
+}
+#endif
+
+/*
+ * Ok, this is hosed by design.  It's necessary to know what machine the
+ * NIC is in in order to know how to read the NIC address.  We also have
+ * to know if it's a PCI card or a NIC in on the node board ...
+ */
+static void ioc3_get_eaddr(struct ioc3_private *ip)
+{
+	void (*do_get_eaddr)(struct ioc3_private *ip) = NULL;
+	int i;
+
+	/*
+	 * We should also use this code for PCI cards, no matter what host
+	 * machine but how to know that we're a PCI card?
+	 */
+#ifdef CONFIG_SGI_IP27
+	do_get_eaddr = ioc3_get_eaddr_nic;
+#endif
+#if defined(CONFIG_IA64_SGI_SN1) || defined(CONFIG_IA64_SGI_SN2)
+	do_get_eaddr = ioc3_get_eaddr_sn;
+#endif
+
+	if (!do_get_eaddr) {
+		printk(KERN_ERR "Don't know how to read MAC address of this "
+		       "IOC3 NIC\n");
+		return;
+	}
+
+	printk("Ethernet address is ");
+	for (i = 0; i < 6; i++) {
+		printk("%02x", ip->dev->dev_addr[i]);
 		if (i < 7)
 			printk(":");
 	}
 	printk(".\n");
 }
+
 
 /*
  * Caller must hold the ioc3_lock ever for MII readers.  This is also

[Linux-mips-commits]CVS: linux/include/asm-mips64 bootinfo.h,1.8,1.9

From: James S. <jsi...@us...> - 2002-02-12 18:15:35

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

Modified Files:
	bootinfo.h 
Log Message:
Update from 32-bit kernel.

Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/bootinfo.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bootinfo.h	4 Jan 2002 18:04:53 -0000	1.8
+++ bootinfo.h	12 Feb 2002 18:15:32 -0000	1.9
@@ -9,6 +9,8 @@
 #ifndef _ASM_BOOTINFO_H
 #define _ASM_BOOTINFO_H
 
+#include <linux/types.h>
+
 /*
  * Values for machgroup
  */
@@ -27,13 +29,12 @@
 #define MACH_GROUP_MOMENCO     12 /* Momentum Boards                          */
 #define MACH_GROUP_ITE         13 /* ITE Semi Eval Boards                     */
 #define MACH_GROUP_PHILIPS     14
-#define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Reference Board            */
+#define MACH_GROUP_GLOBESPAN   15 /* Globespan PVR Referrence Board           */
 #define MACH_GROUP_SIBYTE      16 /* Sibyte Eval Boards                       */
 #define MACH_GROUP_TOSHIBA     17 /* Toshiba Reference Systems TSBREF         */
 #define MACH_GROUP_ALCHEMY     18 /* Alchemy Semi Eval Boards*/
 #define MACH_GROUP_NEC_VR41XX  19 /* NEC Vr41xx based boards/gadgets          */
 #define MACH_GROUP_HP_LJ	20 /* Hewlett Packard LaserJet */
-#define MACH_GROUP_EE          21 /* Emotion Engine (Sony PlayStation 2)      */
 
 /*
  * Valid machtype values for group unknown (low order halfword of mips_machtype)
@@ -159,18 +160,7 @@
 /*
  * Valid machtype for group NEC_VR41XX
  */
-#define MACH_NEC_OSPREY			0	/* Osprey eval board */
-#define MACH_NEC_EAGLE			1	/* NEC Eagle board */
-#define MACH_NEC_KORVA			2	/* NEC korva board */
-#define MACH_VADEM_CLIO_1000		3	/* Vadem Clio 1000 */
-#define MACH_NEC_MOBILEPRO_780		4	/* NEC MobilePro 780 PDA */
-#define MACH_CASIO_E15			5	/* Casio Cassiopeia E15 */
-
-/*
- * Valid machtype for group EE
- */
-#define MACH_T10000			0	/* DTL-10000 */
-#define MACH_PS2			1	/* PlayStation 2 */
+#define MACH_NEC_OSPREY                0       /* Osprey eval board */
 
 #define CL_SIZE			80
 
@@ -191,15 +181,14 @@
 struct boot_mem_map {
 	int nr_map;
 	struct {
-		unsigned long addr;	/* start of memory segment */
-		unsigned long size;	/* size of memory segment */
+		phys_t addr;	/* start of memory segment */
+		phys_t size;	/* size of memory segment */
 		long type;		/* type of memory segment */
 	} map[BOOT_MEM_MAP_MAX];
 };
 
 extern struct boot_mem_map boot_mem_map;
 
-extern void add_memory_region(unsigned long start, unsigned long size,
-                              long type);
+extern void add_memory_region(phys_t start, phys_t size, long type);
 
 #endif /* _ASM_BOOTINFO_H */

[Linux-mips-commits]CVS: linux/include/asm-mips types.h,NONE,1.1 bootinfo.h,1.25,1.26 pgtable.h,1.12,1.13

From: James S. <jsi...@us...> - 2002-02-12 18:14:23

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

Modified Files:
	bootinfo.h pgtable.h 
Added Files:
	types.h 
Log Message:
More fixes for highmem at physical addresss above 4gb.

--- NEW FILE: types.h ---
/*
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
 * Copyright (C) 1994, 1995, 1996, 1999 by Ralf Baechle
 * Copyright (C) 1999 Silicon Graphics, Inc.
 */
#ifndef _ASM_TYPES_H
#define _ASM_TYPES_H

typedef unsigned short umode_t;

/*
 * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
 * header files exported to user space
 */

typedef __signed__ char __s8;
typedef unsigned char __u8;

typedef __signed__ short __s16;
typedef unsigned short __u16;

typedef __signed__ int __s32;
typedef unsigned int __u32;

#if (_MIPS_SZLONG == 64)

typedef __signed__ long __s64;
typedef unsigned long __u64;

#else
 
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
 
#endif

/*
 * These aren't exported outside the kernel to avoid name space clashes
 */
#ifdef __KERNEL__

typedef __signed char s8;
typedef unsigned char u8;

typedef __signed short s16;
typedef unsigned short u16;

typedef __signed int s32;
typedef unsigned int u32;

#if (_MIPS_SZLONG == 64)

typedef __signed__ long s64;
typedef unsigned long u64;

#else

#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
typedef __signed__ long long s64;
typedef unsigned long long u64;
#endif

#endif

#define BITS_PER_LONG _MIPS_SZLONG

typedef u32 dma_addr_t;
typedef u64 dma64_addr_t;

#ifdef CONFIG_64BIT_PHYS_ADDR
typedef unsigned long long phys_t;
#else
typedef unsigned long phys_t;
#endif

#endif /* __KERNEL__ */

#endif /* _ASM_TYPES_H */

Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- bootinfo.h	18 Jan 2002 21:22:23 -0000	1.25
+++ bootinfo.h	12 Feb 2002 18:14:19 -0000	1.26
@@ -9,6 +9,8 @@
 #ifndef _ASM_BOOTINFO_H
 #define _ASM_BOOTINFO_H
 
+#include <linux/types.h>
+
 /*
  * Values for machgroup
  */
@@ -192,15 +194,14 @@
 struct boot_mem_map {
 	int nr_map;
 	struct {
-		unsigned long addr;	/* start of memory segment */
-		unsigned long size;	/* size of memory segment */
+		phys_t addr;	/* start of memory segment */
+		phys_t size;	/* size of memory segment */
 		long type;		/* type of memory segment */
 	} map[BOOT_MEM_MAP_MAX];
 };
 
 extern struct boot_mem_map boot_mem_map;
 
-extern void add_memory_region(unsigned long start, unsigned long size,
-                              long type);
+extern void add_memory_region(phys_t start, phys_t size, long type);
 
 #endif /* _ASM_BOOTINFO_H */

Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pgtable.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pgtable.h	5 Feb 2002 17:34:13 -0000	1.12
+++ pgtable.h	12 Feb 2002 18:14:20 -0000	1.13
@@ -444,12 +444,13 @@
  * Conversion functions: convert a page and protection to a page entry,
  * and a page entry and page directory to the page they refer to.
  */
+
 #ifdef CONFIG_CPU_VR41XX
 #define mk_pte(page, pgprot)                                            \
 ({                                                                      \
         pte_t   __pte;                                                  \
                                                                         \
-        pte_val(__pte) = ((unsigned long)(page - mem_map) << (PAGE_SHIFT + 2)) | \
+        pte_val(__pte) = ((phys_t)(page - mem_map) << (PAGE_SHIFT + 2)) | \
                          pgprot_val(pgprot);                            \
                                                                         \
         __pte;                                                          \
@@ -459,14 +460,14 @@
 ({									\
 	pte_t   __pte;							\
 									\
-	pte_val(__pte) = ((unsigned long)(page - mem_map) << PAGE_SHIFT) | \
+	pte_val(__pte) = ((phys_t)(page - mem_map) << PAGE_SHIFT) | \
 	                 pgprot_val(pgprot);				\
 									\
 	__pte;								\
 })
 #endif
 
-static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
+static inline pte_t mk_pte_phys(phys_t physpage, pgprot_t pgprot)
 {
 #ifdef CONFIG_CPU_VR41XX
         return __pte((physpage << 2) | pgprot_val(pgprot));

[Linux-mips-commits]CVS: linux/include/asm-mips64 io.h,1.13,1.14 types.h,1.1,1.2

From: James S. <jsi...@us...> - 2002-02-12 18:14:23

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

Modified Files:
	io.h types.h 
Log Message:
More fixes for highmem at physical addresss above 4gb.

Index: io.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/io.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- io.h	28 Jan 2002 20:32:05 -0000	1.13
+++ io.h	12 Feb 2002 18:14:20 -0000	1.14
@@ -68,8 +68,6 @@
  */
 #define page_to_phys(page)	PHYSADDR(page_address(page))
 
-typedef unsigned long phys_t;
-
 /*
  * On MIPS, we have the whole physical address space mapped at all
  * times, so "ioremap()" and "iounmap()" do not need to do anything.

Index: types.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- types.h	2 Jan 2002 19:12:18 -0000	1.1
+++ types.h	12 Feb 2002 18:14:20 -0000	1.2
@@ -72,6 +72,8 @@
 typedef u64 dma_addr_t;
 typedef u64 dma64_addr_t;
 
+typedef unsigned long phys_t;
+
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */

[Linux-mips-commits]CVS: linux/arch/mips/sibyte/swarm memory.c,1.1,1.2

From: James S. <jsi...@us...> - 2002-02-12 18:14:22

Update of /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm
In directory usw-pr-cvs1:/tmp/cvs-serv6295/arch/mips/sibyte/swarm

Modified Files:
	memory.c 
Log Message:
More fixes for highmem at physical addresss above 4gb.

Index: memory.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/memory.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- memory.c	8 Nov 2001 17:42:08 -0000	1.1
+++ memory.c	12 Feb 2002 18:14:19 -0000	1.2
@@ -20,16 +20,17 @@
  * Memory related routines 
  */
 
+#include <linux/config.h>
+#include <linux/types.h>
 #include <asm/page.h>
-#include <linux/autoconf.h>
 
-extern long swarm_mem_region_addrs[];
-extern long swarm_mem_region_sizes[];
+extern phys_t swarm_mem_region_addrs[];
+extern phys_t swarm_mem_region_sizes[];
 extern unsigned int swarm_mem_region_count;
 
 int page_is_ram(unsigned long pagenr)
 {
-	unsigned long addr = pagenr << PAGE_SHIFT;
+	phys_t addr = pagenr << PAGE_SHIFT;
 #ifdef CONFIG_SWARM_STANDALONE
 	if (addr < (CONFIG_SIBYTE_SWARM_RAM_SIZE * 1024 * 1024)) {
 		return 1;

[Linux-mips-commits]CVS: linux/arch/mips/mm tlbex-r4k.S,1.4,1.5

From: James S. <jsi...@us...> - 2002-02-12 18:14:21

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

Modified Files:
	tlbex-r4k.S 
Log Message:
More fixes for highmem at physical addresss above 4gb.

Index: tlbex-r4k.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/tlbex-r4k.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tlbex-r4k.S	4 Jan 2002 18:04:53 -0000	1.4
+++ tlbex-r4k.S	12 Feb 2002 18:14:19 -0000	1.5
@@ -28,15 +28,21 @@
 #ifdef CONFIG_64BIT_PHYS_ADDR
 #define PTE_L		ld
 #define PTE_S		sd
+#define PTE_SRL		dsrl
+#define P_MTC0		dmtc0
 #define PTE_SIZE	8
 #define PTEP_INDX_MSK	0xff0
 #define PTE_INDX_MSK	0xff8
+#define PTE_INDX_SHIFT	9
 #else
 #define PTE_L		lw
 #define PTE_S		sw
+#define PTE_SRL		srl
+#define P_MTC0		mtc0
 #define PTE_SIZE	4
 #define PTEP_INDX_MSK	0xff8
 #define PTE_INDX_MSK	0xffc
+#define PTE_INDX_SHIFT	10
 #endif
 
 	__INIT
@@ -82,10 +88,10 @@
 	addu	k1, k1, k0			# add in offset
 	PTE_L	k0, 0(k1)			# get even pte
 	PTE_L	k1, PTE_SIZE(k1)		# get odd pte
-	srl	k0, k0, 6			# convert to entrylo0
-	mtc0	k0, CP0_ENTRYLO0		# load it
-	srl	k1, k1, 6			# convert to entrylo1
-	mtc0	k1, CP0_ENTRYLO1		# load it
+	PTE_SRL	k0, k0, 6			# convert to entrylo0
+	P_MTC0	k0, CP0_ENTRYLO0		# load it
+	PTE_SRL	k1, k1, 6			# convert to entrylo1
+	P_MTC0	k1, CP0_ENTRYLO1		# load it
 	b	1f
 	tlbwr					# write random tlb entry
 1:
@@ -110,10 +116,10 @@
 	addu	k1, k1, k0
 	PTE_L	k0, 0(k1)
 	PTE_L	k1, PTE_SIZE(k1)
-	srl	k0, k0, 6
-	mtc0	k0, CP0_ENTRYLO0
-	srl	k1, k1, 6
-	mtc0	k1, CP0_ENTRYLO1
+	PTE_SRL	k0, k0, 6
+	P_MTC0	k0, CP0_ENTRYLO0
+	PTE_SRL	k1, k1, 6
+	P_MTC0	k1, CP0_ENTRYLO1
 	nop
 	tlbwr
 	nop
@@ -148,10 +154,10 @@
 	addu	k1, k1, k0			# add in offset
 	PTE_L	k0, 0(k1)			# get even pte
 	PTE_L	k1, PTE_SIZE(k1)		# get odd pte
-	srl	k0, k0, 6			# convert to entrylo0
-	mtc0	k0, CP0_ENTRYLO0		# load it
-	srl	k1, k1, 6			# convert to entrylo1
-	mtc0	k1, CP0_ENTRYLO1		# load it
+	PTE_SRL	k0, k0, 6			# convert to entrylo0
+	P_MTC0	k0, CP0_ENTRYLO0		# load it
+	PTE_SRL	k1, k1, 6			# convert to entrylo1
+	P_MTC0	k1, CP0_ENTRYLO1		# load it
 	nop					# QED specified nops
 	nop
 	tlbwr					# write random tlb entry
@@ -178,11 +184,11 @@
 	PTE_L	k1, PTE_SIZE(k1)
 	nop				/* XXX */
 	tlbp
-	srl	k0, k0, 6
-	mtc0	k0, CP0_ENTRYLO0
-	srl	k1, k1, 6
+	PTE_SRL	k0, k0, 6
+	P_MTC0	k0, CP0_ENTRYLO0
+	PTE_SRL	k1, k1, 6
 	mfc0	k0, CP0_INDEX
-	mtc0	k1, CP0_ENTRYLO1
+	P_MTC0	k1, CP0_ENTRYLO1
 	bltzl	k0, 1f
 	tlbwr
 1:
@@ -210,11 +216,11 @@
 	PTE_L	k1, PTE_SIZE(k1)
 	nop				/* XXX */
 	tlbp
-	srl	k0, k0, 6
-	mtc0	k0, CP0_ENTRYLO0
-	srl	k1, k1, 6
+	PTE_SRL	k0, k0, 6
+	P_MTC0	k0, CP0_ENTRYLO0
+	PTE_SRL	k1, k1, 6
 	mfc0	k0, CP0_INDEX
-	mtc0	k1, CP0_ENTRYLO1
+	P_MTC0	k1, CP0_ENTRYLO1
 	bltzl	k0, 1f
 	tlbwr
 1:
@@ -240,12 +246,12 @@
 	addu	k1, k1, k0
 	PTE_L	k0, 0(k1)
 	PTE_L	k1, PTE_SIZE(k1)
-	srl	k0, k0, 6
-	mtc0	zero, CP0_ENTRYLO0
-	mtc0	k0, CP0_ENTRYLO0
-	srl	k1, k1, 6
-	mtc0	zero, CP0_ENTRYLO1
-	mtc0	k1, CP0_ENTRYLO1
+	PTE_SRL	k0, k0, 6
+	P_MTC0	zero, CP0_ENTRYLO0
+	P_MTC0	k0, CP0_ENTRYLO0
+	PTE_SRL	k1, k1, 6
+	P_MTC0	zero, CP0_ENTRYLO1
+	P_MTC0	k1, CP0_ENTRYLO1
 	b	1f
 	tlbwr
 1:
@@ -273,13 +279,13 @@
 	PTE_L	k1, PTE_SIZE(k1)
 	nop				/* XXX */
 	tlbp
-	srl	k0, k0, 6
-	mtc0	zero, CP0_ENTRYLO0
-	mtc0	k0, CP0_ENTRYLO0
-	mfc0	k0, CP0_INDEX
-	srl	k1, k1, 6
-	mtc0	zero, CP0_ENTRYLO1
-	mtc0	k1, CP0_ENTRYLO1
+	PTE_SRL	k0, k0, 6
+	P_MTC0  zero, CP0_ENTRYLO0
+	P_MTC0  k0, CP0_ENTRYLO0
+	mfc0    k0, CP0_INDEX
+	PTE_SRL	k1, k1, 6
+	P_MTC0	zero, CP0_ENTRYLO1
+	P_MTC0	k1, CP0_ENTRYLO1
 	bltzl	k0, 1f
 	tlbwr
 1:
@@ -344,7 +350,7 @@
 	addu	ptr, ptr, pte; \
 	mfc0	pte, CP0_BADVADDR; \
 	lw	ptr, (ptr); \
-	srl	pte, pte, 10; \
+	srl	pte, pte, PTE_INDX_SHIFT; \
 	and	pte, pte, PTE_INDX_MSK; \
 	addu	ptr, ptr, pte; \
 	PTE_L	pte, (ptr);
@@ -358,10 +364,10 @@
 	xori	ptr, ptr, PTE_SIZE; \
 	PTE_L	tmp, PTE_SIZE(ptr); \
 	PTE_L	ptr, 0(ptr); \
-	srl	tmp, tmp, 6; \
-	mtc0	tmp, CP0_ENTRYLO1; \
-	srl	ptr, ptr, 6; \
-	mtc0	ptr, CP0_ENTRYLO0;
+	PTE_SRL	tmp, tmp, 6; \
+	P_MTC0	tmp, CP0_ENTRYLO1; \
+	PTE_SRL	ptr, ptr, 6; \
+	P_MTC0	ptr, CP0_ENTRYLO0;
 
 #define DO_FAULT(write) \
 	.set	noat; \
@@ -467,6 +473,8 @@
 	NESTED(handle_tlbs, PT_SIZE, sp)
 	.set	noat
 #ifdef TLB_OPTIMIZE
+	.set	mips3
+        li      k0,0
 	LOAD_PTE(k0, k1)
 	R5K_HAZARD
 	tlbp				# find faulting entry
@@ -478,7 +486,7 @@
 	 tlbwi
 1:
 	nop
-	.set	mips3	
+	.set	mips3
 	eret
 	.set	mips0
 #endif
@@ -491,6 +499,7 @@
 	NESTED(handle_mod, PT_SIZE, sp)
 	.set	noat
 #ifdef TLB_OPTIMIZE
+	.set	mips3
 	LOAD_PTE(k0, k1)
 	R5K_HAZARD
 	tlbp					# find faulting entry
@@ -613,7 +622,7 @@
 1:
 	srl	k0, k0, 6
 2:
-	mtc0	k0, CP0_ENTRYLO0		# load it
+	P_MTC0	k0, CP0_ENTRYLO0		# load it
 
 	lui	k1, %hi(__saved_pte)
 	lw	k1, %lo(__saved_pte)(k1)	# recover pte pointer
@@ -630,7 +639,7 @@
 1:
 	srl	k0, k0, 6			# convert to entrylo0
 2:
-	mtc0	k0, CP0_ENTRYLO1		# load it
+	P_MTC0	k0, CP0_ENTRYLO1		# load it
 	nop
 	b	1f
 	tlbwr					# write random tlb entry

[Linux-mips-commits]CVS: linux/arch/mips/kernel setup.c,1.49,1.50

From: James S. <jsi...@us...> - 2002-02-12 18:14:21

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

Modified Files:
	setup.c 
Log Message:
More fixes for highmem at physical addresss above 4gb.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- setup.c	28 Jan 2002 19:17:18 -0000	1.49
+++ setup.c	12 Feb 2002 18:14:18 -0000	1.50
@@ -604,7 +604,7 @@
 	start_kernel();
 }
 
-void __init add_memory_region(unsigned long start, unsigned long size,
+void __init add_memory_region(phys_t start, phys_t size,
 			      long type)
 {
 	int x = boot_mem_map.nr_map;
@@ -625,8 +625,9 @@
 	int i;
 
 	for (i = 0; i < boot_mem_map.nr_map; i++) {
-		printk(" memory: %08lx @ %08lx ",
-			boot_mem_map.map[i].size, boot_mem_map.map[i].addr);
+		printk(" memory: %08Lx @ %08Lx ",
+			(unsigned long long) boot_mem_map.map[i].size,
+			(unsigned long long) boot_mem_map.map[i].addr);
 		switch (boot_mem_map.map[i].type) {
 		case BOOT_MEM_RAM:
 			printk("(usable)\n");
@@ -1083,6 +1084,7 @@
 	 */
 	for (i = 0; i < boot_mem_map.nr_map; i++) {
 		struct resource *res;
+		unsigned long addr_pfn, end_pfn;
 
 		res = alloc_bootmem(sizeof(struct resource));
 		switch (boot_mem_map.map[i].type) {
@@ -1094,8 +1096,16 @@
 		default:
 			res->name = "reserved";
 		}
+		addr_pfn = PFN_UP(boot_mem_map.map[i].addr);
+		end_pfn = PFN_UP(boot_mem_map.map[i].addr+boot_mem_map.map[i].size);
+		if (addr_pfn > max_low_pfn)
+			continue;
 		res->start = boot_mem_map.map[i].addr;
-		res->end = res->start + boot_mem_map.map[i].size - 1;
+		if (end_pfn < max_low_pfn) {
+			res->end = res->start + boot_mem_map.map[i].size - 1;
+		} else {
+			res->end = max_low_pfn - 1;
+		}
 		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
 		request_resource(&iomem_resource, res);

[Linux-mips-commits]CVS: linux/arch/mips/gt64120/momenco_ocelot setup.c,1.5,1.6

From: James S. <jsi...@us...> - 2002-02-12 18:06:41

Update of /cvsroot/linux-mips/linux/arch/mips/gt64120/momenco_ocelot
In directory usw-pr-cvs1:/tmp/cvs-serv4224

Modified Files:
	setup.c 
Log Message:
Fix Ocelot CP7000 configurations != 512mb.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/gt64120/momenco_ocelot/setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.c	2 Jan 2002 19:12:16 -0000	1.5
+++ setup.c	12 Feb 2002 18:06:34 -0000	1.6
@@ -2,11 +2,12 @@
  * setup.c
  *
  * BRIEF MODULE DESCRIPTION
- * Galileo Evaluation Boards - board dependent boot routines
+ * Momentum Computer Ocelot (CP7000) - board dependent boot routines
  *
  * Copyright (C) 1996, 1997, 2001  Ralf Baechle
  * Copyright (C) 2000 RidgeRun, Inc.
  * Copyright (C) 2001 Red Hat, Inc.
+ * Copyright (C) 2002 Momentum Computer
  *
  * Author: RidgeRun, Inc.
  *   gl...@ri..., sk...@ri..., st...@ri...
@@ -82,10 +83,6 @@
 
 static void __init setup_l3cache(unsigned long size);
 
-void __init bus_error_init(void)
-{
-}
-
 void __init momenco_ocelot_setup(void)
 {
 	void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache);
@@ -120,8 +117,7 @@
 
 	/* Also a temporary entry to let us talk to the Ocelot PLD and NVRAM
 	   in the CS[012] region. We can't use ioremap() yet. The NVRAM
-	   appears to be one of the variants of ST M48T35 - see 
-	   http://www.st.com/stonline/bin/sftab.exe?table=172&filter0=M48T35
+	   is a ST M48T37Y, which includes NVRAM, RTC, and Watchdog functions.
 
 		Ocelot PLD (CS0)	0x2c000000	0xe0020000
 		NVRAM			0x2c800000	0xe0030000
@@ -159,6 +155,7 @@
 	GT_WRITE(GT_PCI1M0LD_OFS, 0x32000000 >> 21);
 	GT_WRITE(GT_PCI1M1LD_OFS, 0x34000000 >> 21);
 
+	/* For the initial programming, we assume 512MB configuration */
 	/* Relocate the CPU's view of the RAM... */
 	GT_WRITE(GT_SCS10LD_OFS, 0);
 	GT_WRITE(GT_SCS10HD_OFS, 0x0fe00000 >> 21);
@@ -211,17 +208,66 @@
 	switch(tmpword &3) {
 	case 3:
 		/* 512MiB */
-		add_memory_region(256<<20, 256<<20, BOOT_MEM_RAM);
+		/* Decoders are allready set -- just add the
+		 * appropriate region */
+		add_memory_region( 0x40<<20,  0xC0<<20, BOOT_MEM_RAM);
+		add_memory_region(0x100<<20, 0x100<<20, BOOT_MEM_RAM);
+		break;
 	case 2:
-		/* 256MiB */
-		/* FIXME: Is it actually here, or at 0x10000000? */
-		add_memory_region(128<<20, 128<<20, BOOT_MEM_RAM);
+		/* 256MiB -- two banks of 128MiB */
+		GT_WRITE(GT_SCS10HD_OFS, 0x07e00000 >> 21);
+		GT_WRITE(GT_SCS32LD_OFS, 0x08000000 >> 21);
+		GT_WRITE(GT_SCS32HD_OFS, 0x0fe00000 >> 21);
+
+		GT_WRITE(GT_SCS0HD_OFS, 0x7f);
+		GT_WRITE(GT_SCS2LD_OFS, 0x80);
+		GT_WRITE(GT_SCS2HD_OFS, 0xff);
+
+		/* reconfigure the PCI0 interface view of memory */
+		GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
+		GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x08000000);
+		GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x0ffff000);
+		GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x0ffff000);
+
+		add_memory_region(0x40<<20, 0x40<<20, BOOT_MEM_RAM);
+		add_memory_region(0x80<<20, 0x80<<20, BOOT_MEM_RAM);
+		break;
 	case 1:
-		/* 128MiB */
-		add_memory_region(64<<20, 64<<20, BOOT_MEM_RAM);
+		/* 128MiB -- 64MiB per bank */
+		GT_WRITE(GT_SCS10HD_OFS, 0x03e00000 >> 21);
+		GT_WRITE(GT_SCS32LD_OFS, 0x04000000 >> 21);
+		GT_WRITE(GT_SCS32HD_OFS, 0x07e00000 >> 21);
+
+		GT_WRITE(GT_SCS0HD_OFS, 0x3f);
+		GT_WRITE(GT_SCS2LD_OFS, 0x40);
+		GT_WRITE(GT_SCS2HD_OFS, 0x7f);
+
+		/* reconfigure the PCI0 interface view of memory */
+		GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
+		GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x04000000);
+		GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x03fff000);
+		GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x03fff000);
+
+		/* add the appropriate region */
+		add_memory_region(0x40<<20, 0x40<<20, BOOT_MEM_RAM);
+		break;
 	case 0:
 		/* 64MiB */
-		;
+		GT_WRITE(GT_SCS10HD_OFS, 0x01e00000 >> 21);
+		GT_WRITE(GT_SCS32LD_OFS, 0x02000000 >> 21);
+		GT_WRITE(GT_SCS32HD_OFS, 0x03e00000 >> 21);
+
+		GT_WRITE(GT_SCS0HD_OFS, 0x1f);
+		GT_WRITE(GT_SCS2LD_OFS, 0x20);
+		GT_WRITE(GT_SCS2HD_OFS, 0x3f);
+
+		/* reconfigure the PCI0 interface view of memory */
+		GT_WRITE(GT_PCI0_CFGADDR_OFS, 0x80000014);
+		GT_WRITE(GT_PCI0_CFGDATA_OFS, 0x04000000);
+		GT_WRITE(GT_PCI0_BS_SCS10_OFS, 0x01fff000);
+		GT_WRITE(GT_PCI0_BS_SCS32_OFS, 0x01fff000);
+
+		break;
 	}
 
 	/* Fix up the DiskOnChip mapping */

[Linux-mips-commits]CVS: linux/include/asm-mips64 pgtable.h,1.9,1.10

From: James S. <jsi...@us...> - 2002-02-12 18:05:31

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

Modified Files:
	pgtable.h 
Log Message:
Reformat.

Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pgtable.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pgtable.h	5 Feb 2002 17:34:13 -0000	1.9
+++ pgtable.h	12 Feb 2002 18:05:27 -0000	1.10
@@ -50,21 +50,7 @@
 #define __flush_cache_all()		___flush_cache_all()
 #define flush_dcache_page(page)		do { } while (0)
 
-#ifndef CONFIG_CPU_R10000
-#define flush_cache_mm(mm)		_flush_cache_mm(mm)
-#define flush_cache_range(mm,start,end)	_flush_cache_range(mm,start,end)
-#define flush_cache_page(vma,page)	_flush_cache_page(vma, page)
-#define flush_page_to_ram(page)		_flush_page_to_ram(page)
-
-#define flush_icache_range(start, end)	_flush_cache_l1()
-
-#define flush_icache_page(vma, page)					\
-do {									\
-	unsigned long addr;						\
-	addr = (unsigned long) page_address(page);			\
-	_flush_cache_page(vma, addr);					\
-} while (0)                                                              
-#else /* !CONFIG_CPU_R10000 */
+#ifdef CONFIG_CPU_R10000
 /*
  * Since the r10k handles VCEs in hardware, most of the flush cache
  * routines are not needed. Only the icache on a processor is not
@@ -85,6 +71,22 @@
 	if ((vma)->vm_flags & VM_EXEC)					\
 		andes_flush_icache_page(page_address(page));		\
 } while (0)
+
+#else
+
+#define flush_cache_mm(mm)		_flush_cache_mm(mm)
+#define flush_cache_range(mm,start,end)	_flush_cache_range(mm,start,end)
+#define flush_cache_page(vma,page)	_flush_cache_page(vma, page)
+#define flush_page_to_ram(page)		_flush_page_to_ram(page)
+
+#define flush_icache_range(start, end)	_flush_cache_l1()
+
+#define flush_icache_page(vma, page)					\
+do {									\
+	unsigned long addr;						\
+	addr = (unsigned long) page_address(page);			\
+	_flush_cache_page(vma, addr);					\
+} while (0)                                                              
 #endif /* !CONFIG_CPU_R10000 */
 
 #define flush_cache_sigtramp(addr)	_flush_cache_sigtramp(addr)

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

From: James S. <jsi...@us...> - 2002-02-12 18:04:31

Update of /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm
In directory usw-pr-cvs1:/tmp/cvs-serv3774

Modified Files:
	setup.c 
Log Message:
se propper value for MAX_RAM_SIZE for depending on configuration. Set board_timer_setup not board_time_init to swarm_time_init.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/setup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- setup.c	28 Jan 2002 19:23:58 -0000	1.7
+++ setup.c	12 Feb 2002 18:04:27 -0000	1.8
@@ -59,14 +59,15 @@
 #ifdef CONFIG_HIGHMEM
 #ifdef CONFIG_64BIT_PHYS_ADDR
 /* #define MAX_RAM_SIZE (0xffffffffffffffff) */
-#define MAX_RAM_SIZE (0xffffffff)
+#define MAX_RAM_SIZE (~0ULL)
 #else
-#define MAX_RAM_SIZE (0xffffffff)
+#define MAX_RAM_SIZE (0xffffffffULL)
 #endif
 #else
-#define MAX_RAM_SIZE (0xfffffff)
+#define MAX_RAM_SIZE (0x1fffffffULL)
 #endif
 
+
 #ifndef CONFIG_SWARM_STANDALONE
 
 phys_t swarm_mem_region_addrs[CONFIG_SIBYTE_SWARM_MAX_MEM_REGIONS];
@@ -250,7 +251,7 @@
 #endif
 	       " runs\n");
 
-	board_time_init = swarm_time_init;
+	board_timer_setup = swarm_time_init;
 
 #ifdef CONFIG_BLK_DEV_IDE_SWARM
 	ide_ops = &swarm_ide_ops;
@@ -270,7 +271,7 @@
 
 static __init void prom_meminit(void)
 {
-	unsigned long long addr, size; /* regardless of 64BIT_PHYS_ADDR */
+	u64 addr, size; /* regardless of 64BIT_PHYS_ADDR */
 	long type;
 	unsigned int idx;
 	int rd_flag;

[Linux-mips-commits]CVS: linux/include/asm-mips io.h,1.16,1.17

From: James S. <jsi...@us...> - 2002-02-12 18:03:15

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

Modified Files:
	io.h 
Log Message:
Make ioremap accept a 64-bit physical address as argument.

Index: io.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/io.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- io.h	28 Jan 2002 18:48:10 -0000	1.16
+++ io.h	12 Feb 2002 18:03:12 -0000	1.17
@@ -132,20 +132,14 @@
  */
 #define page_to_phys(page)	((page - mem_map) << PAGE_SHIFT)
 
-#ifdef CONFIG_64BIT_PHYS_ADDR
-typedef unsigned long long phys_t;
-#else
-typedef unsigned long phys_t;
-#endif
-
 extern void * __ioremap(phys_t offset, phys_t size, unsigned long flags);
 
-static inline void *ioremap(unsigned long offset, unsigned long size)
+static inline void *ioremap(phys_t offset, unsigned long size)
 {
 	return __ioremap(offset, size, _CACHE_UNCACHED);
 }
 
-static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
+static inline void *ioremap_nocache(phys_t offset, unsigned long size)
 {
 	return __ioremap(offset, size, _CACHE_UNCACHED);
 }

[Linux-mips-commits]CVS: linux/include/asm-mips mipsregs.h,1.16,1.17

From: James S. <jsi...@us...> - 2002-02-12 18:02:22

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

Modified Files:
	mipsregs.h 
Log Message:
Fix 64-bit versions of {get,set}_entrylo[01].

Index: mipsregs.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/mipsregs.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mipsregs.h	28 Jan 2002 18:48:10 -0000	1.16
+++ mipsregs.h	12 Feb 2002 18:02:20 -0000	1.17
@@ -604,7 +604,7 @@
 		"dsrl\t%L0, %L0, 32\n\t"
 		"dsll\t%M0, %M0, 32\n\t"
 		"or\t%L0, %L0, %M0\n\t"
-		"dmtc0\t%0, $2\n\t"
+		"dmtc0\t%L0, $2\n\t"
 		".set\tmips0"
 		: : "r" (val));
 	__restore_flags(flags);
@@ -621,7 +621,7 @@
 		"dsrl\t%L0, %L0, 32\n\t"
 		"dsll\t%M0, %M0, 32\n\t"
 		"or\t%L0, %L0, %M0\n\t"
-		"dmtc0\t%0, $3\n\t"
+		"dmtc0\t%L0, $3\n\t"
 		".set\tmips0"
 		: : "r" (val));
 	__restore_flags(flags);
@@ -633,10 +633,10 @@
 
 	__save_and_cli(flags);
 	__asm__ __volatile__(
-		".set\tmips0\n\t"
-		"dmfc0 %0, $2\n\t"
+		".set\tmips3\n\t"
+		"dmfc0\t%M0, $2\n\t"
+		"dsll\t%L0, %M0, 32\n\t"
 		"dsrl\t%M0, %M0, 32\n\t"
-		"dsll\t%L0, %L0, 32\n\t"
 		"dsrl\t%L0, %L0, 32\n\t"
 		".set\tmips0"
 		: "=r" (val));
@@ -651,11 +651,11 @@
 
 	__save_and_cli(flags);
 	__asm__ __volatile__(
-		".set\tmips0\n\t"
-		"dmfc0 %0, $3\n\t"
+		".set\tmips3\n\t"
+		"dmfc0\t%M0, $3\n\t"
+		"dsrl\t%L0, %M0, 32\n\t"
 		"dsrl\t%M0, %M0, 32\n\t"
 		"dsll\t%L0, %L0, 32\n\t"
-		"dsrl\t%L0, %L0, 32\n\t"
 		".set\tmips0"
 		: "=r" (val));
 	__restore_flags(flags);

[Linux-mips-commits]CVS: linux/arch/mips/mm init.c,1.4,1.5

From: James S. <jsi...@us...> - 2002-02-12 18:01:09

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

Modified Files:
	init.c 
Log Message:
CONFIG_PCI does no longer limit ZONE_DMA to 16MB at most.

Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/init.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- init.c	28 Jan 2002 18:35:59 -0000	1.4
+++ init.c	12 Feb 2002 18:01:05 -0000	1.5
@@ -233,7 +233,7 @@
 	low = max_low_pfn;
 	high = highend_pfn;
 
-#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
+#ifdef CONFIG_ISA
 	if (low < max_dma)
 		zones_size[ZONE_DMA] = low;
 	else {

[Linux-mips-commits]CVS: linux/include/asm-mips64 ptrace.h,NONE,1.1

From: James S. <jsi...@us...> - 2002-02-12 18:00:17

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

Added Files:
	ptrace.h 
Log Message:
Don't include <asm/types.h>.

--- NEW FILE: ptrace.h ---
/*
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
 * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
 * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
 */
#ifndef _ASM_PTRACE_H
#define _ASM_PTRACE_H

/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
#define FPR_BASE	32
#define PC		64
#define CAUSE		65
#define BADVADDR	66
#define MMHI		67
#define MMLO		68
#define FPC_CSR		69
#define FPC_EIR		70

#ifndef _LANGUAGE_ASSEMBLY

#define abi64_no_regargs						\
	unsigned long __dummy0,						\
	unsigned long __dummy1,						\
	unsigned long __dummy2,						\
	unsigned long __dummy3,						\
	unsigned long __dummy4,						\
	unsigned long __dummy5,						\
	unsigned long __dummy6,						\
	unsigned long __dummy7

/*
 * This struct defines the way the registers are stored on the stack during a
 * system call/exception. As usual the registers k0/k1 aren't being saved.
 */
struct pt_regs {
	/* Saved main processor registers. */
	unsigned long regs[32];

	/* Other saved registers. */
	unsigned long lo;
	unsigned long hi;

	/*
	 * saved cp0 registers
	 */
	unsigned long cp0_epc;
	unsigned long cp0_badvaddr;
	unsigned long cp0_status;
	unsigned long cp0_cause;
};

#endif /* !(_LANGUAGE_ASSEMBLY__) */

/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
/* #define PTRACE_GETREGS		12 */
/* #define PTRACE_SETREGS		13 */
/* #define PTRACE_GETFPREGS		14 */
/* #define PTRACE_SETFPREGS		15 */
/* #define PTRACE_GETFPXREGS		18 */
/* #define PTRACE_SETFPXREGS		19 */

#define PTRACE_SETOPTIONS	21

/* options set using PTRACE_SETOPTIONS */
#define PTRACE_O_TRACESYSGOOD	0x00000001

#ifdef _LANGUAGE_ASSEMBLY
#include <asm/offset.h>
#endif /* (_LANGUAGE_ASSEMBLY__) */

#ifdef __KERNEL__

#ifndef _LANGUAGE_ASSEMBLY
#define instruction_pointer(regs) ((regs)->cp0_epc)

extern void (*_show_regs)(struct pt_regs *);
#define show_regs(regs)	_show_regs(regs)

#endif /* !(_LANGUAGE_ASSEMBLY__) */

#endif

#endif /* _ASM_PTRACE_H */

582 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 26 27 28 29 30 .. 105 > >> (Page 28 of 105)