Le 15/05/2023 à 15:17, Nicholas Piggin a écrit :

On Mon May 15, 2023 at 2:45 PM AEST, Nicholas Piggin wrote:

quoted

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