vserver 1.9.3

[linux-2.6.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 51b0add..5025c01 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -56,14 +56,12 @@ endif
 #
 cflags-y                       := -I $(TOPDIR)/include/asm/gcc
 cflags-y                       += -G 0 -mno-abicalls -fno-pic -pipe
-cflags-y                       += $(call check_gcc, -finline-limit=100000,)
+cflags-y                       += $(call cc-option, -finline-limit=100000)
 LDFLAGS_vmlinux                        += -G 0 -static -n
 MODFLAGS                       += -mlong-calls
 
 cflags-$(CONFIG_SB1XXX_CORELIS)        += -mno-sched-prolog -fno-omit-frame-pointer
 
-check_warning = $(shell if $(CC) $(1) -c -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
-
 #
 # Use: $(call set_gccflags,<cpu0>,<isa0>,<cpu1>,<isa1>,<isa2>)
 #
@@ -162,7 +160,7 @@ cflags-$(CONFIG_CPU_R5432)  += \
 cflags-$(CONFIG_CPU_NEVADA)    += \
                        $(call set_gccflags,rm5200,mips4,r5000,mips4,mips2) \
                        -Wa,--trap
-#                      $(call check_gcc,-mmad,)
+#                      $(call cc-option,-mmad)
 
 cflags-$(CONFIG_CPU_RM7000)    += \
                        $(call set_gccflags,rm7000,mips4,r5000,mips4,mips2) \
@@ -405,6 +403,13 @@ load-$(CONFIG_MOMENCO_OCELOT_G)    += 0x80100000
 core-$(CONFIG_MOMENCO_OCELOT_C)        += arch/mips/momentum/ocelot_c/
 load-$(CONFIG_MOMENCO_OCELOT_C)        += 0x80100000
 
+#
+# PMC-Sierra Yosemite
+#
+core-$(CONFIG_PMC_YOSEMITE)    += arch/mips/pmc-sierra/yosemite/
+cflags-$(CONFIG_PMC_YOSEMITE)  += -Iinclude/asm-mips/mach-yosemite
+load-$(CONFIG_PMC_YOSEMITE)    += 0x80100000
+
 #
 # Momentum Jaguar ATX
 #
@@ -456,12 +461,6 @@ load-$(CONFIG_NEC_OSPREY)  += 0x80002000
 core-$(CONFIG_MACH_VR41XX)     += arch/mips/vr41xx/common/
 cflags-$(CONFIG_MACH_VR41XX)   += -Iinclude/asm-mips/mach-vr41xx
 
-#
-# NEC Eagle/Hawk (VR4122/VR4131) board
-#
-core-$(CONFIG_NEC_EAGLE)       += arch/mips/vr41xx/nec-eagle/
-load-$(CONFIG_NEC_EAGLE)       += 0x80000000
-
 #
 # ZAO Networks Capcella (VR4131)
 #
@@ -642,7 +641,7 @@ endif
 # none has been choosen above.
 #
 
-AFLAGS_vmlinux.lds.o := \
+CPPFLAGS_vmlinux.lds := \
        -D"LOADADDR=$(load-y)" \
        -D"JIFFIES=$(JIFFIES)" \
        -imacros $(srctree)/include/asm-$(ARCH)/sn/mapped_kernel.h
@@ -659,8 +658,6 @@ libs-$(CONFIG_MIPS32)       += arch/mips/lib-32/
 libs-$(CONFIG_MIPS64)  += arch/mips/lib-64/
 
 core-y                 += arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
-core-$(CONFIG_MIPS32)  += arch/mips/mm-32/
-core-$(CONFIG_MIPS64)  += arch/mips/mm-64/
 
 ifdef CONFIG_BAGET_MIPS
 
@@ -686,7 +683,7 @@ vmlinux.64: vmlinux
                --change-addresses=0xa800000080000000 $< $@
 endif
 
-makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/mips/boot $(1)
+makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot $(1)
 
 ifdef CONFIG_SGI_IP27
 all:   vmlinux.64
@@ -708,9 +705,9 @@ CLEAN_FILES += vmlinux.ecoff \
               vmlinux.rm200
 
 archclean:
-       @$(MAKE) -f scripts/Makefile.clean obj=arch/mips/boot
-       @$(MAKE) -f scripts/Makefile.clean obj=arch/mips/baget
-       @$(MAKE) -f scripts/Makefile.clean obj=arch/mips/lasat
+       @$(MAKE) $(clean)=arch/mips/boot
+       @$(MAKE) $(clean)=arch/mips/baget
+       @$(MAKE) $(clean)=arch/mips/lasat
 
 # Generate <asm/offset.h 
 #