Reduce duplication by adding a common macro to get the four lines of boilerplate down to a single line. No functional change. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- images/Makefile.stm32mp | 49 +++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/images/Makefile.stm32mp b/images/Makefile.stm32mp index 17f03908b0d0..558f8c585984 100644 --- a/images/Makefile.stm32mp +++ b/images/Makefile.stm32mp @@ -9,35 +9,26 @@ $(obj)/%.stm32: $(obj)/% FORCE $(call if_changed,stm32_image) -STM32MP1_OPTS = -a 0xc0100000 -e 0xc0100000 -v1 +define build_stm32mp_image = +$(eval +ifeq ($($(strip $(1))), y) + pblb-y += $(strip $(2)) + FILE_barebox-$(strip $(3)).img = $(strip $(2)).pblb.stm32 + OPTS_$(strip $(2)).pblb.stm32 = -a 0xc0100000 -e 0xc0100000 -v1 + image-y += barebox-$(strip $(3)).img +endif +) +endef # -------------------------------------- -pblb-$(CONFIG_MACH_STM32MP15XX_DKX) += start_stm32mp15xx_dkx -FILE_barebox-stm32mp15xx-dkx.img = start_stm32mp15xx_dkx.pblb.stm32 -OPTS_start_stm32mp15xx_dkx.pblb.stm32 = $(STM32MP1_OPTS) -image-$(CONFIG_MACH_STM32MP15XX_DKX) += barebox-stm32mp15xx-dkx.img - -pblb-$(CONFIG_MACH_LXA_MC1) += start_stm32mp157c_lxa_mc1 -FILE_barebox-stm32mp157c-lxa-mc1.img = start_stm32mp157c_lxa_mc1.pblb.stm32 -OPTS_start_stm32mp157c_lxa_mc1.pblb.stm32 = $(STM32MP1_OPTS) -image-$(CONFIG_MACH_LXA_MC1) += barebox-stm32mp157c-lxa-mc1.img - -pblb-$(CONFIG_MACH_PROTONIC_STM32MP1) += start_prtt1a start_prtt1s start_prtt1c -FILE_barebox-prtt1a.img = start_prtt1a.pblb.stm32 -FILE_barebox-prtt1c.img = start_prtt1c.pblb.stm32 -FILE_barebox-prtt1s.img = start_prtt1s.pblb.stm32 -OPTS_start_prtt1a.pblb.stm32 = $(STM32MP1_OPTS) -OPTS_start_prtt1c.pblb.stm32 = $(STM32MP1_OPTS) -OPTS_start_prtt1s.pblb.stm32 = $(STM32MP1_OPTS) -image-$(CONFIG_MACH_PROTONIC_STM32MP1) += barebox-prtt1a.img barebox-prtt1s.img barebox-prtt1c.img - -pblb-$(CONFIG_MACH_SEEED_ODYSSEY) += start_stm32mp157c_seeed_odyssey -FILE_barebox-stm32mp157c-seeed-odyssey.img = start_stm32mp157c_seeed_odyssey.pblb.stm32 -OPTS_start_stm32mp157c_seeed_odyssey.pblb.stm32 = $(STM32MP1_OPTS) -image-$(CONFIG_MACH_SEEED_ODYSSEY) += barebox-stm32mp157c-seeed-odyssey.img - -pblb-$(CONFIG_MACH_STM32MP15X_EV1) += start_stm32mp15x_ev1 -FILE_barebox-stm32mp15x-ev1.img = start_stm32mp15x_ev1.pblb.stm32 -OPTS_start_stm32mp15x_ev1.pblb.stm32 = $(STM32MP1_OPTS) -image-$(CONFIG_MACH_STM32MP15X_EV1) += barebox-stm32mp15x-ev1.img +$(call build_stm32mp_image, CONFIG_MACH_STM32MP15XX_DKX, start_stm32mp15xx_dkx, stm32mp15xx-dkx) +$(call build_stm32mp_image, CONFIG_MACH_STM32MP15X_EV1, start_stm32mp15x_ev1, stm32mp15x-ev1) + +$(call build_stm32mp_image, CONFIG_MACH_LXA_MC1, start_stm32mp157c_lxa_mc1, stm32mp157c-lxa-mc1) + +$(call build_stm32mp_image, CONFIG_MACH_PROTONIC_STM32MP1, start_prtt1a, prtt1a) +$(call build_stm32mp_image, CONFIG_MACH_PROTONIC_STM32MP1, start_prtt1s, prtt1s) +$(call build_stm32mp_image, CONFIG_MACH_PROTONIC_STM32MP1, start_prtt1c, prtt1c) + +$(call build_stm32mp_image, CONFIG_MACH_SEEED_ODYSSEY, start_stm32mp157c_seeed_odyssey, stm32mp157c-seeed-odyssey) -- 2.30.2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
