Menu
▾
▴
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
|
|
From: James S. <jsi...@us...> - 2001-11-20 17:39:17
|
Update of /cvsroot/linux-mips/linux/include/asm-mips In directory usw-pr-cvs1:/tmp/cvs-serv1183/asm-mips Modified Files: cpu.h Log Message: Add MIPS_CPU_MCHECK. Mips64 version is now a copy of the 32-bit version of this file. Index: cpu.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/cpu.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cpu.h 2001/11/19 17:53:00 1.13 +++ cpu.h 2001/11/20 17:39:15 1.14 @@ -53,8 +53,8 @@ #define PRID_IMP_R4640 0x2200 #define PRID_IMP_R4650 0x2200 /* Same as R4640 */ #define PRID_IMP_R5000 0x2300 -#define PRID_IMP_TX49 0x2d00 #define PRID_IMP_R5900 0x2e00 +#define PRID_IMP_TX49 0x2d00 #define PRID_IMP_SONIC 0x2400 #define PRID_IMP_MAGIC 0x2500 #define PRID_IMP_RM7000 0x2700 @@ -128,17 +128,18 @@ /* * CPU Option encodings */ -#define MIPS_CPU_TLB 0x00000001 /* CPU has TLB */ +#define MIPS_CPU_TLB 0x00000001 /* CPU has TLB */ /* Leave a spare bit for variant MMU types... */ -#define MIPS_CPU_4KEX 0x00000004 /* "R4K" exception model */ -#define MIPS_CPU_4KTLB 0x00000008 /* "R4K" TLB handler */ -#define MIPS_CPU_FPU 0x00000010 /* CPU has FPU */ -#define MIPS_CPU_32FPR 0x00000020 /* 32 dbl. prec. FP registers */ -#define MIPS_CPU_COUNTER 0x00000040 /* Cycle count/compare */ -#define MIPS_CPU_WATCH 0x00000080 /* watchpoint registers */ -#define MIPS_CPU_MIPS16 0x00000100 /* code compression */ -#define MIPS_CPU_DIVEC 0x00000200 /* dedicated interrupt vector */ -#define MIPS_CPU_VCE 0x00000400 /* virt. coherence conflict possible */ +#define MIPS_CPU_4KEX 0x00000004 /* "R4K" exception model */ +#define MIPS_CPU_4KTLB 0x00000008 /* "R4K" TLB handler */ +#define MIPS_CPU_FPU 0x00000010 /* CPU has FPU */ +#define MIPS_CPU_32FPR 0x00000020 /* 32 dbl. prec. FP registers */ +#define MIPS_CPU_COUNTER 0x00000040 /* Cycle count/compare */ +#define MIPS_CPU_WATCH 0x00000080 /* watchpoint registers */ +#define MIPS_CPU_MIPS16 0x00000100 /* code compression */ +#define MIPS_CPU_DIVEC 0x00000200 /* dedicated interrupt vector */ +#define MIPS_CPU_VCE 0x00000400 /* virt. coherence conflict possible */ #define MIPS_CPU_CACHE_CDEX 0x00000800 /* Create_Dirty_Exclusive CACHE op */ +#define MIPS_CPU_MCHECK 0x00001000 /* Machine check exception */ #endif /* _ASM_CPU_H */ |
|
From: James S. <jsi...@us...> - 2001-11-20 17:35:50
|
Update of /cvsroot/linux-mips/linux/arch/mips64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32753/mips64/kernel
Modified Files:
traps.c
Log Message:
Setup machine check exception if available.
Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/traps.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- traps.c 2001/10/27 17:28:54 1.5
+++ traps.c 2001/11/20 17:35:48 1.6
@@ -18,6 +18,7 @@
#include <asm/branch.h>
#include <asm/cachectl.h>
+#include <asm/cpu.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/bootinfo.h>
@@ -42,6 +43,7 @@
extern asmlinkage void handle_tr(void);
extern asmlinkage void handle_fpe(void);
extern asmlinkage void handle_watch(void);
+extern asmlinkage void handle_mcheck(void);
extern asmlinkage void handle_reserved(void);
static char *cpu_names[] = CPU_NAMES;
@@ -400,6 +402,13 @@
panic("Caught WATCH exception - probably caused by stack overflow.");
}
+asmlinkage void do_mcheck(struct pt_regs *regs)
+{
+ show_regs(regs);
+ panic("Caught Machine Check exception - probably caused by multiple "
+ "matching entries in the TLB.");
+}
+
void do_reserved(struct pt_regs *regs)
{
/*
@@ -516,6 +525,9 @@
setup_dedicated_int();
mips4_setup();
go_64(); /* In memoriam C128 ;-) */
+
+ if (mips_cpu.options & MIPS_CPU_MCHECK)
+ set_except_vector(24, handle_mcheck);
/*
* Handling the following exceptions depends mostly of the cpu type
|
|
From: James S. <jsi...@us...> - 2001-11-20 17:35:50
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32753/mips/kernel
Modified Files:
traps.c
Log Message:
Setup machine check exception if available.
Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/traps.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- traps.c 2001/11/13 23:34:59 1.24
+++ traps.c 2001/11/20 17:35:48 1.25
@@ -267,7 +267,7 @@
void show_trace_task(struct task_struct *tsk)
{
- show_trace(tsk->thread.reg29);
+ show_trace((unsigned int *)tsk->thread.reg29);
}
void show_code(unsigned int *pc)
@@ -702,6 +702,7 @@
* We use the watch exception where available to detect stack
* overflows.
*/
+ dump_tlb();
show_regs(regs);
panic("Caught WATCH exception - probably caused by stack overflow.");
}
@@ -890,6 +891,8 @@
if (mips_cpu.options & MIPS_CPU_FPU)
set_except_vector(15, handle_fpe);
+ if (mips_cpu.options & MIPS_CPU_MCHECK)
+ set_except_vector(24, handle_mcheck);
/*
* Handling the following exceptions depends mostly of the cpu type
|
|
From: James S. <jsi...@us...> - 2001-11-20 17:34:05
|
Update of /cvsroot/linux-mips/linux/arch/mips64/kernel In directory usw-pr-cvs1:/tmp/cvs-serv32362/mips64/kernel Added Files: signal.c signal32.c Log Message: Compile fixes for signal debugging code. |
|
From: James S. <jsi...@us...> - 2001-11-20 17:34:04
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv32362/mips/kernel
Modified Files:
signal.c
Log Message:
Compile fixes for signal debugging code.
Index: signal.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/signal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- signal.c 2001/10/31 17:28:54 1.3
+++ signal.c 2001/11/20 17:34:02 1.4
@@ -436,8 +436,8 @@
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
#if DEBUG_SIG
- printk("SIG deliver (%s:%d): sp=0x%p pc=0x%p ra=0x%p\n",
- current->comm, current->pid, frame, regs->cp0_epc, frame->code);
+ printk("SIG deliver (%s:%d): sp=0x%p pc=0x%p ra=0x%p\n", current->comm,
+ current->pid, frame, regs->cp0_epc, frame->sf_code);
#endif
return;
@@ -512,8 +512,8 @@
regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
#if DEBUG_SIG
- printk("SIG deliver (%s:%d): sp=0x%p pc=0x%p ra=0x%p\n",
- current->comm, current->pid, frame, regs->cp0_epc, frame->code);
+ printk("SIG deliver (%s:%d): sp=0x%p pc=0x%p ra=0x%p\n", current->comm,
+ current->pid, frame, regs->cp0_epc, frame->rs_code);
#endif
return;
|
|
From: James S. <jsi...@us...> - 2001-11-20 17:31:07
|
Update of /cvsroot/linux-mips/linux/arch/mips64/kernel In directory usw-pr-cvs1:/tmp/cvs-serv31485/mips64/kernel Modified Files: r4k_genex.S Log Message: Add machine check handler. Index: r4k_genex.S =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/r4k_genex.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- r4k_genex.S 2001/10/03 21:53:33 1.1 +++ r4k_genex.S 2001/11/20 17:31:04 1.2 @@ -89,6 +89,7 @@ BUILD_HANDLER tr tr sti silent /* #13 */ BUILD_HANDLER fpe fpe fpe silent /* #15 */ BUILD_HANDLER watch watch sti verbose /* #23 */ + BUILD_HANDLER mcheck mcheck cli verbose /* #24 */ BUILD_HANDLER reserved reserved sti verbose /* others */ __INIT |
|
From: James S. <jsi...@us...> - 2001-11-20 17:31:07
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel In directory usw-pr-cvs1:/tmp/cvs-serv31485/mips/kernel Modified Files: entry.S Log Message: Add machine check handler. Index: entry.S =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/entry.S,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- entry.S 2001/11/08 17:17:07 1.9 +++ entry.S 2001/11/20 17:31:04 1.10 @@ -245,6 +245,7 @@ BUILD_HANDLER(tr,tr,sti,silent) /* #13 */ BUILD_HANDLER(fpe,fpe,fpe,silent) /* #15 */ BUILD_HANDLER(watch,watch,sti,verbose) /* #23 */ + BUILD_HANDLER(mcheck,mcheck,cli,verbose) /* #24 */ BUILD_HANDLER(reserved,reserved,sti,verbose) /* others */ .set pop |
|
From: James S. <jsi...@us...> - 2001-11-20 17:24:25
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv29325
Modified Files:
config.in
Log Message:
Cleanup in config.in to make it easier to read.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- config.in 2001/11/19 18:31:01 1.51
+++ config.in 2001/11/20 17:24:21 1.52
@@ -404,27 +404,24 @@
bool ' lld/scd Instructions available' CONFIG_CPU_HAS_LLDSCD
bool ' Writeback Buffer available' CONFIG_CPU_HAS_WB
else
- if [ "$CONFIG_CPU_R3000" = "y" -o
- "$CONFIG_CPU_VR41XX" = "y" -o
- "$CONFIG_CPU_TX39XX" = "y" -o
- "$CONFIG_DECSTATION" = "y" ]; then
- define_bool CONFIG_CPU_HAS_LLSC n
- define_bool CONFIG_CPU_HAS_LLDSCD n
+ if [ "$CONFIG_CPU_R3000" = "y" -o "$CONFIG_CPU_VR41XX" = "y" -o
+ "$CONFIG_CPU_TX39XX" = "y" ]; then
+ define_bool CONFIG_CPU_HAS_LLSC n
+ define_bool CONFIG_CPU_HAS_LLDSCD n
+
+ if [ "$CONFIG_DECSTATION" = "y" ]; then
define_bool CONFIG_CPU_HAS_WB y
else
- define_bool CONFIG_CPU_HAS_LLSC n
- define_bool CONFIG_CPU_HAS_LLDSCD n
define_bool CONFIG_CPU_HAS_WB n
fi
else
+ define_bool CONFIG_CPU_HAS_LLSC y
+ define_bool CONFIG_CPU_HAS_WB n
+
if [ "$CONFIG_CPU_MIPS32" = "y" ]; then
- define_bool CONFIG_CPU_HAS_LLSC y
define_bool CONFIG_CPU_HAS_LLDSCD n
- define_bool CONFIG_CPU_HAS_WB n
else
- define_bool CONFIG_CPU_HAS_LLSC y
define_bool CONFIG_CPU_HAS_LLDSCD y
- define_bool CONFIG_CPU_HAS_WB n
fi
fi
fi
|
|
From: Pete P. <pp...@us...> - 2001-11-20 01:52:25
|
Update of /cvsroot/linux-mips/linux/drivers/char In directory usw-pr-cvs1:/tmp/cvs-serv310/drivers/char Modified Files: au1000_gpio.c Log Message: Moved au1000_gpio.h to include/asm. Index: au1000_gpio.c =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/char/au1000_gpio.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- au1000_gpio.c 2001/11/12 17:26:03 1.5 +++ au1000_gpio.c 2001/11/20 01:52:22 1.6 @@ -39,7 +39,7 @@ #include <asm/uaccess.h> #include <asm/io.h> #include <asm/au1000.h> -#include <linux/au1000_gpio.h> +#include <asm/au1000_gpio.h> #define VERSION "0.01" |
|
From: Pete P. <pp...@us...> - 2001-11-20 01:52:25
|
Update of /cvsroot/linux-mips/linux/include/linux In directory usw-pr-cvs1:/tmp/cvs-serv310/include/linux Removed Files: au1000_gpio.h Log Message: Moved au1000_gpio.h to include/asm. --- au1000_gpio.h DELETED --- |
|
From: Pete P. <pp...@us...> - 2001-11-20 01:52:25
|
Update of /cvsroot/linux-mips/linux/include/asm-mips In directory usw-pr-cvs1:/tmp/cvs-serv310/include/asm-mips Added Files: au1000_gpio.h Log Message: Moved au1000_gpio.h to include/asm. --- NEW FILE: au1000_gpio.h --- /* * FILE NAME au1000_gpio.h * * BRIEF MODULE DESCRIPTION * API to Alchemy Au1000 GPIO device. * * Author: MontaVista Software, Inc. <so...@mv...> * Steve Longerbeam <st...@mv...> * * Copyright 2001 MontaVista Software Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __AU1000_GPIO_H #define __AU1000_GPIO_H #include <linux/ioctl.h> #define AU1000GPIO_IOC_MAGIC 'A' #define AU1000GPIO_IN _IOR (AU1000GPIO_IOC_MAGIC, 0, int) #define AU1000GPIO_SET _IOW (AU1000GPIO_IOC_MAGIC, 1, int) #define AU1000GPIO_CLEAR _IOW (AU1000GPIO_IOC_MAGIC, 2, int) #define AU1000GPIO_OUT _IOW (AU1000GPIO_IOC_MAGIC, 3, int) #define AU1000GPIO_TRISTATE _IOW (AU1000GPIO_IOC_MAGIC, 4, int) #define AU1000GPIO_AVAIL_MASK _IOR (AU1000GPIO_IOC_MAGIC, 5, int) #ifdef __KERNEL__ extern u32 get_au1000_avail_gpio_mask(void); extern int au1000gpio_tristate(u32 data); extern int au1000gpio_in(u32 *data); extern int au1000gpio_set(u32 data); extern int au1000gpio_clear(u32 data); extern int au1000gpio_out(u32 data); #endif #endif |
|
From: Pete P. <pp...@us...> - 2001-11-20 01:44:49
|
Update of /cvsroot/linux-mips/linux/arch/mips In directory usw-pr-cvs1:/tmp/cvs-serv31047/arch/mips Modified Files: Makefile Log Message: CONFIG_BLK_DEV_INITRD was in the Makefile twice. Ralf recently added the generic initrd patch and apparently we applied the patch to the sforge tree -- which already had the patch. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- Makefile 2001/11/19 18:31:01 1.29 +++ Makefile 2001/11/20 01:44:46 1.30 @@ -121,15 +121,6 @@ SUBDIRS += arch/mips/ramdisk endif -# -# ramdisk/initrd support -# You need a compressed ramdisk image, named ramdisk.gz in -# arch/mips/ramdisk -# -ifdef CONFIG_BLK_DEV_INITRD -CORE_FILES += arch/mips/ramdisk/ramdisk.o -SUBDIRS += arch/mips/ramdisk -endif # # Board-dependent options and extra files |
|
From: Steve L. <slo...@us...> - 2001-11-20 01:37:43
|
Update of /cvsroot/linux-mips/linux/drivers/ide
In directory usw-pr-cvs1:/tmp/cvs-serv29534
Modified Files:
Config.in
Log Message:
IT8172 IDE support options were included twice.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/ide/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Config.in 2001/11/06 00:30:44 1.4
+++ Config.in 2001/11/20 01:37:40 1.5
@@ -72,10 +72,6 @@
dep_mbool ' IT8172 IDE support' CONFIG_BLK_DEV_IT8172 $CONFIG_BLK_DEV_IDEDMA_PCI
dep_mbool ' IT8172 IDE Tuning support' CONFIG_IT8172_TUNING $CONFIG_BLK_DEV_IT8172 $CONFIG_IDEDMA_PCI_AUTO
fi
- if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then
- dep_mbool ' IT8172 IDE support' CONFIG_BLK_DEV_IT8172 $CONFIG_BLK_DEV_IDEDMA_PCI
- dep_mbool ' IT8172 IDE Tuning support' CONFIG_IT8172_TUNING $CONFIG_BLK_DEV_IT8172 $CONFIG_IDEDMA_PCI_AUTO
- fi
dep_bool ' NS87415 chipset support (EXPERIMENTAL)' CONFIG_BLK_DEV_NS87415 $CONFIG_BLK_DEV_IDEDMA_PCI
dep_bool ' OPTi 82C621 chipset enhanced support (EXPERIMENTAL)' CONFIG_BLK_DEV_OPTI621 $CONFIG_EXPERIMENTAL
dep_bool ' PROMISE PDC202{46|62|65|67|68} support' CONFIG_BLK_DEV_PDC202XX $CONFIG_BLK_DEV_IDEDMA_PCI
|
|
From: Steve L. <slo...@us...> - 2001-11-19 23:25:10
|
Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv28983
Modified Files:
gt96100eth.c
Log Message:
Small error in last commit.
Index: gt96100eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/gt96100eth.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gt96100eth.c 2001/11/11 00:24:38 1.5
+++ gt96100eth.c 2001/11/19 23:25:08 1.6
@@ -700,7 +700,7 @@
*/
int gt96100_init_module(void)
{
- int i;
+ int i, retval;
#ifndef CONFIG_MIPS_GT96100ETH
return -ENODEV;
@@ -709,9 +709,12 @@
for (i=NUM_INTERFACES-1; i>0; i--) {
int base_addr = gt96100_iflist[i].port;
- gt96100_probe1(base_addr, gt96100_iflist[i].irq, i);
+ if ((retval = gt96100_probe1(base_addr,
+ gt96100_iflist[i].irq, i)))
+ break;
}
- return -ENODEV;
+
+ return retval;
}
|
|
From: Jim P. <ji...@jt...> - 2001-11-19 18:51:10
|
> > LaserJet support? Does this actually mean I can run Linux on my > > printer now? :) > > Yes :-) It basically is a MIPS PC without a graphics card. Wow, that's cool. I'm going to have to play with that someday. -jim |
|
From: James S. <jsi...@tr...> - 2001-11-19 18:43:42
|
> > Log Message: > > HP Laserjet support. > > LaserJet support? Does this actually mean I can run Linux on my > printer now? :) Yes :-) It basically is a MIPS PC without a graphics card. |
|
From: Jim P. <ji...@jt...> - 2001-11-19 18:40:52
|
> Log Message: > HP Laserjet support. LaserJet support? Does this actually mean I can run Linux on my printer now? :) -jim |
|
From: James S. <jsi...@us...> - 2001-11-19 18:31:58
|
Update of /cvsroot/linux-mips/linux/arch/mips/configs In directory usw-pr-cvs1:/tmp/cvs-serv6794 Modified Files: defconfig-sb1250-swarm Log Message: Don't use initrd by default. Index: defconfig-sb1250-swarm =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-sb1250-swarm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- defconfig-sb1250-swarm 2001/11/08 17:42:08 1.2 +++ defconfig-sb1250-swarm 2001/11/19 18:31:56 1.3 @@ -135,7 +135,7 @@ # CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=9220 -CONFIG_BLK_DEV_INITRD=y +# CONFIG_BLK_DEV_INITRD is not set # # Multi-device support (RAID and LVM) |
|
From: James S. <jsi...@us...> - 2001-11-19 18:31:05
|
Update of /cvsroot/linux-mips/linux/include/asm-mips/hp-lj
In directory usw-pr-cvs1:/tmp/cvs-serv6428/include/asm-mips/hp-lj
Added Files:
asic.h
Log Message:
HP Laserjet support.
--- NEW FILE: asic.h ---
typedef enum { IllegalAsic, UnknownAsic, AndrosAsic, HarmonyAsic } AsicId;
AsicId GetAsicId(void);
const char* const GetAsicName(void);
|
|
From: James S. <jsi...@us...> - 2001-11-19 18:31:04
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv6428/arch/mips/kernel
Modified Files:
setup.c
Log Message:
HP Laserjet support.
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- setup.c 2001/11/10 03:52:49 1.28
+++ setup.c 2001/11/19 18:31:01 1.29
@@ -194,7 +194,6 @@
static inline void cpu_probe(void)
{
-
#ifdef CONFIG_CPU_MIPS32
unsigned long config1;
#endif
@@ -791,6 +790,11 @@
case MACH_GROUP_SIBYTE:
swarm_setup();
break;
+#endif
+#ifdef CONFIG_HP_LASERJET
+ case MACH_GROUP_HP_LASERJET:
+ { void hp_setup(void); hp_setup(); }
+ break;
#endif
default:
panic("Unsupported architecture");
|
Update of /cvsroot/linux-mips/linux/arch/mips/hp-lj
In directory usw-pr-cvs1:/tmp/cvs-serv6428/arch/mips/hp-lj
Added Files:
Makefile asic.c gdb_hook.c init.c int-handler.S irq.c
pci-dma.c pci.c setup.c utils.c utils.h
Log Message:
HP Laserjet support.
--- NEW FILE: Makefile ---
#
# Makefile for the HP specific kernel interface routines
# under Linux.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
.S.o:
$(CC) $(CFLAGS) -c $< -o $*.o
all: hp-lj.o
O_TARGET := hp-lj.o
export-objs := utils.o
obj-y := init.o setup.o irq.o int-handler.o pci.o utils.o asic.o
obj-$(CONFIG_REMOTE_DEBUG) += gdb_hook.o
obj-$(CONFIG_DIRECT_PRINTK) += gdb_hook.o
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
clean:
rm *.o
forceit:
# package filesystem from rootfs directory into binary package
romfs.bin: forceit ./rootfs
@genromfs -d ./rootfs -f $@
# transform rootfs.bin into object file format for linking
initrd.o: romfs.bin
@echo "" | $(CROSS_COMPILE)as -o $@
@$(CROSS_COMPILE)objcopy --add-section .initrd=$< $@
include $(TOPDIR)/Rules.make
.PHONY: forceit
--- NEW FILE: asic.c ---
#include "asm/hp-lj/asic.h"
AsicId GetAsicId(void)
{
static int asic = IllegalAsic;
if (asic == IllegalAsic) {
if (*(unsigned int *)0xbff70000 == 0x1114103c)
asic = HarmonyAsic;
else if (*(unsigned int *)0xbff80000 == 0x110d103c)
asic = AndrosAsic;
else
asic = UnknownAsic;
}
return asic;
}
const char* const GetAsicName(void)
{
static const char* const Names[] =
{ "Illegal", "Unknown", "Andros", "Harmony" };
return Names[(int)GetAsicId()];
}
--- NEW FILE: gdb_hook.c ---
/*
* Carsten Langgaard, car...@mi...
* Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
*
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*
* ########################################################################
*
* This is the interface to the remote debugger stub.
*
*/
#include <linux/config.h>
#include <linux/serialP.h>
#include <linux/serial_reg.h>
#include <asm/serial.h>
#include <asm/io.h>
#include <asm/hp-lj/asic.h>
int putDebugChar(char c);
char getDebugChar(void);
/////////////////////// andros values ///////////////////////////////////////////////////////
#define SERIAL_REG(offset) (*((volatile unsigned int*)(HPSR_BASE_ADDR|offset)))
// Register set base address
#define HPSR_BASE_ADDR 0xbfe00000UL
// Transmit / Receive Data
#define HPSR_DATA_OFFSET 0x00020010UL
// Transmit control / status
#define HPSR_TX_STAT_OFFSET 0x0002000CUL
// Receive status
#define HPSR_RX_STAT_OFFSET 0x00020008UL
#define HPSR_TX_STAT_READY 0x8UL
#define HPSR_RX_DATA_AVAIL 0x4UL
/////////////////////// harmony values ///////////////////////////////////////////////////////
// Transmit / Receive Data
#define H_HPSR_DATA_TX *((volatile unsigned int*)0xbff65014)
// Transmit / Receive Data
#define H_HPSR_DATA_RX *((volatile unsigned int*)0xbff65018)
// Status
#define H_HPSR_STAT *((volatile unsigned int*)0xbff65004)
// harmony serial status bits
#define H_SER_STAT_TX_EMPTY 0x04
#define H_SER_STAT_RX_EMPTY 0x10
int putDebugChar(char c)
{
if (GetAsicId() == HarmonyAsic) {
while (!( ( (H_HPSR_STAT) & H_SER_STAT_TX_EMPTY) != 0));
H_HPSR_DATA_TX = (unsigned int) c;
} else if (GetAsicId() == AndrosAsic) {
while (((SERIAL_REG(HPSR_TX_STAT_OFFSET) & HPSR_TX_STAT_READY) == 0))
;
SERIAL_REG(HPSR_DATA_OFFSET) = (unsigned int) c;
}
return 1;
}
char getDebugChar(void)
{
if (GetAsicId() == HarmonyAsic) {
while (!(((H_HPSR_STAT) & H_SER_STAT_RX_EMPTY) == 0));
return H_HPSR_DATA_RX;
} else if (GetAsicId() == AndrosAsic) {
while ((SERIAL_REG(HPSR_RX_STAT_OFFSET) & HPSR_RX_DATA_AVAIL) == 0)
;
return (SERIAL_REG(HPSR_DATA_OFFSET));
}
}
--- NEW FILE: init.c ---
/*
* init.c: PROM library initialisation code.
*
* Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
*
* $Id: init.c,v 1.1 2001/11/19 18:31:01 jsimmons Exp $
*/
#include <linux/mm.h>
#include <asm/bootinfo.h>
#include <asm/addrspace.h>
#include <asm/hp-lj/asic.h>
#include <linux/bootmem.h>
#include "utils.h"
#define Delimiter "CMDLINE="
const char CommandLine[] = Delimiter
"root=/dev/hda3 ";
char arcs_cmdline[COMMAND_LINE_SIZE];
int __init prom_init(int argc, char ** argv, char **envp)
{
ulong mem_size = get_mem_avail();
int reserve_size = 0;
printk("Total Memory: %ld bytes\n", mem_size);
reserve_buffer(CommandLine, mem_size);
reserve_size = get_reserved_buffer_size();
mem_size -= reserve_size;
add_memory_region(0x0,mem_size, BOOT_MEM_RAM);
add_memory_region(mem_size,reserve_size, BOOT_MEM_RESERVED);
printk("Main Memory: %ld bytes\n", mem_size);
printk("Reserved Memory: %ld bytes at 0x%08x\n",
get_reserved_buffer_size(), (ulong)get_reserved_buffer());
printk("Detected %s ASIC\n", GetAsicName());
mips_machgroup = MACH_GROUP_HP_LASERJET;
mips_machtype = MACH_UNKNOWN;
strcpy(arcs_cmdline, CommandLine+strlen(Delimiter));
return 0;
}
void prom_free_prom_memory (void)
{
}
--- NEW FILE: int-handler.S ---
#include <asm/asm.h>
#include <asm/mipsregs.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
.text
.set mips1
.set reorder
.set macro
.set noat
.align 5
# MIPS has 16 exception vectors numbered 0 to 15
# vector number 0 is for interrupts and the others are for various exceptions
# The following code is installed as the handler for exception 0
# There are 8 possible interrupts that can cause this exception.
# The cause register indicates which are pending
# The status register indicates which are enabled
# This code segment basically will decipher which interrup occurred (7 downto 0)
# and pass an integer indicating which was the highest priority pending interrupt
# to the do_IRQ routine.
NESTED(hpIRQ, PT_SIZE, sp)
SAVE_ALL
CLI # Important: mark KERNEL mode !
/*
* Get pending interrupts
*/
mfc0 t0,CP0_CAUSE # get pending interrupts
mfc0 t1,CP0_STATUS # get enabled interrupts
and t0,t1 # isolate allowed ones
andi t0,0xff00 # isolate pending bits
sll t0,16 # shift the pending bits down
beqz t0,3f # no pending intrs, then spurious
nop # delay slot
/*
* Find irq with highest priority
* FIXME: This is slow - use binary search
*/
la a0,7
1: bltz t0,2f # found pending irq
subu a0,1
sll t0,1
b 1b
nop # delay slot
call_do_IRQ:
2: move a1,sp
jal do_IRQ
nop # delay slot
j ret_from_irq
/*
mfc0 t0,CP0_STATUS # disable interrupts
ori t0,1
xori t0,1
mtc0 t0,CP0_STATUS
la a1, ret_from_irq
jr a1
*/
3: j spurious_interrupt
END(hpIRQ)
--- NEW FILE: irq.c ---
/*
* 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.
*
* Code to handle x86 style IRQs plus some generic interrupt stuff.
*
* Copyright (C) 1992 Linus Torvalds
* Copyright (C) 1994 - 2000 Ralf Baechle
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/irq.h>
#include <asm/mipsregs.h>
#include <asm/system.h>
#include <asm/gdb-stub.h>
/* install the handler for exception 0 */
void __init init_IRQ(void)
{
extern void hpIRQ(void);
extern void mips_cpu_irq_init(u32 base);
mips_cpu_irq_init(0);
set_except_vector(0, hpIRQ);
#ifdef CONFIG_REMOTE_DEBUG
{
extern void breakpoint(void);
extern int remote_debug;
if (remote_debug) {
set_debug_traps();
breakpoint();
}
}
#endif
}
--- NEW FILE: pci-dma.c ---
/*
* Copyright (C) 2000 Ani Joshi <aj...@un...>
*
*
* Dynamic DMA mapping support.
*
* swiped from i386, and cloned for MIPS by Geert.
*
*/
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <asm/io.h>
void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
dma_addr_t *dma_handle)
{
void *ret;
int gfp = GFP_ATOMIC;
if (hwdev == NULL || hwdev->dma_mask != 0xffffffff)
gfp |= GFP_DMA;
ret = (void *)__get_free_pages(gfp, get_order(size));
if (ret != NULL) {
memset(ret, 0, size);
*dma_handle = virt_to_bus(ret);
// REVISIT this needs reviewal as mentioned in bug report
// currently we bump kseg0 allocates to kseg1 uncacheable space
if ((((unsigned int) ret) & 0xe0000000) == 0x80000000) {
//flush the cache to eliminate coherency problems
// and assure dirty lines won't later get written over any dma, etc.
flush_cache_all();
ret = (void*)((unsigned int)ret | 0x20000000);
}
}
return ret;
}
void pci_free_consistent(struct pci_dev *hwdev, size_t size,
void *vaddr, dma_addr_t dma_handle)
{
free_pages((unsigned long)vaddr, get_order(size));
}
--- NEW FILE: pci.c ---
/*
* 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.
*
* SNI specific PCI support for RM200/RM300.
*
* Copyright (C) 1997 - 2000 Ralf Baechle
*/
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <asm/byteorder.h>
#include <asm/pci_channel.h>
#include <asm/hp-lj/asic.h>
#ifdef CONFIG_PCI
volatile u32* pci_config_address_reg = (volatile u32*)0xfdead000;
volatile u32* pci_config_data_reg = (volatile u32*)0xfdead000;
#define cfgaddr(dev, where) (((dev->bus->number & 0xff) << 0x10) | \
((dev->devfn & 0xff) << 0x08) | \
(where & 0xfc))
/*
* We can't address 8 and 16 bit words directly. Instead we have to
* read/write a 32bit word and mask/modify the data we actually want.
*/
static int pcimt_read_config_byte (struct pci_dev *dev,
int where, unsigned char *val)
{
*pci_config_address_reg = cfgaddr(dev, where);
*val = (le32_to_cpu(*pci_config_data_reg) >> ((where&3)<<3)) & 0xff;
//printk("pci_read_byte 0x%x == 0x%x\n", where, *val);
return PCIBIOS_SUCCESSFUL;
}
static int pcimt_read_config_word (struct pci_dev *dev,
int where, unsigned short *val)
{
if (where & 1)
return PCIBIOS_BAD_REGISTER_NUMBER;
*pci_config_address_reg = cfgaddr(dev, where);
*val = (le32_to_cpu(*pci_config_data_reg) >> ((where&3)<<3)) & 0xffff;
//printk("pci_read_word 0x%x == 0x%x\n", where, *val);
return PCIBIOS_SUCCESSFUL;
}
int pcimt_read_config_dword (struct pci_dev *dev,
int where, unsigned int *val)
{
if (where & 3)
return PCIBIOS_BAD_REGISTER_NUMBER;
*pci_config_address_reg = cfgaddr(dev, where);
*val = le32_to_cpu(*pci_config_data_reg);
//printk("pci_read_dword 0x%x == 0x%x\n", where, *val);
return PCIBIOS_SUCCESSFUL;
}
static int pcimt_write_config_byte (struct pci_dev *dev,
int where, unsigned char val)
{
*pci_config_address_reg = cfgaddr(dev, where);
*(volatile u8 *)(((int)pci_config_data_reg) + (where & 3)) = val;
//printk("pci_write_byte 0x%x = 0x%x\n", where, val);
return PCIBIOS_SUCCESSFUL;
}
static int pcimt_write_config_word (struct pci_dev *dev,
int where, unsigned short val)
{
if (where & 1)
return PCIBIOS_BAD_REGISTER_NUMBER;
*pci_config_address_reg = cfgaddr(dev, where);
*(volatile u16 *)(((int)pci_config_data_reg) + (where & 2)) =
le16_to_cpu(val);
//printk("pci_write_word 0x%x = 0x%x\n", where, val);
return PCIBIOS_SUCCESSFUL;
}
int pcimt_write_config_dword (struct pci_dev *dev,
int where, unsigned int val)
{
if (where & 3)
return PCIBIOS_BAD_REGISTER_NUMBER;
*pci_config_address_reg = cfgaddr(dev, where);
*pci_config_data_reg = le32_to_cpu(val);
//printk("pci_write_dword 0x%x = 0x%x\n", where, val);
return PCIBIOS_SUCCESSFUL;
}
struct pci_ops hp_pci_ops = {
pcimt_read_config_byte,
pcimt_read_config_word,
pcimt_read_config_dword,
pcimt_write_config_byte,
pcimt_write_config_word,
pcimt_write_config_dword
};
struct pci_channel mips_pci_channels[] = {
{ &hp_pci_ops, &ioport_resource, &iomem_resource },
{ NULL, NULL, NULL }
};
unsigned __init int pcibios_assign_all_busses(void)
{
return 1;
}
void __init pcibios_fixup(void)
{
}
void __init pcibios_fixup_irqs(void)
{
struct pci_dev *dev;
int slot_num;
pci_for_each_dev(dev) {
slot_num = PCI_SLOT(dev->devfn);
switch(slot_num) {
case 2: dev->irq = 3; break;
case 3: dev->irq = 4; break;
case 4: dev->irq = 5; break;
default: break;
}
}
}
#define IO_MEM_LOGICAL_START 0x3e000000
#define IO_MEM_LOGICAL_END 0x3fefffff
#define IO_PORT_LOGICAL_START 0x3ff00000
#define IO_PORT_LOGICAL_END 0x3fffffff
#define IO_MEM_VIRTUAL_OFFSET 0xb0000000
#define IO_PORT_VIRTUAL_OFFSET 0xb0000000
#define ONE_MEG (1024 * 1024)
void __init pci_setup(void)
{
u32 pci_regs_base_offset = 0xfdead000;
switch(GetAsicId()) {
case AndrosAsic: pci_regs_base_offset = 0xbff80000; break;
case HarmonyAsic: pci_regs_base_offset = 0xbff70000; break;
default:
printk("ERROR: PCI does not support %s Asic\n", GetAsicName());
while(1);
break;
}
// set bus stat/command reg
// REVIST this setting may need vary depending on the hardware
*((volatile unsigned int*)(pci_regs_base_offset | 0x0004)) = 0x38000007;
iomem_resource.start = IO_MEM_LOGICAL_START + IO_MEM_VIRTUAL_OFFSET;
iomem_resource.end = IO_MEM_LOGICAL_END + IO_MEM_VIRTUAL_OFFSET;
ioport_resource.start = IO_PORT_LOGICAL_START + IO_PORT_VIRTUAL_OFFSET;
ioport_resource.end = IO_PORT_LOGICAL_END + IO_PORT_VIRTUAL_OFFSET;
// KLUDGE (mips_io_port_base is screwed up, we've got to work around it here)
// by letting both low (illegal) and high (legal) addresses appear in pci io space
ioport_resource.start = 0x0;
mips_io_port_base = IO_PORT_LOGICAL_START + IO_PORT_VIRTUAL_OFFSET;
printk("Set IO port base to 0x%lx\n", mips_io_port_base);
// map the PCI address space
// global map - all levels & processes can access
// except that the range is outside user space
// parameters: lo0, lo1, hi, pagemask
// lo indicates physical page, hi indicates virtual address
add_wired_entry((IO_MEM_LOGICAL_START >> 6) | 0x17,
((IO_MEM_LOGICAL_START + (16 * ONE_MEG)) >> 6) | 0x17,
0xee000000, PM_16M);
// These are used in pci r/w routines so need to preceed bus scan
pci_config_data_reg = (u32*) (((u32)mips_io_port_base) | 0xcfc);
pci_config_address_reg = (u32*) (((u32)pci_regs_base_offset) | 0xcf8);
}
void __init pcibios_fixup_resources(struct pci_dev *dev)
{
int pos;
int bases;
printk("adjusting pci device: %s\n", dev->name);
switch (dev->hdr_type) {
case PCI_HEADER_TYPE_NORMAL: bases = 6; break;
case PCI_HEADER_TYPE_BRIDGE: bases = 2; break;
case PCI_HEADER_TYPE_CARDBUS: bases = 1; break;
default: bases = 0; break;
}
for (pos=0; pos < bases; pos++) {
struct resource* res = &dev->resource[pos];
if (res->start >= IO_MEM_LOGICAL_START &&
res->end <= IO_MEM_LOGICAL_END) {
res->start += IO_MEM_VIRTUAL_OFFSET;
res->end += IO_MEM_VIRTUAL_OFFSET;
}
if (res->start >= IO_PORT_LOGICAL_START &&
res->end <= IO_PORT_LOGICAL_END) {
res->start += IO_PORT_VIRTUAL_OFFSET;
res->end += IO_PORT_VIRTUAL_OFFSET;
}
}
}
#endif /* CONFIG_PCI */
--- NEW FILE: setup.c ---
/* $Id: setup.c,v 1.1 2001/11/19 18:31:01 jsimmons Exp $
*
* Setup pointers to hardware-dependent routines.
*
* 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) 1996, 1997, 1998 by Ralf Baechle
*/
#include <linux/config.h>
#include <linux/hdreg.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <asm/irq.h>
#include <asm/time.h>
#include <linux/irq.h>
#include <linux/ide.h>
#include <linux/interrupt.h>
#include <linux/bootmem.h>
#include <asm/mc146818rtc.h>
#include <asm/reboot.h>
#include <asm/hp-lj/asic.h>
#include "utils.h"
#ifdef CONFIG_REMOTE_DEBUG
int remote_debug = 0;
#endif
static void (*timer_interrupt_service)(int irq, void *dev_id, struct pt_regs * regs) = NULL;
static void andros_timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)
{
if (!(*((volatile unsigned int*)0xbfea0010) & 0x20)) // mask = pend & en
return;
/* clear timer interrupt */
{
unsigned int tmr = *((volatile unsigned int*)0xbfe90040); // ctl bits
*((volatile unsigned int*)0xbfe90040) = tmr; // write to ack
*((volatile unsigned int*)0xbfea000c) = 0x20; // sys int ack
}
/* service interrupt */
timer_interrupt_service(irq, dev_id, regs);
}
static void harmony_timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)
{
if (!(*((volatile unsigned int*)0xbff63000) & 0x01))
return; // big sys int reg, 01-timer did it
if (!(*((volatile unsigned int*)0xbff610a4) & 0x01))
return; // local small int reg, 01-timer0 did it
*((volatile unsigned int*)0xbff610a4) = 1; // ack local timer0 bit
*((volatile unsigned int*)0xbff63000) = 1; // ack global timer bit
/* service interrupt */
timer_interrupt_service(irq, dev_id, regs);
}
#define ASIC_IRQ_NUMBER 2
static void __init hp_time_init(struct irqaction *irq)
{
timer_interrupt_service = irq->handler;
if (GetAsicId() == AndrosAsic) {
//*((volatile unsigned int*)0xbfe90000) = 0x2f; // set by bootloader to 0x20 // prescaler
*((volatile unsigned int*)0xbfe90040) = 0x21; // 20-res of 1kHz,1-int ack // control
*((volatile unsigned int*)0xbfe90048) = 0x09; // 09-reload val // reload
*((volatile unsigned int*)0xbfe90044) = 0x09; // 09-count val // count
*((volatile unsigned int*)0xbfe90040) = 0x2f; // 8-int enable,4-reload en,2-count down en,1-int-ack
irq->handler = andros_timer_interrupt;
irq->flags |= SA_INTERRUPT | SA_SHIRQ;
printk("setting up timer in hp_time_init\n");
setup_irq(ASIC_IRQ_NUMBER, irq);
// enable timer interrupt
*((volatile unsigned int*)0xbfea0000) = 0x20;
} else if (GetAsicId() == HarmonyAsic) {
*((volatile unsigned int*)0xbff61000) = 99; // prescaler, 100Mz sys clk
*((volatile unsigned int*)0xbff61028) = 0x09; // reload reg
*((volatile unsigned int*)0xbff61024) = 0x09; // count reg
*((volatile unsigned int*)0xbff61020) = 0x0b; // 80-1khz res on timer, 2 reload en, 1 - count down en
irq->handler = harmony_timer_interrupt;
irq->flags |= SA_INTERRUPT | SA_SHIRQ;
setup_irq(ASIC_IRQ_NUMBER, irq);
*((volatile unsigned int*)0xbff610a0) |= 1; // turn on timer0
} else if (GetAsicId() == UnknownAsic)
printk("Unknown asic in hp_time_init()\n");
else
printk("Unsupported asic in hp_time_init()\n");
}
static void hplj_restart(void)
{
if (GetAsicId() == AndrosAsic)
*((volatile unsigned int *) 0xbfe900c0) = 0;
if (GetAsicId() == HarmonyAsic)
*((volatile unsigned int *) 0xbff62030) = 0;
printk("Restart Failed ... halting instead\n");
while(1);
}
static void hplj_halt(void)
{
while(1);
}
void __init hp_setup(void)
{
#ifdef CONFIG_PCI
extern void pci_setup(void);
pci_setup();
#endif
#ifdef CONFIG_IDE
{
extern struct ide_ops std_ide_ops;
ide_ops = &std_ide_ops;
}
#endif
_machine_restart =(void (*)(char *)) hplj_restart;
_machine_halt = hplj_halt;
_machine_power_off = hplj_halt;
board_timer_setup = hp_time_init;
#ifdef CONFIG_REMOTE_DEBUG
{
extern char CommandLine[];
remote_debug = (strstr(CommandLine, "kgdb") != NULL);
}
#endif
printk("HP SETUP\n");
}
int __init page_is_ram(unsigned long pagenr)
{
return 1;
}
--- NEW FILE: utils.c ---
/*
*
*
*
*
*/
#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/module.h>
#include <asm/io.h>
#include "utils.h"
#define miu_chan_cfg(x) ((volatile unsigned long *)(0xbff40000+x*4)) /* for andros */
int mbsize[8] = {1,2,4,8,16,32,64,128};
unsigned long get_mem_avail(void) {
unsigned long cfg[10],i,total_mem=0;
for(i=0;i<10;i++)
cfg[i] = *miu_chan_cfg(i);
for(i=0;i<10;i++){
if(cfg[i]==0x1fc160c2) continue; // skip empties
if( ( (cfg[i]>>12) & 0xf ) <= 0xb ) continue; // skip roms
total_mem += mbsize[(cfg[i]>>16)&0x7] *1024*1024;
}
return total_mem;
}
static ulong* buffer_ptr = NULL;
static ulong buffer_size = 0;
ulong* get_reserved_buffer(void) {return KSEG0ADDR(buffer_ptr);}
ulong* get_reserved_buffer_virtual(void) {return (ulong*)ReservedMemVirtualAddr;}
ulong get_reserved_buffer_size(void) {return buffer_size;}
#define MIN_GEN_MEM (4 << 20)
void reserve_buffer(const char* cl, ulong base_mem)
{
char* pos = strstr(cl, "reserved_buffer=");
if (pos) {
buffer_size = simple_strtol(pos+strlen("reserved_buffer="),
0, 10);
buffer_size <<= 20;
if (buffer_size + MIN_GEN_MEM > base_mem)
buffer_size = base_mem - MIN_GEN_MEM;
if (buffer_size > 0)
buffer_ptr = (ulong*)(base_mem - buffer_size);
else
buffer_size = 0;
}
}
EXPORT_SYMBOL(get_reserved_buffer);
EXPORT_SYMBOL(get_reserved_buffer_virtual);
EXPORT_SYMBOL(get_reserved_buffer_size);
--- NEW FILE: utils.h ---
/*
*
*
*
*/
#include <linux/types.h>
#define ReservedMemVirtualAddr 0x50000000
unsigned long get_mem_avail(void);
ulong* get_reserved_buffer(void);
ulong* get_reserved_buffer_virtual(void);
ulong get_reserved_buffer_size(void);
void reserve_buffer(const char* cl, ulong base_mem);
|
Update of /cvsroot/linux-mips/linux/arch/mips/configs In directory usw-pr-cvs1:/tmp/cvs-serv6428/arch/mips/configs Modified Files: defconfig-atlas defconfig-cobalt defconfig-ddb5476 defconfig-ddb5477 defconfig-decstation defconfig-eagle defconfig-ev64120 defconfig-ev96100 defconfig-ip22 defconfig-it8172 defconfig-jmr3927 defconfig-korva defconfig-malta defconfig-nino defconfig-ocelot defconfig-osprey defconfig-pb1000 defconfig-rm200 Added Files: defconfig-hp-lj Log Message: HP Laserjet support. --- NEW FILE: defconfig-hp-lj --- # # Automatically generated make config: don't edit # CONFIG_MIPS=y # # Code maturity level options # CONFIG_EXPERIMENTAL=y # # Machine selection # # CONFIG_ACER_PICA_61 is not set # CONFIG_ALGOR_P4032 is not set # CONFIG_BAGET_MIPS is not set # CONFIG_DECSTATION is not set # CONFIG_DDB5074 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_SIBYTE_SB1250 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_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_HP_LASERJET=y 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_NEW_TIME_C=y CONFIG_NEW_IRQ=y CONFIG_IRQ_CPU=y CONFIG_NEW_PCI=y # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_I8259 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_RM7000 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_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_KCORE_ELF=y CONFIG_ELF_KERNEL=y # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set CONFIG_NET=y # CONFIG_PCI_NAMES is not set # CONFIG_HOTPLUG is not set # CONFIG_PCMCIA is not set CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # # Memory Technology Devices (MTD) # CONFIG_MTD=y CONFIG_MTD_DEBUG=y CONFIG_MTD_DEBUG_VERBOSE=3 CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set # # User Modules And Translation Layers # CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set # # RAM/ROM/Flash chip drivers # CONFIG_MTD_CFI=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_GEN_PROBE=y # CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_OBSOLETE_CHIPS is not set # CONFIG_MTD_AMDSTD is not set # CONFIG_MTD_SHARP is not set # CONFIG_MTD_JEDEC is not set # # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_START=10040000 CONFIG_MTD_PHYSMAP_LEN=00fc0000 CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set # # Self-contained MTD device drivers # # CONFIG_MTD_PMC551 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLKMTD is not set # # Disk-On-Chip Device Drivers # # CONFIG_MTD_DOC1000 is not set # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set # # NAND Flash Device Drivers # CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_ECC is not set # CONFIG_MTD_NAND_VERIFY_WRITE is not set # # Parallel port support # # CONFIG_PARPORT is not set # # Block devices # # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set # # Multi-device support (RAID and LVM) # # CONFIG_MD is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_MD_LINEAR is not set # CONFIG_MD_RAID0 is not set # CONFIG_MD_RAID1 is not set # CONFIG_MD_RAID5 is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_BLK_DEV_LVM is not set # # Networking options # CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set # CONFIG_NETLINK is not set # CONFIG_NETFILTER is not set # CONFIG_FILTER is not set CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE 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 # CONFIG_BRIDGE is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_LLC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_FASTROUTE is not set # CONFIG_NET_HW_FLOWCONTROL is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set # # Telephony Support # # CONFIG_PHONE is not set # CONFIG_PHONE_IXJ is not set # CONFIG_PHONE_IXJ_PCMCIA is not set # # ATA/IDE/MFM/RLL support # CONFIG_IDE=y # # IDE, ATA and ATAPI Block devices # CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_BLK_DEV_IDEDISK_VENDOR is not set # CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set # CONFIG_BLK_DEV_IDEDISK_IBM is not set # CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set # CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set # CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set # CONFIG_BLK_DEV_IDEDISK_WD is not set # CONFIG_BLK_DEV_COMMERIAL is not set # CONFIG_BLK_DEV_TIVO is not set # CONFIG_BLK_DEV_IDECS is not set # CONFIG_BLK_DEV_IDECD is not set # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # # IDE chipset support/bugfixes # CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640_ENHANCED=y # 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=y 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=y # CONFIG_IDEDMA_IVB is not set # CONFIG_DMA_NONPCI is not set CONFIG_BLK_DEV_IDE_MODES=y # CONFIG_BLK_DEV_ATARAID is not set # CONFIG_BLK_DEV_ATARAID_PDC is not set # CONFIG_BLK_DEV_ATARAID_HPT is not set # # SCSI support # # CONFIG_SCSI is not set # # I2O device support # # CONFIG_I2O is not set # CONFIG_I2O_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 # # ARCnet devices # # CONFIG_ARCNET is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # # Ethernet (10 or 100Mbit) # 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 # CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set # 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_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_POCKET is not set # # Ethernet (1000 Mbit) # # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_MYRI_SBUS is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_SK98LIN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set # # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y # CONFIG_STRIP is not set # CONFIG_WAVELAN is not set # CONFIG_ARLAN is not set # CONFIG_AIRONET4500 is not set # CONFIG_AIRONET4500_NONCS is not set # CONFIG_AIRONET4500_PROC is not set # CONFIG_AIRO is not set # CONFIG_HERMES is not set # CONFIG_PLX_HERMES is not set CONFIG_NET_WIRELESS=y # # Token Ring devices # # CONFIG_TR is not set # CONFIG_NET_FC is not set # CONFIG_RCPCI is not set # CONFIG_SHAPER is not set # # Wan interfaces # # CONFIG_WAN is not set # # Amateur Radio support # # CONFIG_HAMRADIO is not set # # IrDA (infrared) support # # CONFIG_IRDA is not set # # ISDN subsystem # # CONFIG_ISDN is not set # # Old CD-ROM drivers (not SCSI, not IDE) # # CONFIG_CD_NO_IDESCSI is not set # # Character devices # # CONFIG_VT is not set CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_UNIX98_PTYS is not set # # I2C support # # CONFIG_I2C is not set # # Mice # # CONFIG_BUSMOUSE is not set # CONFIG_MOUSE is not set # # 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 # # Watchdog Cards # # CONFIG_WATCHDOG is not set # CONFIG_INTEL_RNG is not set # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # # Ftape, the floppy tape device driver # # CONFIG_FTAPE is not set # CONFIG_AGP is not set # CONFIG_DRM is not set # # Multimedia devices # # CONFIG_VIDEO_DEV is not set # # File systems # # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_CHECK 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_FAT_FS is not set # CONFIG_MSDOS_FS is not set # CONFIG_UMSDOS_FS is not set # CONFIG_VFAT_FS is not set # CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=3 # CONFIG_CRAMFS is not set # CONFIG_TMPFS is not set CONFIG_RAMFS=m # CONFIG_ISO9660_FS is not set # CONFIG_JOLIET is not set # CONFIG_ZISOFS is not set # CONFIG_MINIX_FS is not set # CONFIG_VXFS_FS is not set # CONFIG_NTFS_FS is not set # CONFIG_NTFS_RW is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set # CONFIG_DEVPTS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UDF_FS is not set # CONFIG_UDF_RW is not set # CONFIG_UFS_FS is not set # CONFIG_UFS_FS_WRITE is not set # # Network File Systems # # CONFIG_CODA_FS is not set CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set # CONFIG_NCPFS_STRONG is not set # CONFIG_NCPFS_NFS_NS is not set # CONFIG_NCPFS_OS2_NS is not set # CONFIG_NCPFS_SMALLDOS is not set # CONFIG_NCPFS_NLS is not set # CONFIG_NCPFS_EXTRAS is not set # CONFIG_ZISOFS_FS is not set # CONFIG_ZLIB_FS_INFLATE is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y # CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # # Sound # # CONFIG_SOUND is not set # # 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 # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_HP8200e is not set # CONFIG_USB_STORAGE_SDDR09 is not set # 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 # # USB Serial Converter support # # CONFIG_USB_SERIAL is not set # CONFIG_USB_SERIAL_GENERIC is not set # CONFIG_USB_SERIAL_BELKIN is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set # CONFIG_USB_SERIAL_EMPEG is not set # CONFIG_USB_SERIAL_FTDI_SIO is not set # CONFIG_USB_SERIAL_VISOR is not set # CONFIG_USB_SERIAL_IR is not set # CONFIG_USB_SERIAL_EDGEPORT is not set # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set # CONFIG_USB_SERIAL_KEYSPAN is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set # CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set # CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set # CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set # CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set # CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set # CONFIG_USB_SERIAL_MCT_U232 is not set # CONFIG_USB_SERIAL_PL2303 is not set # 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 # # Input core support # # CONFIG_INPUT is not set # CONFIG_INPUT_KEYBDEV is not set # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set # # Kernel hacking # CONFIG_CROSSCOMPILE=y CONFIG_REMOTE_DEBUG=y # 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-atlas =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-atlas,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-atlas 2001/11/07 20:50:10 1.10 +++ defconfig-atlas 2001/11/19 18:31:01 1.11 @@ -37,6 +37,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-cobalt =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-cobalt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- defconfig-cobalt 2001/11/07 20:50:10 1.11 +++ defconfig-cobalt 2001/11/19 18:31:01 1.12 @@ -38,6 +38,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-ddb5476 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5476,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- defconfig-ddb5476 2001/11/07 20:50:10 1.13 +++ defconfig-ddb5476 2001/11/19 18:31:01 1.14 @@ -39,6 +39,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-ddb5477 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5477,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- defconfig-ddb5477 2001/11/07 20:50:10 1.12 +++ defconfig-ddb5477 2001/11/19 18:31:01 1.13 @@ -38,6 +38,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-decstation =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-decstation,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- defconfig-decstation 2001/11/07 20:50:10 1.11 +++ defconfig-decstation 2001/11/19 18:31:01 1.12 @@ -38,6 +38,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-eagle =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-eagle,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- defconfig-eagle 2001/11/07 20:50:10 1.9 +++ defconfig-eagle 2001/11/19 18:31:01 1.10 @@ -39,6 +39,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-ev64120 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ev64120,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-ev64120 2001/11/07 20:50:10 1.10 +++ defconfig-ev64120 2001/11/19 18:31:01 1.11 @@ -42,6 +42,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-ev96100 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ev96100,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- defconfig-ev96100 2001/11/07 20:50:10 1.11 +++ defconfig-ev96100 2001/11/19 18:31:01 1.12 @@ -38,6 +38,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-ip22 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ip22,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- defconfig-ip22 2001/11/07 20:50:10 1.11 +++ defconfig-ip22 2001/11/19 18:31:01 1.12 @@ -37,6 +37,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-it8172 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-it8172,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- defconfig-it8172 2001/11/12 22:58:48 1.14 +++ defconfig-it8172 2001/11/19 18:31:01 1.15 @@ -40,6 +40,7 @@ # CONFIG_IT8172_REVC is not set # CONFIG_MIPS_IVR is not set # CONFIG_MIPS_PB1000 is not set +# CONFIG_HP_LASERJET is not set # CONFIG_TOSHIBA_JMR3927 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set Index: defconfig-jmr3927 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-jmr3927,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- defconfig-jmr3927 2001/11/10 03:52:49 1.1 +++ defconfig-jmr3927 2001/11/19 18:31:01 1.2 @@ -37,6 +37,7 @@ # 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_TOSHIBA_JMR3927=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set Index: defconfig-korva =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-korva,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- defconfig-korva 2001/11/07 20:50:10 1.6 +++ defconfig-korva 2001/11/19 18:31:01 1.7 @@ -38,6 +38,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-malta =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-malta,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-malta 2001/11/07 20:50:10 1.10 +++ defconfig-malta 2001/11/19 18:31:01 1.11 @@ -37,6 +37,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-nino =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-nino,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- defconfig-nino 2001/11/13 17:10:09 1.14 +++ defconfig-nino 2001/11/19 18:31:01 1.15 @@ -41,6 +41,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-ocelot =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ocelot,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-ocelot 2001/11/07 20:50:10 1.10 +++ defconfig-ocelot 2001/11/19 18:31:01 1.11 @@ -37,6 +37,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-osprey =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-osprey,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- defconfig-osprey 2001/11/07 20:50:10 1.9 +++ defconfig-osprey 2001/11/19 18:31:01 1.10 @@ -37,6 +37,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-pb1000 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1000,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- defconfig-pb1000 2001/11/07 20:50:10 1.13 +++ defconfig-pb1000 2001/11/19 18:31:01 1.14 @@ -38,6 +38,7 @@ # CONFIG_MIPS_IVR is not set CONFIG_MIPS_PB1000=y CONFIG_PCI_AUTO=y +# CONFIG_HP_LASERJET is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set Index: defconfig-rm200 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-rm200,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-rm200 2001/11/07 20:50:10 1.10 +++ defconfig-rm200 2001/11/19 18:31:01 1.11 @@ -38,6 +38,7 @@ # 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_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_MCA is not set |
|
From: James S. <jsi...@us...> - 2001-11-19 18:31:04
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv6428/arch/mips
Modified Files:
Makefile config.in defconfig
Log Message:
HP Laserjet support.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile 2001/11/10 03:52:48 1.28
+++ Makefile 2001/11/19 18:31:01 1.29
@@ -122,6 +122,16 @@
endif
#
+# ramdisk/initrd support
+# You need a compressed ramdisk image, named ramdisk.gz in
+# arch/mips/ramdisk
+#
+ifdef CONFIG_BLK_DEV_INITRD
+CORE_FILES += arch/mips/ramdisk/ramdisk.o
+SUBDIRS += arch/mips/ramdisk
+endif
+
+#
# Board-dependent options and extra files
#
ifdef CONFIG_ALGOR_P4032
@@ -345,6 +355,15 @@
LIBS += arch/mips/sibyte/swarm/sbswarm.a
SUBDIRS += arch/mips/sibyte/swarm
LOADADDR += 0x80100000
+endif
+
+#
+# HP LaserJet
+#
+ifdef CONFIG_HP_LASERJET
+SUBDIRS += arch/mips/hp-lj
+LIBS += arch/mips/hp-lj/hp-lj.o
+LOADADDR := 0x80030000
endif
#
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- config.in 2001/11/13 17:10:09 1.50
+++ config.in 2001/11/19 18:31:01 1.51
@@ -75,7 +75,7 @@
fi
fi
bool 'Support for Sony PlayStation 2' CONFIG_PS2
- bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
+ bool 'Support for Casio Cassiopeia BE-300 (EXPERIMENTAL)' CONFIG_CASIO_BE300
bool 'Support for Vadem Clio 1000 (EXPERIMENTAL)' CONFIG_VADEM_CLIO_1000
fi
bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000
@@ -95,8 +95,8 @@
if [ "$CONFIG_MIPS_PB1000" = "y" ]; then
bool ' Support for PCI AUTO Config' CONFIG_PCI_AUTO
fi
-bool 'Support for Toshiba JMR-TX3927 board' CONFIG_TOSHIBA_JMR3927
-
+bool 'Support for Hewlett Packard LaserJet board' CONFIG_HP_LASERJET
+bool 'Support for Toshiba JMR-TX3927 board' CONFIG_TOSHIBA_JMR3927
define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
@@ -289,7 +289,7 @@
define_bool CONFIG_COBALT_LCD y
define_bool CONFIG_PCI y
# define_bool CONFIG_NEW_PCI y
-# define_bool CONFIG_PCI_AUTO y
+# define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_OLD_TIME_C y
fi
if [ "$CONFIG_VADEM_CLIO_1000" = "y" ]; then
@@ -303,7 +303,6 @@
define_bool CONFIG_ISA y
define_bool CONFIG_DUMMY_KEYB y
fi
-
if [ "$CONFIG_NINO" = "y" ]; then
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NEW_TIME_C y
@@ -329,17 +328,24 @@
define_bool CONFIG_DUMMY_KEYB y
define_bool CONFIG_PCI y
fi
-
+if [ "$CONFIG_HP_LASERJET" = "y" ]; then
+ define_bool CONFIG_PCI y
+ define_bool CONFIG_NEW_TIME_C y
+ define_bool CONFIG_NEW_IRQ y
+ define_bool CONFIG_IRQ_CPU y
+ define_bool CONFIG_NEW_PCI y
+ #not yet define_bool CONFIG_PCI_AUTO y
+fi
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
define_bool CONFIG_TOSHIBA_BOARDS y
- define_bool CONFIG_PCI y
+ define_bool CONFIG_PCI y
define_bool CONFIG_NEW_PCI y
define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_NEW_TIME_C y
define_bool CONFIG_SWAP_IO_SPACE y
define_bool CONFIG_PC_KEYB y
-fi
+fi
if [ "$CONFIG_ISA" != "y" ]; then
define_bool CONFIG_ISA n
@@ -398,10 +404,10 @@
bool ' lld/scd Instructions available' CONFIG_CPU_HAS_LLDSCD
bool ' Writeback Buffer available' CONFIG_CPU_HAS_WB
else
- if [ "$CONFIG_CPU_R3000" = "y" -o \
- "$CONFIG_CPU_VR41XX" = "y" -o \
- "$CONFIG_CPU_TX39XX" = "y" ]; then
- if [ "$CONFIG_DECSTATION" = "y" ]; then
+ if [ "$CONFIG_CPU_R3000" = "y" -o
+ "$CONFIG_CPU_VR41XX" = "y" -o
+ "$CONFIG_CPU_TX39XX" = "y" -o
+ "$CONFIG_DECSTATION" = "y" ]; then
define_bool CONFIG_CPU_HAS_LLSC n
define_bool CONFIG_CPU_HAS_LLDSCD n
define_bool CONFIG_CPU_HAS_WB y
@@ -428,7 +434,7 @@
comment 'General setup'
if [ "$CONFIG_DECSTATION" = "y" -o \
"$CONFIG_DDB5074" = "y" -o \
- "$CONFIG_NINO" = "y" -o \
+ "$CONFIG_NINO" = "y" -o \
"$CONFIG_VR4111" = "y" -o \
"$CONFIG_NEC_KORVA" = "y" ]; then
define_bool CONFIG_CPU_LITTLE_ENDIAN y
@@ -437,8 +443,8 @@
fi
if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
- bool 'DS1742 BRAM/RTC support' CONFIG_RTC_DS1742
-fi
+ bool 'DS1742 BRAM/RTC support' CONFIG_RTC_DS1742
+fi
if [ "$CONFIG_PROC_FS" = "y" ]; then
define_bool CONFIG_KCORE_ELF y
@@ -591,10 +597,6 @@
bool 'Z85C30 Serial Support' CONFIG_ZS
fi
bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
- fi
- bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
- if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
- int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
fi
# if [ "$CONFIG_ACCESSBUS" = "y" ]; then
# bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/defconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- defconfig 2001/11/07 20:50:10 1.14
+++ defconfig 2001/11/19 18:31:01 1.15
@@ -38,6 +38,7 @@
# 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_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
# CONFIG_MCA is not set
|
|
From: James S. <jsi...@us...> - 2001-11-19 18:00:50
|
Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv29791
Modified Files:
mipsregs.h
Log Message:
Document read_mips32_cp0_config1() a bit.
Index: mipsregs.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/mipsregs.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mipsregs.h 2001/10/31 17:28:54 1.10
+++ mipsregs.h 2001/11/19 18:00:47 1.11
@@ -498,6 +498,9 @@
__asm__ __volatile__( \
".set\tnoreorder\n\t" \
".set\tnoat\n\t" \
+ "#.set\tmips64\n\t" \
+ "#mfc0\t$1, $16, 1\n\t" \
+ "#.set\tmips0\n\t" \
".word\t0x40018001\n\t" \
"move\t%0,$1\n\t" \
".set\tat\n\t" \
|
|
From: James S. <jsi...@us...> - 2001-11-19 17:59:45
|
Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv29446
Modified Files:
c-sb1.c
Log Message:
Use instead of inline monstrosity.
Index: c-sb1.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-sb1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- c-sb1.c 2001/11/07 17:29:03 1.2
+++ c-sb1.c 2001/11/19 17:59:43 1.3
@@ -450,12 +450,8 @@
static __init void probe_cache_sizes(void)
{
u32 config1;
- __asm__ __volatile__(
- ".set push \n"
- ".set mips64 \n"
- " mfc0 %0, $16, 1 \n" /* Get config1 register */
- ".set pop \n"
- :"=r" (config1));
+
+ config1 = read_mips32_cp0_config1();
icache_line_size = decode_cache_line_size((config1 >> 19) & 0x7);
dcache_line_size = decode_cache_line_size((config1 >> 10) & 0x7);
icache_sets = decode_cache_sets((config1 >> 22) & 0x7);
|
582 messages has been excluded from this view by a project administrator.
