[PATCH v2 29/39] efi_loader: Shorten the app rules further

[Ilias Apalodimas]

On Tue, 6 Aug 2024 at 15:59, Simon Glass <sjg at chromium.org> wrote:
>
> Add a way to factor out the CFLAGS changes for each app, since they are
> all the same.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> (no changes since v1)
>
>  lib/efi_loader/Makefile | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
> index 660368b9d8f..00d18966f9e 100644
> --- a/lib/efi_loader/Makefile
> +++ b/lib/efi_loader/Makefile
> @@ -11,16 +11,6 @@ asflags-y += -I.
>  CFLAGS_efi_boottime.o += \
>    -DFW_VERSION="0x$(VERSION)" \
>    -DFW_PATCHLEVEL="0x$(PATCHLEVEL)"
> -CFLAGS_boothart.o := $(CFLAGS_EFI) -Os -ffreestanding
> -CFLAGS_REMOVE_boothart.o := $(CFLAGS_NON_EFI)
> -CFLAGS_helloworld.o := $(CFLAGS_EFI) -Os -ffreestanding
> -CFLAGS_REMOVE_helloworld.o := $(CFLAGS_NON_EFI)
> -CFLAGS_smbiosdump.o := $(CFLAGS_EFI) -Os -ffreestanding
> -CFLAGS_REMOVE_smbiosdump.o := $(CFLAGS_NON_EFI)
> -CFLAGS_dtbdump.o := $(CFLAGS_EFI) -Os -ffreestanding
> -CFLAGS_REMOVE_dtbdump.o := $(CFLAGS_NON_EFI)
> -CFLAGS_initrddump.o := $(CFLAGS_EFI) -Os -ffreestanding
> -CFLAGS_REMOVE_initrddump.o := $(CFLAGS_NON_EFI)
>
>  # These are the apps that are built
>  apps-$(CONFIG_RISCV) += boothart
> @@ -80,5 +70,10 @@ obj-$(CONFIG_EFI_ECPT) += efi_conformance.o
>  EFI_VAR_SEED_FILE := $(subst $\",,$(CONFIG_EFI_VAR_SEED_FILE))
>  $(obj)/efi_var_seed.o: $(srctree)/$(EFI_VAR_SEED_FILE)
>
> +# Set the C flags to add and remove for each app
> +$(foreach f,$(apps-y),\
> +       $(eval CFLAGS_$(f).o := $(CFLAGS_EFI) -Os -ffreestanding)\
> +       $(eval CFLAGS_REMOVE_$(f).o := $(CFLAGS_NON_EFI)))
> +
>  always += $(foreach f,$(apps-y),$(f).efi)
>  targets += $(foreach f,$(apps-y),$(f).o)
> --
> 2.34.1
>

Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>