diff options
Diffstat (limited to 'arch/mips')
33 files changed, 73 insertions, 108 deletions
diff --git a/arch/mips/arc/Makefile b/arch/mips/arc/Makefile index 8af31d353..acba7efa4 100644 --- a/arch/mips/arc/Makefile +++ b/arch/mips/arc/Makefile @@ -15,6 +15,4 @@ obj-y += console.o init.o memory.o tree.o env.o cmdline.o misc.o \ obj-$(CONFIG_ARC_CONSOLE) += arc_con.o -L_OBJS := $(obj-y) - include $(TOPDIR)/Rules.make diff --git a/arch/mips/baget/Makefile b/arch/mips/baget/Makefile index f27a9e6f3..a62e48021 100644 --- a/arch/mips/baget/Makefile +++ b/arch/mips/baget/Makefile @@ -1,4 +1,3 @@ -# $Id: Makefile,v 1.3 1999/08/13 17:07:26 harald Exp $ # # Makefile for the Baget specific kernel interface routines # under Linux. @@ -12,22 +11,12 @@ all: baget.a O_TARGET := baget.a -O_OBJS := baget.o print.o setup.o time.o irq.o bagetIRQ.o reset.o wbflush.o - -ifeq ($(CONFIG_SERIAL),y) - OX_OBJS += vacserial.o -else - ifeq ($(CONFIG_SERIAL),m) - MX_OBJS += vacserial.o - endif -endif -ifeq ($(CONFIG_VAC_RTC),y) - OX_OBJS += vacrtc.o -else - ifeq ($(CONFIG_VAC_RTC),m) - MX_OBJS += vacrtc.o - endif -endif + +export-objs := vacserial.o vacrtc.o +obj-y := baget.o print.o setup.o time.o irq.o bagetIRQ.o \ + reset.o wbflush.o +obj-$(CONFIG_SERIAL) += vacserial.o +obj-$(CONFIG_VAC_RTC) += vacrtc.o bagetIRQ.o : bagetIRQ.S $(CC) $(CFLAGS) -c -o $@ $< diff --git a/arch/mips/baget/prom/Makefile b/arch/mips/baget/prom/Makefile index a98779f0e..ee24ab306 100644 --- a/arch/mips/baget/prom/Makefile +++ b/arch/mips/baget/prom/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# # Makefile for the Baget/MIPS prom emulator library routines. # # Note! Dependencies are done automagically by 'make dep', which also @@ -7,9 +7,8 @@ # # Note 2! The CFLAGS definitions are now in the main makefile... -O_TARGET := bagetlib.a -O_OBJS := init.o +L_TARGET := bagetlib.a -all: $(O_TARGET) +obj-y := init.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/config.in b/arch/mips/config.in index 374cbb5de..45edbbb37 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -2,6 +2,8 @@ # For a description of the syntax of this configuration file, # see Documentation/kbuild/config-language.txt. # +define_bool CONFIG_ALPHA y + mainmenu_name "Linux Kernel Configuration" mainmenu_option next_comment diff --git a/arch/mips/ddb5074/Makefile b/arch/mips/ddb5074/Makefile index d041acef5..15687d2d3 100644 --- a/arch/mips/ddb5074/Makefile +++ b/arch/mips/ddb5074/Makefile @@ -8,8 +8,6 @@ # # Note 2! The CFLAGS definitions are now in the main makefile... # -# $Id$ -# .S.s: $(CPP) $(CFLAGS) $< -o $*.s @@ -17,6 +15,7 @@ $(CC) $(CFLAGS) -c $< -o $*.o O_TARGET = ddb5074.a -O_OBJS = setup.o irq.o time.o prom.o pci.o int-handler.o nile4.o + +obj-y := setup.o irq.o time.o prom.o pci.o int-handler.o nile4.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/ddb5476/Makefile b/arch/mips/ddb5476/Makefile index cb061ab5f..f214396c6 100644 --- a/arch/mips/ddb5476/Makefile +++ b/arch/mips/ddb5476/Makefile @@ -15,10 +15,9 @@ $(CC) $(CFLAGS) -c $< -o $*.o O_TARGET = ddb5476.a -O_OBJS = setup.o irq.o time.o prom.o pci.o int-handler.o nile4.o -ifdef CONFIG_REMOTE_DEBUG -O_OBJS += dbg_io.o -endif +obj-y += setup.o irq.o time.o prom.o pci.o \ + int-handler.o nile4.o +obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile index af3fc2c23..f402951bc 100644 --- a/arch/mips/dec/Makefile +++ b/arch/mips/dec/Makefile @@ -11,26 +11,14 @@ .S.o: $(CC) $(AFLAGS) -c $< -o $@ -all: dec.o O_TARGET := dec.o -O_OBJS := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o -ifdef CONFIG_PROM_CONSOLE -O_OBJS += promcon.o -endif +export-objs = wbflush.o +obj-y := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o wbflush.o -ifdef CONFIG_SERIAL -O_OBJS += serial.o -endif - -ifeq ($(CONFIG_MODULES),y) - OX_OBJS = wbflush.o -else - O_OBJS += wbflush.o -endif +obj-$(CONFIG_PROM_CONSOLE) += promcon.o +obj-$(CONFIG_SERIAL) += serial.o int-handler.o: int-handler.S -clean: - include $(TOPDIR)/Rules.make diff --git a/arch/mips/dec/boot/Makefile b/arch/mips/dec/boot/Makefile index 1257b560c..3f69a6cf6 100644 --- a/arch/mips/dec/boot/Makefile +++ b/arch/mips/dec/boot/Makefile @@ -18,7 +18,8 @@ netboot: all all: dec_boot.o O_TARGET := dec_boot.o -O_OBJS := decstation.o + +obj-y := decstation.o clean: rm -f nbImage diff --git a/arch/mips/defconfig b/arch/mips/defconfig index b75e37c6b..3edb79924 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -171,6 +172,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 CONFIG_CHR_DEV_ST=y +# CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_SR_EXTRA_DEVS=2 @@ -320,6 +322,7 @@ CONFIG_MSDOS_PARTITION=y CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-atlas b/arch/mips/defconfig-atlas index e622a3f9a..73eb87c8f 100644 --- a/arch/mips/defconfig-atlas +++ b/arch/mips/defconfig-atlas @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -179,6 +180,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -437,6 +439,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-cp7000 b/arch/mips/defconfig-cp7000 index 1d98bca31..468cb6fbd 100644 --- a/arch/mips/defconfig-cp7000 +++ b/arch/mips/defconfig-cp7000 @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -413,6 +414,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476 index 9c74cad89..163e34c48 100644 --- a/arch/mips/defconfig-ddb5476 +++ b/arch/mips/defconfig-ddb5476 @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -476,6 +477,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index 72ac15128..c13e69607 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -165,6 +166,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -314,6 +316,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SGI_PARTITION is not set CONFIG_ULTRIX_PARTITION=y # CONFIG_SUN_PARTITION is not set +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-ev64120 b/arch/mips/defconfig-ev64120 index 004f6083f..783a7a55a 100644 --- a/arch/mips/defconfig-ev64120 +++ b/arch/mips/defconfig-ev64120 @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -412,6 +413,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-ev96100 b/arch/mips/defconfig-ev96100 index eae29f655..cbbc652fc 100644 --- a/arch/mips/defconfig-ev96100 +++ b/arch/mips/defconfig-ev96100 @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -403,6 +404,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index b75e37c6b..3edb79924 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -171,6 +172,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 CONFIG_CHR_DEV_ST=y +# CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_SR_EXTRA_DEVS=2 @@ -320,6 +322,7 @@ CONFIG_MSDOS_PARTITION=y CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta index 7f83eba55..6ec01a474 100644 --- a/arch/mips/defconfig-malta +++ b/arch/mips/defconfig-malta @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -178,6 +179,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -436,6 +438,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200 index fefe5f65d..9b3c6022f 100644 --- a/arch/mips/defconfig-rm200 +++ b/arch/mips/defconfig-rm200 @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -338,6 +339,7 @@ CONFIG_MSDOS_PARTITION=y CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # diff --git a/arch/mips/galileo-boards/ev64120/Makefile b/arch/mips/galileo-boards/ev64120/Makefile index af08f9dcd..1f119bf0e 100644 --- a/arch/mips/galileo-boards/ev64120/Makefile +++ b/arch/mips/galileo-boards/ev64120/Makefile @@ -15,13 +15,11 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: ev64120.o O_TARGET := ev64120.o -O_OBJS := serialGT.o int-handler.o promcon.o reset.o setup.o irq.o irq-handler.o i2o.o pci_bios.o -int-handler.o: int-handler.S +obj-y := serialGT.o int-handler.o promcon.o reset.o setup.o irq.o \ + irq-handler.o i2o.o pci_bios.o -clean: - *.o +int-handler.o: int-handler.S include $(TOPDIR)/Rules.make diff --git a/arch/mips/galileo-boards/ev96100/Makefile b/arch/mips/galileo-boards/ev96100/Makefile index 8759aa161..147cbb806 100644 --- a/arch/mips/galileo-boards/ev96100/Makefile +++ b/arch/mips/galileo-boards/ev96100/Makefile @@ -15,14 +15,9 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: ev96100.o - O_TARGET:= ev96100.o -O_OBJS:= prom.o time.o rtc.o irq.o int-handler.o setup.o puts.o uart.o \ - memory.o - -dep: - $(CPP) -M *.c > .depend +obj-y := prom.o time.o rtc.o irq.o int-handler.o setup.o puts.o uart.o \ + memory.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/galileo-boards/generic/Makefile b/arch/mips/galileo-boards/generic/Makefile index 0fc5d8b5b..a65a76488 100644 --- a/arch/mips/galileo-boards/generic/Makefile +++ b/arch/mips/galileo-boards/generic/Makefile @@ -32,10 +32,8 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: galboards.o - O_TARGET:= galboards.o -O_OBJS:= pci.o reset.o init.o cmdline.o +obj-y := pci.o reset.o init.o cmdline.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile index 03f6259f4..9328cdce2 100644 --- a/arch/mips/jazz/Makefile +++ b/arch/mips/jazz/Makefile @@ -11,13 +11,11 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $@ -all: jazz.o O_TARGET := jazz.o -O_OBJS := int-handler.o jazzdma.o reset.o rtc-jazz.o setup.o floppy-jazz.o \ + +obj-y := int-handler.o jazzdma.o reset.o rtc-jazz.o setup.o floppy-jazz.o \ kbd-jazz.o int-handler.o: int-handler.S -clean: - include $(TOPDIR)/Rules.make diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 6bec68661..03a7421ef 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -62,9 +62,4 @@ obj-$(CONFIG_PROC_FS) += proc.o entry.o: entry.S head.o: head.S -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/setup.c b/arch/mips/kernel/setup.c index 368300cf1..5f8662bd9 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -62,6 +62,8 @@ void (*cpu_wait)(void) = NULL; */ char cyclecounter_available; +unsigned long loops_per_sec; + /* * There are several bus types available for MIPS machines. "RISC PC" * type machines have ISA, EISA, VLB or PCI available, DECstations diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index a5c870b73..8d2a45406 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -24,6 +24,4 @@ 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 -L_OBJS := $(filter-out $(export-objs), $(obj-y)) - include $(TOPDIR)/Rules.make diff --git a/arch/mips/math-emu/Makefile b/arch/mips/math-emu/Makefile index 456e1067d..9a6b054fd 100644 --- a/arch/mips/math-emu/Makefile +++ b/arch/mips/math-emu/Makefile @@ -9,20 +9,16 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: fpu_emulator.o EXTRA_ASFLAGS = -mips2 -mcpu=r4000 + O_TARGET:= fpu_emulator.o -O_OBJS := cp1emu.o ieee754m.o ieee754d.o \ - ieee754dp.o ieee754sp.o ieee754.o ieee754xcpt.o \ - dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o dp_add.o dp_fsp.o \ - dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \ - dp_tint.o dp_fint.o dp_tlong.o dp_flong.o \ - sp_frexp.o sp_modf.o sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o \ - sp_cmp.o sp_logb.o sp_scalb.o sp_simple.o \ - sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \ +obj-y := cp1emu.o ieee754m.o ieee754d.o ieee754dp.o ieee754sp.o ieee754.o \ + ieee754xcpt.o dp_frexp.o dp_modf.o dp_div.o dp_mul.o dp_sub.o \ + dp_add.o dp_fsp.o dp_cmp.o dp_logb.o dp_scalb.o dp_simple.o \ + dp_tint.o dp_fint.o dp_tlong.o dp_flong.o sp_frexp.o sp_modf.o \ + sp_div.o sp_mul.o sp_sub.o sp_add.o sp_fdp.o sp_cmp.o sp_logb.o \ + sp_scalb.o sp_simple.o sp_tint.o sp_fint.o sp_tlong.o sp_flong.o \ dp_sqrt.o sp_sqrt.o kernel_linkage.o -clean: - include $(TOPDIR)/Rules.make diff --git a/arch/mips/mips-boards/atlas/Makefile b/arch/mips/mips-boards/atlas/Makefile index 4771fb317..b5939f8dd 100644 --- a/arch/mips/mips-boards/atlas/Makefile +++ b/arch/mips/mips-boards/atlas/Makefile @@ -37,9 +37,6 @@ all: atlas.o O_TARGET := atlas.o -O_OBJS := atlas_int.o atlas_rtc.o atlas_setup.o - -dep: - $(CPP) -M *.c > .depend +obj-y := atlas_int.o atlas_rtc.o atlas_setup.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile index 8a2f0e6d8..ebc07dcdd 100644 --- a/arch/mips/mips-boards/generic/Makefile +++ b/arch/mips/mips-boards/generic/Makefile @@ -32,15 +32,10 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: mipsboards.o - O_TARGET := mipsboards.o -O_OBJS := mipsIRQ.o pci.o reset.o display.o init.o memory.o printf.o \ - cmdline.o time.o - -ifdef CONFIG_REMOTE_DEBUG -O_OBJS += gdb_hook.o -endif +obj-y := mipsIRQ.o pci.o reset.o display.o init.o \ + memory.o printf.o cmdline.o time.o +obj-$(CONFIG_REMOTE_DEBUG) += gdb_hook.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile index a5c7fdb13..e71c8e8ed 100644 --- a/arch/mips/mips-boards/malta/Makefile +++ b/arch/mips/mips-boards/malta/Makefile @@ -33,10 +33,8 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: malta.o - O_TARGET := malta.o -O_OBJS := malta_int.o malta_rtc.o malta_setup.o +obj-y := malta_int.o malta_rtc.o malta_setup.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile index 67a987693..94dba1fde 100644 --- a/arch/mips/mm/Makefile +++ b/arch/mips/mm/Makefile @@ -22,6 +22,4 @@ obj-$(CONFIG_CPU_MIPS32) += mips32.o obj-$(CONFIG_SGI_IP22) += umap.o obj-$(CONFIG_BAGET_MIPS) += umap.o -O_OBJS := $(filter-out $(export-objs), $(obj-y)) - include $(TOPDIR)/Rules.make diff --git a/arch/mips/pmc/cp7000/Makefile b/arch/mips/pmc/cp7000/Makefile index ab6153f90..a7ad746d5 100644 --- a/arch/mips/pmc/cp7000/Makefile +++ b/arch/mips/pmc/cp7000/Makefile @@ -12,7 +12,8 @@ $(CC) $(CFLAGS) -c $< -o $*.o O_TARGET := cp7000.o -O_OBJS := i2o.o int-handler.o irq.o irq-handler.o pci.o promcon.o reset.o \ + +obj-y := i2o.o int-handler.o irq.o irq-handler.o pci.o promcon.o reset.o \ serialGT.o setup.o include $(TOPDIR)/Rules.make diff --git a/arch/mips/sgi/kernel/Makefile b/arch/mips/sgi/kernel/Makefile index 62fd01001..dd16c6c18 100644 --- a/arch/mips/sgi/kernel/Makefile +++ b/arch/mips/sgi/kernel/Makefile @@ -22,6 +22,4 @@ obj-y += indy_mc.o indy_sc.o indy_hpc.o indy_int.o indy_rtc.o system.o \ indyIRQ.o: indyIRQ.S -O_OBJS := $(obj-y) - include $(TOPDIR)/Rules.make diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile index 50c04359a..000b7356d 100644 --- a/arch/mips/sni/Makefile +++ b/arch/mips/sni/Makefile @@ -11,12 +11,10 @@ .S.o: $(CC) $(CFLAGS) -c $< -o $*.o -all: sni.o O_TARGET := sni.o -O_OBJS := int-handler.o io.o irq.o pci.o pcimt_scache.o reset.o setup.o -int-handler.o: int-handler.S +obj-y := int-handler.o io.o irq.o pci.o pcimt_scache.o reset.o setup.o -clean: +int-handler.o: int-handler.S include $(TOPDIR)/Rules.make |