Menu
▾
▴
[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.28,1.29 config.in,1.50,1.51 defconfig,1.14,1.15
|
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
|
