summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Makefile4
-rw-r--r--arch/mips/arc/Makefile12
-rw-r--r--arch/mips/defconfig2
-rw-r--r--arch/mips/defconfig-atlas4
-rw-r--r--arch/mips/defconfig-cp70002
-rw-r--r--arch/mips/defconfig-ddb54762
-rw-r--r--arch/mips/defconfig-decstation2
-rw-r--r--arch/mips/defconfig-ev641202
-rw-r--r--arch/mips/defconfig-ev961002
-rw-r--r--arch/mips/defconfig-ip222
-rw-r--r--arch/mips/defconfig-malta5
-rw-r--r--arch/mips/defconfig-rm2002
-rw-r--r--arch/mips/kernel/Makefile93
-rw-r--r--arch/mips/kernel/irixsig.c2
-rw-r--r--arch/mips/kernel/traps.c13
-rw-r--r--arch/mips/lib/Makefile25
-rw-r--r--arch/mips/mm/Makefile50
-rw-r--r--arch/mips/sgi/kernel/Makefile13
18 files changed, 67 insertions, 170 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 6a8cfe187..3ea928267 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -151,7 +151,8 @@ LOADADDR += 0x80080000
endif
ifdef CONFIG_SGI_IP22
-LIBS += arch/mips/sgi/kernel/sgikern.a arch/mips/arc/arclib.a
+CORE_FILES += arch/mips/sgi/kernel/ip22-kern.o
+LIBS += arch/mips/arc/arclib.a
SUBDIRS += arch/mips/sgi/kernel arch/mips/arc
#
# Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
@@ -273,7 +274,6 @@ zdisk: vmlinux
archclean:
@$(MAKEBOOT) clean
rm -f arch/$(ARCH)/ld.script
- $(MAKE) -C arch/$(ARCH)/kernel clean
$(MAKE) -C arch/$(ARCH)/tools clean
$(MAKE) -C arch/mips/baget clean
diff --git a/arch/mips/arc/Makefile b/arch/mips/arc/Makefile
index e37207b33..8af31d353 100644
--- a/arch/mips/arc/Makefile
+++ b/arch/mips/arc/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile,v 1.1 1998/10/18 13:32:08 tsbogend Exp $
#
# Makefile for the SGI arcs prom monitor library routines
# under Linux.
@@ -10,11 +9,12 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
L_TARGET = arclib.a
-L_OBJS = console.o init.o memory.o tree.o env.o cmdline.o misc.o time.o \
- file.o identify.o
-ifdef CONFIG_ARC_CONSOLE
-L_OBJS += arc_con.o
-endif
+obj-y += console.o init.o memory.o tree.o env.o cmdline.o misc.o \
+ time.o file.o identify.o
+
+obj-$(CONFIG_ARC_CONSOLE) += arc_con.o
+
+L_OBJS := $(obj-y)
include $(TOPDIR)/Rules.make
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 6f64e8a9a..b75e37c6b 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -301,8 +301,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-atlas b/arch/mips/defconfig-atlas
index 4b0740fe9..e622a3f9a 100644
--- a/arch/mips/defconfig-atlas
+++ b/arch/mips/defconfig-atlas
@@ -28,7 +28,7 @@ CONFIG_MIPS_ATLAS=y
# CONFIG_MCA is not set
# CONFIG_SBUS is not set
CONFIG_PCI=y
-# CONFIG_ISA is not set
+CONFIG_SWAP_IO_SPACE=y
# CONFIG_ISA is not set
# CONFIG_EISA is not set
# CONFIG_I8259 is not set
@@ -429,8 +429,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-cp7000 b/arch/mips/defconfig-cp7000
index d67e287ba..1d98bca31 100644
--- a/arch/mips/defconfig-cp7000
+++ b/arch/mips/defconfig-cp7000
@@ -405,8 +405,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476
index 21f540a76..9c74cad89 100644
--- a/arch/mips/defconfig-ddb5476
+++ b/arch/mips/defconfig-ddb5476
@@ -468,8 +468,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation
index dece17abb..72ac15128 100644
--- a/arch/mips/defconfig-decstation
+++ b/arch/mips/defconfig-decstation
@@ -295,8 +295,6 @@ CONFIG_EXT2_FS=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-ev64120 b/arch/mips/defconfig-ev64120
index 38dd7bbfb..004f6083f 100644
--- a/arch/mips/defconfig-ev64120
+++ b/arch/mips/defconfig-ev64120
@@ -404,8 +404,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-ev96100 b/arch/mips/defconfig-ev96100
index 262fd226a..eae29f655 100644
--- a/arch/mips/defconfig-ev96100
+++ b/arch/mips/defconfig-ev96100
@@ -395,8 +395,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22
index 6f64e8a9a..b75e37c6b 100644
--- a/arch/mips/defconfig-ip22
+++ b/arch/mips/defconfig-ip22
@@ -301,8 +301,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta
index 826c3f871..7f83eba55 100644
--- a/arch/mips/defconfig-malta
+++ b/arch/mips/defconfig-malta
@@ -29,7 +29,8 @@ CONFIG_MIPS_MALTA=y
# CONFIG_SBUS is not set
CONFIG_I8259=y
CONFIG_PCI=y
-# CONFIG_ISA is not set
+CONFIG_HAVE_STD_PC_SERIAL_PORT=y
+CONFIG_SWAP_IO_SPACE=y
# CONFIG_ISA is not set
# CONFIG_EISA is not set
@@ -427,8 +428,6 @@ CONFIG_LOCKD=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200
index 8fced9009..fefe5f65d 100644
--- a/arch/mips/defconfig-rm200
+++ b/arch/mips/defconfig-rm200
@@ -319,8 +319,6 @@ CONFIG_EXT2_FS=y
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_MOUNT_SUBDIR is not set
-# CONFIG_NCPFS_NDS_DOMAINS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 9be8406e4..6bec68661 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -11,97 +11,60 @@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
-all: kernel.o head.o init_task.o
EXTRA_ASFLAGS = -mips3 -mcpu=r4000
+
+all: kernel.o head.o init_task.o
+
O_TARGET := kernel.o
-O_OBJS := branch.o process.o signal.o entry.o traps.o ptrace.o vm86.o \
- ioport.o reset.o semaphore.o setup.o syscall.o sysmips.o ipc.o \
- scall_o32.o unaligned.o
-OX_OBJS := mips_ksyms.o
+
+obj-y += branch.o process.o signal.o entry.o \
+ traps.o ptrace.o vm86.o ioport.o reset.o \
+ semaphore.o setup.o syscall.o sysmips.o \
+ ipc.o scall_o32.o unaligned.o
+obj-$(CONFIG_MODULES) += mips_ksyms.o
ifdef CONFIG_CPU_R3000
-O_OBJS += r2300_misc.o r2300_fpu.o r2300_switch.o
+obj-y += r2300_misc.o r2300_fpu.o r2300_switch.o
else
-O_OBJS += r4k_misc.o r4k_switch.o
+obj-y += r4k_misc.o r4k_switch.o
ifdef CONFIG_CPU_R6000
-O_OBJS += r6000_fpu.o
+obj-y += r6000_fpu.o
else
-O_OBJS += r4k_fpu.o
-endif
+obj-y += r4k_fpu.o
endif
-
-ifdef CONFIG_MIPS_FPE_MODULE
-M_OBJS += fpe.o
endif
-ifndef CONFIG_MIPS_FPU_EMULATOR
-O_OBJS += softfp.o
-endif
+obj-$(CONFIG_MIPS_FPE_MODULE) += fpe.o
+obj-$(CONFIG_MIPS_FPU_EMULATOR) += softfp.o
-ifdef CONFIG_ROTTEN_IRQ
- OX_OBJS += old-irq.o
-endif
+# Old style irq support, going to die in 2.5.
+export-objs += old-irq.o
+obj-$(CONFIG_ROTTEN_IRQ) += old-irq.o
ifndef CONFIG_DECSTATION
ifndef CONFIG_BAGET_MIPS
ifndef CONFIG_MIPS_ATLAS
ifndef CONFIG_MIPS_MALTA
ifndef CONFIG_MIPS_EV96100
- O_OBJS += time.o
+ obj-y += time.o
endif
endif
endif
endif
endif
-#
-# Do we want to be able to execute IRIX elf binaries?
-#
-ifdef CONFIG_BINFMT_IRIX
-O_OBJS += irixelf.o irixioctl.o irixsig.o sysirix.o irixinv.o
-endif
-
-#
-# Kernel debugging
-#
-ifdef CONFIG_REMOTE_DEBUG
-O_OBJS += gdb-low.o gdb-stub.o
-endif
-
-ifdef CONFIG_PCI
-O_OBJS += pci-dma.o
-endif
-
-ifdef CONFIG_PROC_FS
-O_OBJS += proc.o
-endif
-
-#
-# Since we add the same object files to O_OBJS for different configurations.
-# O_OBJS might contain duplicate files. We correct this by filtering out
-# duplicate files. Just to avoid users having to know about all the
-# compatibility stuff between various boards and boards.
-#
-O_OBJS := $(sort $(O_OBJS))
+obj-$(CONFIG_BINFMT_IRIX) += irixelf.o irixioctl.o irixsig.o sysirix.o \
+ irixinv.o
+obj-$(CONFIG_REMOTE_DEBUG) += gdb-low.o gdb-stub.o
+obj-$(CONFIG_PCI) += pci-dma.o
+obj-$(CONFIG_PROC_FS) += proc.o
entry.o: entry.S
-
head.o: head.S
-#r4k_switch.o: r4k_switch.S
-#
-#r4k_misc.o: r4k_misc.S
-#
-#r4k_fpu.o: r4k_fpu.S
-#
-#r2300_switch.o: r2300_switch.S
-#
-#r2300_misc.o: r2300_misc.S
-#
-#r2300_fpu.o: r2300_fpu.S
-#
-#r6000_fpu.o: r6000_fpu.S
-
-clean:
+O_OBJS := $(filter-out $(export-objs), $(obj-y))
+OX_OBJS := $(filter $(export-objs), $(obj-y))
+M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))
+MX_OBJS := $(sort $(filter $(export-objs), $(obj-m)))
include $(TOPDIR)/Rules.make
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 6f6556da4..022bb1f77 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -716,7 +716,7 @@ repeat:
SET_LINKS(p);
notify_parent(p, SIGCHLD);
} else
- release(p);
+ release_task(p);
goto end_waitsys;
default:
continue;
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index d3ea588f0..f2a1d7032 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -36,19 +36,6 @@
#include <asm/inst.h>
#endif
-extern int console_loglevel;
-
-static inline void console_silent(void)
-{
- console_loglevel = 0;
-}
-
-static inline void console_verbose(void)
-{
- if (console_loglevel)
- console_loglevel = 15;
-}
-
/*
* Machine specific interrupt handlers
*/
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 52331d233..a5c870b73 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -9,26 +9,21 @@
L_TARGET = lib.a
-L_OBJS = csum_partial.o csum_partial_copy.o \
- rtc-std.o rtc-no.o memcpy.o memset.o watch.o\
- strlen_user.o strncpy_user.o strnlen_user.o
+obj-y += csum_partial.o csum_partial_copy.o \
+ rtc-std.o rtc-no.o memcpy.o memset.o \
+ watch.o strlen_user.o strncpy_user.o \
+ strnlen_user.o
ifdef CONFIG_CPU_R3000
- L_OBJS += r3k_dump_tlb.o
+ obj-y += r3k_dump_tlb.o
else
- L_OBJS += dump_tlb.o
+ obj-y += dump_tlb.o
endif
-ifdef CONFIG_BLK_DEV_FD
- L_OBJS += floppy-no.o floppy-std.o
-endif
-
-ifdef CONFIG_IDE
- L_OBJS += ide-std.o ide-no.o
-endif
+obj-$(CONFIG_BLK_DEV_FD) += floppy-no.o floppy-std.o
+obj-$(CONFIG_IDE) += ide-std.o ide-no.o
+obj-$(CONFIG_PC_KEYB) += kbd-std.o kbd-no.o
-ifdef CONFIG_PC_KEYB
- L_OBJS += kbd-std.o kbd-no.o
-endif
+L_OBJS := $(filter-out $(export-objs), $(obj-y))
include $(TOPDIR)/Rules.make
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 4febbefd2..67a987693 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -8,46 +8,20 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := mm.o
-O_OBJS := extable.o init.o fault.o loadmmu.o
-ifdef CONFIG_CPU_R3000
-O_OBJS += r2300.o
-endif
+obj-y += extable.o init.o fault.o loadmmu.o
-ifdef CONFIG_CPU_R4300
-O_OBJS += r4xx0.o
-endif
+obj-$(CONFIG_CPU_R3000) += r2300.o
+obj-$(CONFIG_CPU_R4300) += r4xx0.o
+obj-$(CONFIG_CPU_R4X00) += r4xx0.o
+obj-$(CONFIG_CPU_R5000) += r4xx0.o
+obj-$(CONFIG_CPU_NEVADA) += r4xx0.o
+obj-$(CONFIG_CPU_R5432) += r5432.o
+obj-$(CONFIG_CPU_RM7000) += rm7k.o
+obj-$(CONFIG_CPU_MIPS32) += mips32.o
+obj-$(CONFIG_SGI_IP22) += umap.o
+obj-$(CONFIG_BAGET_MIPS) += umap.o
-ifdef CONFIG_CPU_R4X00
-O_OBJS += r4xx0.o
-endif
-
-ifdef CONFIG_CPU_R5000
-O_OBJS += r4xx0.o
-endif
-
-ifdef CONFIG_CPU_R5432
-O_OBJS += r5432.o
-endif
-
-ifdef CONFIG_CPU_RM7000
-O_OBJS += rm7k.o
-endif
-
-ifdef CONFIG_CPU_NEVADA
-O_OBJS += r4xx0.o
-endif
-
-ifdef CONFIG_CPU_MIPS32
-O_OBJS += mips32.o
-endif
-
-ifdef CONFIG_SGI_IP22
-O_OBJS += umap.o
-endif
-
-ifdef CONFIG_BAGET_MIPS
-O_OBJS += umap.o
-endif
+O_OBJS := $(filter-out $(export-objs), $(obj-y))
include $(TOPDIR)/Rules.make
diff --git a/arch/mips/sgi/kernel/Makefile b/arch/mips/sgi/kernel/Makefile
index f016cd12f..62fd01001 100644
--- a/arch/mips/sgi/kernel/Makefile
+++ b/arch/mips/sgi/kernel/Makefile
@@ -13,18 +13,15 @@
.S.o:
$(CC) $(CFLAGS) -c $< -o $*.o
-OBJS = indy_mc.o indy_sc.o indy_hpc.o indy_int.o indy_rtc.o \
- system.o indyIRQ.o reset.o setup.o time.o
+O_TARGET := ip22-kern.o
-all: sgikern.a
+all: ip22-kern.o indyIRQ.o
-sgikern.a: $(OBJS)
- $(AR) rcs sgikern.a $(OBJS)
- sync
+obj-y += indy_mc.o indy_sc.o indy_hpc.o indy_int.o indy_rtc.o system.o \
+ indyIRQ.o reset.o setup.o time.o
indyIRQ.o: indyIRQ.S
-dep:
- $(CPP) $(CPPFLAGS) -M *.c > .depend
+O_OBJS := $(obj-y)
include $(TOPDIR)/Rules.make
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 04:39:53 +0000