Merge branch 'linux-2.6'

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

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 0db66dcf072378a4deacf0ea9d8d9f4cf5884d20..95894ef7beaaded9dfc993904e275a1a9f874e41 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -22,22 +22,22 @@ endif
 
 LDFLAGS_vmlinux        := -Ttext $(KERNELLOAD) -Bstatic
 # The -Iarch/$(ARCH)/include is temporary while we are merging
-CPPFLAGS       += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
-AFLAGS         += -Iarch/$(ARCH)
-CFLAGS         += -Iarch/$(ARCH) -msoft-float -pipe \
+KBUILD_CPPFLAGS        += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
+KBUILD_AFLAGS  += -Iarch/$(ARCH)
+KBUILD_CFLAGS  += -Iarch/$(ARCH) -msoft-float -pipe \
                -ffixed-r2 -mmultiple
 
 # No AltiVec instruction when building kernel
-CFLAGS         += $(call cc-option, -mno-altivec)
+KBUILD_CFLAGS  += $(call cc-option, -mno-altivec)
 
-CPP            = $(CC) -E $(CFLAGS)
+CPP            = $(CC) -E $(KBUILD_CFLAGS)
 # Temporary hack until we have migrated to asm-powerpc
 LINUXINCLUDE    += -Iarch/$(ARCH)/include
 
 CHECKFLAGS     += -D__powerpc__
 
 ifndef CONFIG_FSL_BOOKE
-CFLAGS         += -mstring
+KBUILD_CFLAGS  += -mstring
 endif
 
 cpu-as-$(CONFIG_4xx)           += -Wa,-m405
@@ -45,8 +45,8 @@ cpu-as-$(CONFIG_6xx)          += -Wa,-maltivec
 cpu-as-$(CONFIG_E500)          += -Wa,-me500
 cpu-as-$(CONFIG_E200)          += -Wa,-me200
 
-AFLAGS += $(cpu-as-y)
-CFLAGS += $(cpu-as-y)
+KBUILD_AFLAGS += $(cpu-as-y)
+KBUILD_CFLAGS += $(cpu-as-y)
 
 # Default to the common case.
 KBUILD_DEFCONFIG := common_defconfig
@@ -69,7 +69,6 @@ core-$(CONFIG_83xx)           += arch/ppc/platforms/83xx/
 core-$(CONFIG_85xx)            += arch/ppc/platforms/85xx/
 core-$(CONFIG_MATH_EMULATION)  += arch/powerpc/math-emu/
 core-$(CONFIG_XMON)            += arch/ppc/xmon/
-core-$(CONFIG_APUS)            += arch/ppc/amiga/
 drivers-$(CONFIG_8xx)          += arch/ppc/8xx_io/
 drivers-$(CONFIG_4xx)          += arch/ppc/4xx_io/
 drivers-$(CONFIG_CPM2)         += arch/ppc/8260_io/