patch-2.3.48 linux/arch/mips/kernel/Makefile

Next file: linux/arch/mips/kernel/entry.S
Previous file: linux/arch/mips/jazz/setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.47/linux/arch/mips/kernel/Makefile linux/arch/mips/kernel/Makefile
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.15 2000/01/26 00:07:44 ralf Exp $
 #
 # Makefile for the Linux/MIPS kernel.
 #
@@ -13,11 +14,21 @@
 EXTRA_ASFLAGS = -mips3 -mcpu=r4000
 O_TARGET := kernel.o
 O_OBJS	:= branch.o process.o signal.o entry.o traps.o ptrace.o vm86.o \
-	   ioport.o pci.o reset.o setup.o syscall.o sysmips.o ipc.o \
-	   r4k_switch.o r4k_misc.o r4k_fpu.o r2300_switch.o r2300_misc.o \
-	   r2300_fpu.o r6000_fpu.o scall_o32.o softfp.o unaligned.o
+	   ioport.o reset.o semaphore.o setup.o syscall.o sysmips.o ipc.o \
+	   scall_o32.o softfp.o unaligned.o
 OX_OBJS := mips_ksyms.o
 
+ifdef CONFIG_CPU_R3000
+O_OBJS	+= r2300_misc.o r2300_fpu.o r2300_switch.o
+else
+O_OBJS	+= r4k_misc.o r4k_switch.o 
+ifdef CONFIG_CPU_R6000
+O_OBJS	+= r6000_fpu.o
+else
+O_OBJS	+= r4k_fpu.o
+endif
+endif
+
 ifdef CONFIG_MIPS_FPE_MODULE
 M_OBJS += fpe.o
 endif
@@ -25,10 +36,11 @@
 #
 # SGIs have very different interrupt/timer hardware.
 #
-ifndef CONFIG_SGI
+ifndef CONFIG_SGI_IP22
   ifndef CONFIG_DECSTATION
     ifndef CONFIG_BAGET_MIPS
-      O_OBJS += irq.o time.o
+      O_OBJS += time.o
+      OX_OBJS += irq.o
     endif
   endif
 endif
@@ -61,8 +73,6 @@
 # compatibility stuff between various boards and boards.
 #
 O_OBJS := $(sort $(O_OBJS))
-
-all: kernel.o head.o
 
 entry.o: entry.S
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)