Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc6f8a4b authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: move lparmap.c to arch/powerpc/kernel 



Since lparmap.s gets included in arch/powerpc/kernel/head_64.S,
this avoids depending on a file in another directory.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 5a408329

arch/powerpc/kernel/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o 
obj-$(CONFIG_BOOTX_TEXT)	+= btext.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

$(obj)/head_64.o: $(obj)/lparmap.s

AFLAGS_head_64.o += -I$(obj)

endif

endif

arch/ppc64/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ CFLAGS_ioctl32.o += -Ifs/ 


ifneq ($(CONFIG_PPC_MERGE),y)

ifeq ($(CONFIG_PPC_ISERIES),y)

arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s

AFLAGS_head.o += -Iarch/powerpc/platforms/iseries

arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s

AFLAGS_head.o += -Iarch/powerpc/kernel

endif

endif