From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Nicholas Piggin <npiggin@gmail.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH v2 6/6] powerpc/64: Rename entry_64.S to prom_entry_64.S
Date: Mon, 15 May 2023 14:19:02 +0000 [thread overview]
Message-ID: <08db0f60-d3ce-d49f-98d0-9d0a6c672ae6@csgroup.eu> (raw)
In-Reply-To: <CSMVPKLWONBY.2X37RTHC6OCNB@wheely>
Le 15/05/2023 à 15:17, Nicholas Piggin a écrit :
> On Mon May 15, 2023 at 2:45 PM AEST, Nicholas Piggin wrote:
>> This file contains only the enter_prom implementation now.
>> Trim includes and update header comment while we're here.
>>
>> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
>> ---
>> arch/powerpc/kernel/Makefile | 8 +++--
>> .../kernel/{entry_64.S => prom_entry_64.S} | 30 ++-----------------
>> scripts/head-object-list.txt | 2 +-
>> 3 files changed, 9 insertions(+), 31 deletions(-)
>> rename arch/powerpc/kernel/{entry_64.S => prom_entry_64.S} (73%)
>>
>> diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
>> index ec70a1748506..f94c893e014d 100644
>> --- a/arch/powerpc/kernel/Makefile
>> +++ b/arch/powerpc/kernel/Makefile
>> @@ -209,10 +209,12 @@ CFLAGS_paca.o += -fno-stack-protector
>>
>> obj-$(CONFIG_PPC_FPU) += fpu.o
>> obj-$(CONFIG_ALTIVEC) += vector.o
>> -obj-$(CONFIG_PPC64) += entry_64.o
>> -obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o
>>
>> -extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check
>> +ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE
>> +obj-y += prom_init.o
>> +obj64-y += prom_entry_64.o
>> +extra-y += prom_init_check
>> +endif
>
> Oops that doesn't work, obj64-y is merged into obj-y before this. Need
> to move that merge down below here.
>
> Thanks,
> Nick
And instead of the ifdef/endif, you can:
obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o
obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry_64.o
extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check
prev parent reply other threads:[~2023-05-15 14:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 4:45 [PATCH v2 0/6] powerpc: merge _switch in 32/64 Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 1/6] powerpc/64s: move stack SLB pinning out of line from _switch Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 2/6] powerpc/64: Rearrange 64-bit _switch to prepare for 32/64 merge Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 3/6] powerpc/32: Remove sync from _switch Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 4/6] powerpc/32: Rearrange _switch to prepare for 32/64 merge Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 5/6] powerpc: merge 32-bit and 64-bit _switch implementation Nicholas Piggin
2023-05-15 4:45 ` [PATCH v2 6/6] powerpc/64: Rename entry_64.S to prom_entry_64.S Nicholas Piggin
2023-05-15 13:17 ` Nicholas Piggin
2023-05-15 14:19 ` Christophe Leroy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=08db0f60-d3ce-d49f-98d0-9d0a6c672ae6@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).