Le 25/03/2023 à 14:06, Nicholas Piggin a écrit :
> This file contains only the enter_prom implementation now.
> Trim includes and update header comment while we're here.
>
> Signed-off-by: Nicholas Piggin <npig...@gmail.com>
> ---
> arch/powerpc/kernel/Makefile | 8 +++--
> .../kernel/{entry_64.S => prom_entry.S} | 30 ++-----------------
> scripts/head-object-list.txt | 2 +-
> 3 files changed, 9 insertions(+), 31 deletions(-)
> rename arch/powerpc/kernel/{entry_64.S => prom_entry.S} (73%)
>
> diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
> index ec70a1748506..ebba0896998a 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
You don't need that ifdef construct, you can do:
obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry.o
> +obj-y += prom_init.o
> +obj-$(CONFIG_PPC64) += prom_entry.o
> +extra-y += prom_init_check
> +endif
>
> quiet_cmd_prom_init_check = PROMCHK $@
> cmd_prom_init_check = $(CONFIG_SHELL) $< "$(NM)" $(obj)/prom_init.o;
> touch $@
Christophe
