diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2020-10-06 09:05:26 +0000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-10-08 21:17:14 +1100 |
| commit | 533090e5a980ad80bbe0961b4ed45a9bcf55cc0c (patch) | |
| tree | 6479c2ada2af30d37c1b493d75a5884237656051 /arch/powerpc/Makefile | |
| parent | 69a1593abdbcf03a76367320d929a8ae7a5e3d71 (diff) | |
| download | linux-stable-533090e5a980ad80bbe0961b4ed45a9bcf55cc0c.tar.gz linux-stable-533090e5a980ad80bbe0961b4ed45a9bcf55cc0c.tar.bz2 linux-stable-533090e5a980ad80bbe0961b4ed45a9bcf55cc0c.zip | |
powerpc/32s: Rename head_32.S to head_book3s_32.S
Unlike PPC64 which had a single head_64.S, PPC32 are multiple ones.
There is the head_32.S, selected by default based on the value of BITS
and overridden based on some CONFIG_ values. This leads to thinking
that it may be selected by different types of PPC32 platform but
indeed it ends up being selected by book3s/32 only.
Make that explicit by:
- Not doing any default selection based on BITS.
- Renaming head_32.S to head_book3s_32.S.
- Get head_book3s_32.S selected only by CONFIG_PPC_BOOK3S_32.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Fix head_$(BITS).o reference in arch/powerpc/Makefile]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/319d379f696412681c66a987cc75e6abf8f958d2.1601975100.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/Makefile')
| -rw-r--r-- | arch/powerpc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 3e8da9cf2eb9..c4f9dbd12577 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -264,7 +264,8 @@ KBUILD_CFLAGS += $(cpu-as-y) KBUILD_AFLAGS += $(aflags-y) KBUILD_CFLAGS += $(cflags-y) -head-y := arch/powerpc/kernel/head_$(BITS).o +head-$(CONFIG_PPC64) := arch/powerpc/kernel/head_64.o +head-$(CONFIG_PPC_BOOK3S_32) := arch/powerpc/kernel/head_book3s_32.o head-$(CONFIG_PPC_8xx) := arch/powerpc/kernel/head_8xx.o head-$(CONFIG_40x) := arch/powerpc/kernel/head_40x.o head-$(CONFIG_44x) := arch/powerpc/kernel/head_44x.o |