[MIPS] Make two functions static

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

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index dd668f3a8394641b7da69390ed821758c5df076a..ad36c946ff96b355555f71319d9c8a3923b586bc 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -12,6 +12,8 @@
 # for "archclean" cleaning up for this architecture.
 #
 
+KBUILD_DEFCONFIG := ip22_defconfig
+
 cflags-y :=
 
 #
@@ -156,6 +158,8 @@ endif
 #
 libs-$(CONFIG_ARC)             += arch/mips/fw/arc/
 libs-$(CONFIG_CFE)             += arch/mips/fw/cfe/
+libs-$(CONFIG_SNIPROM)         += arch/mips/fw/sni/
+libs-y                         += arch/mips/fw/lib/
 libs-$(CONFIG_SIBYTE_CFE)      += arch/mips/sibyte/cfe/
 
 #
@@ -312,7 +316,7 @@ core-$(CONFIG_MIPS_ATLAS)   += arch/mips/mips-boards/atlas/
 cflags-$(CONFIG_MIPS_ATLAS)    += -Iinclude/asm-mips/mach-atlas
 cflags-$(CONFIG_MIPS_ATLAS)    += -Iinclude/asm-mips/mach-mips
 load-$(CONFIG_MIPS_ATLAS)      += 0xffffffff80100000
-all-$(CONFIG_MIPS_ATLAS)       := vmlinux.srec
+all-$(CONFIG_MIPS_ATLAS)       := vmlinux.bin
 
 #
 # MIPS Malta board
@@ -320,7 +324,7 @@ all-$(CONFIG_MIPS_ATLAS)    := vmlinux.srec
 core-$(CONFIG_MIPS_MALTA)      += arch/mips/mips-boards/malta/
 cflags-$(CONFIG_MIPS_MALTA)    += -Iinclude/asm-mips/mach-mips
 load-$(CONFIG_MIPS_MALTA)      += 0xffffffff80100000
-all-$(CONFIG_MIPS_MALTA)       := vmlinux.srec
+all-$(CONFIG_MIPS_MALTA)       := vmlinux.bin
 
 #
 # MIPS SEAD board
@@ -352,14 +356,6 @@ core-$(CONFIG_PMC_YOSEMITE)        += arch/mips/pmc-sierra/yosemite/
 cflags-$(CONFIG_PMC_YOSEMITE)  += -Iinclude/asm-mips/mach-yosemite
 load-$(CONFIG_PMC_YOSEMITE)    += 0xffffffff80100000
 
-#
-# Qemu simulating MIPS32 4Kc
-#
-core-$(CONFIG_QEMU)            += arch/mips/qemu/
-cflags-$(CONFIG_QEMU)          += -Iinclude/asm-mips/mach-qemu
-load-$(CONFIG_QEMU)            += 0xffffffff80010000
-all-$(CONFIG_QEMU)             := vmlinux.bin
-
 #
 # Basler eXcite
 #
@@ -414,21 +410,21 @@ load-$(CONFIG_CASIO_E55)  += 0xffffffff80004000
 load-$(CONFIG_TANBAC_TB022X)   += 0xffffffff80000000
 
 #
-# Common Philips PNX8550
+# Common NXP PNX8550
 #
-core-$(CONFIG_SOC_PNX8550)     += arch/mips/philips/pnx8550/common/
+core-$(CONFIG_SOC_PNX8550)     += arch/mips/nxp/pnx8550/common/
 cflags-$(CONFIG_SOC_PNX8550)   += -Iinclude/asm-mips/mach-pnx8550
 
 #
-# Philips PNX8550 JBS board
+# NXP PNX8550 JBS board
 #
-libs-$(CONFIG_PNX8550_JBS)     += arch/mips/philips/pnx8550/jbs/
+libs-$(CONFIG_PNX8550_JBS)     += arch/mips/nxp/pnx8550/jbs/
 #cflags-$(CONFIG_PNX8550_JBS)  += -Iinclude/asm-mips/mach-pnx8550
 load-$(CONFIG_PNX8550_JBS)     += 0xffffffff80060000
 
-# Philips PNX8550 STB810 board
+# NXP PNX8550 STB810 board
 #
-libs-$(CONFIG_PNX8550_STB810)  += arch/mips/philips/pnx8550/stb810/
+libs-$(CONFIG_PNX8550_STB810)  += arch/mips/nxp/pnx8550/stb810/
 load-$(CONFIG_PNX8550_STB810)  += 0xffffffff80060000
 
 # NEC EMMA2RH boards
@@ -486,10 +482,13 @@ endif
 # be 16kb aligned or the handling of the current variable will break.
 # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
 #
-#core-$(CONFIG_SGI_IP28)               += arch/mips/sgi-ip22/ arch/mips/arc/arc_con.o
+ifdef CONFIG_SGI_IP28
+  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=1), n)
+      $(error gcc doesn't support needed option -mr10k-cache-barrier=1)
+  endif
+endif
 core-$(CONFIG_SGI_IP28)                += arch/mips/sgi-ip22/
 cflags-$(CONFIG_SGI_IP28)      += -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28
-#cflags-$(CONFIG_SGI_IP28)     += -Iinclude/asm-mips/mach-ip28
 load-$(CONFIG_SGI_IP28)                += 0xa800000020004000
 
 #
@@ -539,19 +538,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80)   += -Iinclude/asm-mips/mach-sibyte \
 # Sibyte SWARM board
 # Sibyte BCM91x80 (BigSur) board
 #
-libs-$(CONFIG_SIBYTE_CARMEL)   += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_CARMEL)   += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_CARMEL)   := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_CRHINE)   += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_CRHINE)   += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_CRHINE)   := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_CRHONE)   += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_CRHONE)   += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_CRHONE)   := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_RHONE)    += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_RHONE)    += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_RHONE)    := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_SENTOSA)  += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_SENTOSA)  += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_SENTOSA)  := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_SWARM)    += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_SWARM)    += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_SWARM)    := 0xffffffff80100000
-libs-$(CONFIG_SIBYTE_BIGSUR)   += arch/mips/sibyte/swarm/
+core-$(CONFIG_SIBYTE_BIGSUR)   += arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_BIGSUR)   := 0xffffffff80100000
 
 #
@@ -566,7 +565,11 @@ load-$(CONFIG_BCM47XX)             := 0xffffffff80001000
 #
 core-$(CONFIG_SNI_RM)          += arch/mips/sni/
 cflags-$(CONFIG_SNI_RM)                += -Iinclude/asm-mips/mach-rm
+ifdef CONFIG_CPU_LITTLE_ENDIAN
 load-$(CONFIG_SNI_RM)          += 0xffffffff80600000
+else
+load-$(CONFIG_SNI_RM)          += 0xffffffff80030000
+endif
 all-$(CONFIG_SNI_RM)           := vmlinux.ecoff
 
 #