aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-18 16:39:08 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-18 16:39:08 +1100
commit8a5abdf80ecf3ad3fa052878778c7185c5911a53 (patch)
tree4e2cf3b1fc96e614b5e3e33fe5a44ef756f78741 /arch/powerpc/Makefile
parentpowerpc: Fix a couple of compile warnings for 32-bit compiles (diff)
downloadlinux-dev-8a5abdf80ecf3ad3fa052878778c7185c5911a53.tar.xz
linux-dev-8a5abdf80ecf3ad3fa052878778c7185c5911a53.zip
powerpc: Move defconfig over and remove remaining arch/ppc64 files
make defconfig will now use arch/powerpc/configs/ppc64_defconfig if running on a ppc64 system. I need to add an arch/powerpc/configs/ppc_defconfig sometime. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/Makefile')
-rw-r--r--arch/powerpc/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 987036b60c88..98f67c78d1bd 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -33,6 +33,8 @@ endif
export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY
+KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
+
ifeq ($(CONFIG_PPC64),y)
OLDARCH := ppc64
SZ := 64
@@ -111,9 +113,6 @@ cpu-as-$(CONFIG_E200) += -Wa,-me200
AFLAGS += $(cpu-as-y)
CFLAGS += $(cpu-as-y)
-# Default to the common case.
-KBUILD_DEFCONFIG := common_defconfig
-
head-y := arch/powerpc/kernel/head_32.o
head-$(CONFIG_PPC64) := arch/powerpc/kernel/head_64.o
head-$(CONFIG_8xx) := arch/powerpc/kernel/head_8xx.o