diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-18 00:39:08 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-18 00:39:08 -0500 |
commit | 8a5abdf80ecf3ad3fa052878778c7185c5911a53 (patch) | |
tree | 4e2cf3b1fc96e614b5e3e33fe5a44ef756f78741 /arch/powerpc/Makefile | |
parent | 44aedfe7dedb1ba9f4f9d17f55dec5727f5ff82f (diff) |
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/Makefile | 5 |
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 | |||
33 | 33 | ||
34 | export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY | 34 | export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY |
35 | 35 | ||
36 | KBUILD_DEFCONFIG := $(shell uname -m)_defconfig | ||
37 | |||
36 | ifeq ($(CONFIG_PPC64),y) | 38 | ifeq ($(CONFIG_PPC64),y) |
37 | OLDARCH := ppc64 | 39 | OLDARCH := ppc64 |
38 | SZ := 64 | 40 | SZ := 64 |
@@ -111,9 +113,6 @@ cpu-as-$(CONFIG_E200) += -Wa,-me200 | |||
111 | AFLAGS += $(cpu-as-y) | 113 | AFLAGS += $(cpu-as-y) |
112 | CFLAGS += $(cpu-as-y) | 114 | CFLAGS += $(cpu-as-y) |
113 | 115 | ||
114 | # Default to the common case. | ||
115 | KBUILD_DEFCONFIG := common_defconfig | ||
116 | |||
117 | head-y := arch/powerpc/kernel/head_32.o | 116 | head-y := arch/powerpc/kernel/head_32.o |
118 | head-$(CONFIG_PPC64) := arch/powerpc/kernel/head_64.o | 117 | head-$(CONFIG_PPC64) := arch/powerpc/kernel/head_64.o |
119 | head-$(CONFIG_8xx) := arch/powerpc/kernel/head_8xx.o | 118 | head-$(CONFIG_8xx) := arch/powerpc/kernel/head_8xx.o |