Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: use always-y instead of extra-y in Makefiles

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.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20250602163302.478765-1-masahiroy@kernel.org

authored by

Masahiro Yamada and committed by
Madhavan Srinivasan
eb59d4c5 8b5d86a6

+6 -4
+3 -3
arch/powerpc/boot/Makefile
··· 243 243 hostprogs := addnote hack-coff mktree 244 244 245 245 targets += $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a) zImage.lds 246 - extra-y := $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \ 246 + always-y := $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \ 247 247 $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds 248 248 249 249 dtstree := $(src)/dts 250 250 251 251 wrapper := $(src)/wrapper 252 - wrapperbits := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \ 252 + wrapperbits := $(always-y) $(addprefix $(obj)/,addnote hack-coff mktree) \ 253 253 $(wrapper) FORCE 254 254 255 255 ############# ··· 456 456 WRAPPER_BINDIR := /usr/sbin 457 457 INSTALL := install 458 458 459 - extra-installed := $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y)) 459 + extra-installed := $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(always-y)) 460 460 hostprogs-installed := $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs)) 461 461 wrapper-installed := $(DESTDIR)$(WRAPPER_BINDIR)/wrapper 462 462 dts-installed := $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(dtstree)/*.dts))
+3 -1
arch/powerpc/kernel/Makefile
··· 199 199 200 200 obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o 201 201 obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry_64.o 202 - extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check 202 + ifdef KBUILD_BUILTIN 203 + always-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check 204 + endif 203 205 204 206 obj-$(CONFIG_PPC64) += $(obj64-y) 205 207 obj-$(CONFIG_PPC32) += $(obj32-y)