diff options
| author | Stephen Rothwell | 2005-09-30 08:16:52 +0200 |
|---|---|---|
| committer | Stephen Rothwell | 2005-10-01 10:52:10 +0200 |
| commit | cabb558714945e92000f627dda562aa5e86a31af (patch) | |
| tree | 595cd75dad072224041260afb220d7fce3164e53 /arch/powerpc/kernel/Makefile | |
| parent | ppc64: simplify the build a little (diff) | |
| download | kernel-qcow2-linux-cabb558714945e92000f627dda562aa5e86a31af.tar.gz kernel-qcow2-linux-cabb558714945e92000f627dda562aa5e86a31af.tar.xz kernel-qcow2-linux-cabb558714945e92000f627dda562aa5e86a31af.zip | |
powerpc: make iSeries build
Merge vmlinux.lds.S.
Also remove arch/powerpc/kernel/vmlinux.lds which is a
generated file.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/kernel/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index b5eff3ef2f3d..be3f9d123a6d 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -6,8 +6,10 @@ ifeq ($(CONFIG_PPC64),y) EXTRA_CFLAGS += -mno-minimal-toc endif +ifeq ($(CONFIG_PPC32),y) extra-$(CONFIG_PPC_STD_MMU) := head.o -extra_$(CONFIG_PPC64) := head_64.o +endif +extra-$(CONFIG_PPC64) := head_64.o extra-$(CONFIG_40x) := head_4xx.o extra-$(CONFIG_44x) := head_44x.o extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o @@ -23,3 +25,8 @@ ifeq ($(CONFIG_PPC32),y) obj-$(CONFIG_MODULES) += ppc_ksyms.o endif obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o + +ifeq ($(CONFIG_PPC_ISERIES),y) +arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s +AFLAGS_head_64.o += -Iarch/powerpc/platforms/iseries +endif |