Re: [PATCH 2/3] s390/purgatory: hard-code obj-y in Makefile
From: Masahiro Yamada
Date: Thu Jun 23 2022 - 06:09:36 EST
On Wed, Jun 22, 2022 at 10:48 PM Alexander Gordeev
<agordeev@xxxxxxxxxxxxx> wrote:
>
> On Tue, Jun 14, 2022 at 02:09:01AM +0900, Masahiro Yamada wrote:
> > The purgatory/ directory is entirely guarded in arch/s390/Kbuild.
> > CONFIG_ARCH_HAS_KEXEC_PURGATORY is bool type.
> >
> > $(CONFIG_ARCH_HAS_KEXEC_PURGATORY) is always 'y' when Kbuild visits
> > this Makefile for building.
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> > ---
> >
> > arch/s390/purgatory/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
> > index 360ada80d20c..3e2c17ba04de 100644
> > --- a/arch/s390/purgatory/Makefile
> > +++ b/arch/s390/purgatory/Makefile
> > @@ -51,4 +51,4 @@ $(obj)/purgatory.ro: $(obj)/purgatory $(obj)/purgatory.chk FORCE
> > $(obj)/kexec-purgatory.o: $(obj)/kexec-purgatory.S $(obj)/purgatory.ro FORCE
> > $(call if_changed_rule,as_o_S)
> >
> > -obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += kexec-purgatory.o
> > +obj-y += kexec-purgatory.o
>
> Applied, thanks!
>
> BTW, it looks like x86 and riscv also need similar change.
A patch for x86 exists:
https://lore.kernel.org/all/20220616072407.2317131-1-masahiroy@xxxxxxxxxx/
I will send riscv patches later.
> In addition, x86 use of CONFIG_ARCH_HAS_KEXEC_PURGATORY vs CONFIG_KEXEC_FILE
> is not consistent with other architectures (may be even incorrect?).
I thought of this when I reworked Makefiles,
but did not touch this part.
>
> > --
> > 2.32.0
> >
--
Best Regards
Masahiro Yamada