[PATCH] powerpc: use always-y instead of extra-y in Makefiles

[Christophe Leroy]

Le 02/06/2025 à 18:32, Masahiro Yamada a écrit :
> The extra-y syntax is planned for deprecation because it is similar
> to always-y.
> 
> When building the boot wrapper, always-y and extra-y are equivalent.
> Use always-y instead.
> 
> In arch/powerpc/kernel/Makefile, I added ifdef KBUILD_BUILTIN to
> keep the current behavior: prom_init_check is skipped when building
> only modular objects.

I don't understand what you mean.

CONFIG_PPC_OF_BOOT_TRAMPOLINE is a bool, it cannot be a module.

prom_init_check is only to check the content of prom_init.o which is 
never a module.

Is always-y to run _after_ prom_init.o is built ?

Christophe

> 
> Signed-off-by: Masahiro Yamada <masahiroy at kernel.org>
> ---
> 
>   arch/powerpc/boot/Makefile   | 6 +++---
>   arch/powerpc/kernel/Makefile | 4 +++-
>   2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
> index 184d0680e661..b003f7ac8755 100644
> --- a/arch/powerpc/boot/Makefile
> +++ b/arch/powerpc/boot/Makefile
> @@ -242,13 +242,13 @@ $(obj)/wrapper.a: $(obj-wlib) FORCE
>   hostprogs	:= addnote hack-coff mktree
>   
>   targets		+= $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a) zImage.lds
> -extra-y		:= $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
> +always-y	:= $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
>   		   $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds
>   
>   dtstree		:= $(src)/dts
>   
>   wrapper		:= $(src)/wrapper
> -wrapperbits	:= $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \
> +wrapperbits	:= $(always-y) $(addprefix $(obj)/,addnote hack-coff mktree) \
>   			$(wrapper) FORCE
>   
>   #############
> @@ -455,7 +455,7 @@ WRAPPER_DTSDIR := /usr/lib/kernel-wrapper/dts
>   WRAPPER_BINDIR := /usr/sbin
>   INSTALL := install
>   
> -extra-installed		:= $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y))
> +extra-installed		:= $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(always-y))
>   hostprogs-installed	:= $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs))
>   wrapper-installed	:= $(DESTDIR)$(WRAPPER_BINDIR)/wrapper
>   dts-installed		:= $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(dtstree)/*.dts))
> diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
> index 4d2daa8e7bca..ac01cedad107 100644
> --- a/arch/powerpc/kernel/Makefile
> +++ b/arch/powerpc/kernel/Makefile
> @@ -201,7 +201,9 @@ obj-$(CONFIG_ALTIVEC)		+= vector.o
>   
>   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
> +ifdef KBUILD_BUILTIN
> +always-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check
> +endif
>   
>   obj-$(CONFIG_PPC64)		+= $(obj64-y)
>   obj-$(CONFIG_PPC32)		+= $(obj32-y)