Update of /cvsroot/linux-vax/kernel-2.4/arch/cris
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/cris
Modified Files:
Makefile config.in
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 9 Apr 2002 17:03:15 -0000 1.2
+++ Makefile 10 Jun 2003 01:45:49 -0000 1.3
@@ -37,10 +37,9 @@
OBJCOPY := $(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
-# normally, gcc on a linux box adds __linux__ but we do it "manually"
-# -mlinux enables -march=v10, -fno-underscores among others
+# -mlinux enables -march=v10, -fno-underscores, -D__linux__ among others
-CFLAGS := $(CFLAGS) -mlinux -fno-strict-aliasing -pipe -D__linux__
+CFLAGS := $(CFLAGS) -mlinux -pipe
ifdef CONFIG_ETRAX_KGDB
CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g
Index: config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.in 9 Apr 2002 17:03:15 -0000 1.2
+++ config.in 10 Jun 2003 01:45:49 -0000 1.3
@@ -35,6 +35,9 @@
bool 'Use kernel gdb debugger' CONFIG_ETRAX_KGDB
bool 'Enable Etrax100 watchdog' CONFIG_ETRAX_WATCHDOG
+if [ "$CONFIG_ETRAX_WATCHDOG" = "y" ]; then
+ bool 'Disable watchdog during Oops printouts' CONFIG_ETRAX_WATCHDOG_NICE_DOGGY
+fi
endmenu
|
