linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 0db66dc..98e940b 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -40,8 +40,10 @@ ifndef CONFIG_FSL_BOOKE
 CFLAGS         += -mstring
 endif
 
+cpu-as-$(CONFIG_PPC64BRIDGE)   += -Wa,-mppc64bridge
 cpu-as-$(CONFIG_4xx)           += -Wa,-m405
 cpu-as-$(CONFIG_6xx)           += -Wa,-maltivec
+cpu-as-$(CONFIG_POWER4)                += -Wa,-maltivec
 cpu-as-$(CONFIG_E500)          += -Wa,-me500
 cpu-as-$(CONFIG_E200)          += -Wa,-me200
 
@@ -57,6 +59,8 @@ head-$(CONFIG_4xx)            := arch/ppc/kernel/head_4xx.o
 head-$(CONFIG_44x)             := arch/ppc/kernel/head_44x.o
 head-$(CONFIG_FSL_BOOKE)       := arch/ppc/kernel/head_fsl_booke.o
 
+head-$(CONFIG_6xx)             += arch/ppc/kernel/idle_6xx.o
+head-$(CONFIG_POWER4)          += arch/ppc/kernel/idle_power4.o
 head-$(CONFIG_PPC_FPU)         += arch/powerpc/kernel/fpu.o
 
 core-y                         += arch/ppc/kernel/ arch/powerpc/kernel/ \
@@ -67,7 +71,7 @@ core-y                                += arch/ppc/kernel/ arch/powerpc/kernel/ \
 core-$(CONFIG_4xx)             += arch/ppc/platforms/4xx/
 core-$(CONFIG_83xx)            += arch/ppc/platforms/83xx/
 core-$(CONFIG_85xx)            += arch/ppc/platforms/85xx/
-core-$(CONFIG_MATH_EMULATION)  += arch/powerpc/math-emu/
+core-$(CONFIG_MATH_EMULATION)  += arch/ppc/math-emu/
 core-$(CONFIG_XMON)            += arch/ppc/xmon/
 core-$(CONFIG_APUS)            += arch/ppc/amiga/
 drivers-$(CONFIG_8xx)          += arch/ppc/8xx_io/
@@ -78,7 +82,7 @@ drivers-$(CONFIG_OPROFILE)    += arch/powerpc/oprofile/
 
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
 
-PHONY += $(BOOT_TARGETS)
+.PHONY: $(BOOT_TARGETS)
 
 all: uImage zImage