Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/arch/m68k Makefile,1.1.1.1,1.2 config.in,1.1.1.1,1.2 vmlinux-sun3.lds,1.1.1.1,1.2 vmlinux.lds,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-10 18:39:12
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/m68k
In directory usw-pr-cvs1:/tmp/cvs-serv13561/m68k
Modified Files:
Makefile config.in vmlinux-sun3.lds vmlinux.lds
Log Message:
synch 2.4.15 commit 37
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 19:33:57 -0000 1.1.1.1
+++ Makefile 10 Apr 2002 14:34:32 -0000 1.2
@@ -110,8 +110,8 @@
endif
ifdef CONFIG_SUN3X
-CORE_FILES := $(CORE_FILES) arch/m68k/sun3x/sun3x.o
-SUBDIRS := $(SUBDIRS) arch/m68k/sun3x
+CORE_FILES := $(CORE_FILES) arch/m68k/sun3x/sun3x.o arch/m68k/sun3/sun3.o
+SUBDIRS := $(SUBDIRS) arch/m68k/sun3x arch/m68k/sun3
endif
ifdef CONFIG_SUN3
Index: config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.in 14 Jan 2001 19:34:00 -0000 1.1.1.1
+++ config.in 10 Apr 2002 14:34:33 -0000 1.2
@@ -4,6 +4,8 @@
#
define_bool CONFIG_UID16 y
+define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
+define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
mainmenu_name "Linux/68k Kernel Configuration"
@@ -53,8 +55,8 @@
if [ "$CONFIG_HP300" = "y" ]; then
bool ' DIO bus support' CONFIG_DIO
fi
-bool 'Sun3 support' CONFIG_SUN3
bool 'Sun3x support' CONFIG_SUN3X
+bool 'Sun3 support' CONFIG_SUN3
bool 'Q40/Q60 support' CONFIG_Q40
@@ -110,7 +112,7 @@
bool 'Support for ST-RAM as swap space' CONFIG_STRAM_SWAP
bool 'ST-RAM statistics in /proc' CONFIG_STRAM_PROC
fi
-if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_ATARI" = "y" ]; then
+if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_ATARI" = "y" -o "$CONFIG_Q40" = "y" ]; then
bool 'Use power LED as a heartbeat' CONFIG_HEARTBEAT
else
if [ "$CONFIG_HP300" = "y" ]; then
@@ -140,13 +142,17 @@
fi
dep_tristate ' Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
if [ "$CONFIG_PRINTER" != "n" ]; then
- bool ' Support IEEE1284 status readback' CONFIG_PRINTER_READBACK
+ bool ' Support IEEE1284 status readback' CONFIG_PARPORT_1284
fi
fi
source drivers/pci/Config.in
source drivers/zorro/Config.in
+if [ "$CONFIG_Q40" = "y" ]; then
+source drivers/pnp/Config.in
+fi
+
endmenu
source drivers/mtd/Config.in
@@ -190,7 +196,7 @@
int 'Maximum number of SCSI disks that can be loaded as modules' CONFIG_SD_EXTRA_DEVS 40
fi
dep_tristate ' SCSI tape support' CONFIG_CHR_DEV_ST $CONFIG_SCSI
- if [ "$CONFIG_BLK_DEV_ST" != "n" ]; then
+ if [ "$CONFIG_CHR_DEV_ST" != "n" ]; then
int 'Maximum number of SCSI tapes that can be loaded as modules' CONFIG_ST_EXTRA_DEVS 2
fi
dep_tristate ' SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
@@ -262,11 +268,11 @@
fi
if [ "$CONFIG_SUN3" = "y" ]; then
- dep_tristate 'Sun3 NCR5380 SCSI' CONFIG_SUN3_SCSI $CONFIG_SCSI
+ dep_tristate 'Sun3 NCR5380 OBIO SCSI' CONFIG_SUN3_SCSI $CONFIG_SCSI
fi
if [ "$CONFIG_SUN3X" = "y" ]; then
- bool 'ESP SCSI driver' CONFIG_SUN3X_ESP
+ bool 'Sun3x ESP SCSI' CONFIG_SUN3X_ESP
fi
endmenu
@@ -336,6 +342,9 @@
if [ "$CONFIG_SUN3" = "y" -o "$CONFIG_SUN3X" = "y" ]; then
tristate ' Sun3/Sun3x on-board LANCE support' CONFIG_SUN3LANCE
fi
+ if [ "$CONFIG_SUN3" = "y" ]; then
+ tristate ' Sun3 on-board Intel 82586 support' CONFIG_SUN3_82586
+ fi
if [ "$CONFIG_HP300" = "y" ]; then
bool ' HP on-board LANCE support' CONFIG_HPLANCE
fi
@@ -365,7 +374,6 @@
if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
bool ' Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
bool ' Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
-# bool ' Autodetect IRQ - do not yet enable !!' CONFIG_SERIAL_DETECT_IRQ
bool ' Support special multiport boards' CONFIG_SERIAL_MULTIPORT
bool ' Support the Bell Technologies HUB6 card' CONFIG_HUB6
fi
@@ -449,16 +457,16 @@
else
define_bool CONFIG_SUN3X_ZS n
fi
-dep_bool ' Sun keyboard support' CONFIG_SUN_KEYBOARD $CONFIG_SUN3X_ZS
-dep_bool ' Sun mouse support' CONFIG_SUN_MOUSE $CONFIG_SUN3X_ZS
-if [ "$CONFIG_SUN_MOUSE" = "y" ]; then
- define_bool CONFIG_BUSMOUSE y
-fi
if [ "$CONFIG_SUN3X_ZS" = "y" ]; then
+ define_bool CONFIG_SUN_KEYBOARD y
+ define_bool CONFIG_SUN_MOUSE y
+ define_bool CONFIG_BUSMOUSE y
define_bool CONFIG_SBUS y
define_bool CONFIG_SBUSCHAR y
define_bool CONFIG_SUN_SERIAL y
else
+ define_bool CONFIG_SUN_KEYBOARD n
+ define_bool CONFIG_SUN_MOUSE n
define_bool CONFIG_SBUS n
fi
@@ -487,8 +495,10 @@
fi
fi
if [ "$CONFIG_APOLLO" = "y" ]; then
- bool 'Support for DN serial port (dummy)' CONFIG_SERIAL
+ bool 'Support for DN serial port (dummy)' CONFIG_DN_SERIAL
bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
+
+ define_tristate CONFIG_SERIAL $CONFIG_DN_SERIAL
fi
bool 'Support for user serial device modules' CONFIG_USERIAL
bool 'Watchdog Timer Support' CONFIG_WATCHDOG
@@ -504,9 +514,6 @@
else
bool 'Generic /dev/rtc emulation' CONFIG_GEN_RTC
fi
-fi
-if [ "$CONFIG_Q40" = "y" ]; then
- bool 'Q40 Real Time Clock Support' CONFIG_Q40RTC
fi
bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
Index: vmlinux-sun3.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/vmlinux-sun3.lds,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vmlinux-sun3.lds 14 Jan 2001 19:34:01 -0000 1.1.1.1
+++ vmlinux-sun3.lds 10 Apr 2002 14:34:33 -0000 1.2
@@ -20,6 +20,7 @@
.data : { /* Data */
*(.rodata)
+ *(.rodata.*)
*(.data)
CONSTRUCTORS
. = ALIGN(16); /* Exception table */
Index: vmlinux.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/m68k/vmlinux.lds,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vmlinux.lds 14 Jan 2001 19:34:01 -0000 1.1.1.1
+++ vmlinux.lds 10 Apr 2002 14:34:33 -0000 1.2
@@ -12,7 +12,7 @@
*(.text.lock) /* out-of-line lock text */
*(.gnu.warning)
} = 0x4e75
- .rodata : { *(.rodata) }
+ .rodata : { *(.rodata) *(.rodata.*) }
.kstrtab : { *(.kstrtab) }
. = ALIGN(16); /* Exception table */
|
