[Buildroot] [PATCH 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw

Brandon Maier brandon.maier at collins.com
Mon Nov 21 20:16:38 UTC 2022


Commit d07e6b70 (boot/uboot/uboot.mk: add pmufw.elf support) broke
configurations where the UBOOT_ZYNQMP_PMUFW was blank. Previously it
would set the U-Boot CONFIG_PMUFW_INIT_FILE to the blank string, but now
it will set it to ".bin" which causes U-Boot to fail to build.

To fix, disable all the pmufw code if the UBOOT_ZYNQMP_PMUFW is blank.

Signed-off-by: Brandon Maier <brandon.maier at collins.com>
---
 boot/uboot/uboot.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 0439ec5e4b..b86248e1f7 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -383,6 +383,7 @@ endef
 ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y)
 
 UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW))
+ifneq ($(UBOOT_ZYNQMP_PMUFW),)
 
 ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),)
 UBOOT_EXTRA_DOWNLOADS += $(UBOOT_ZYNQMP_PMUFW)
@@ -398,6 +399,7 @@ define UBOOT_ZYNQMP_KCONFIG_PMUFW
 		objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin)
 	$(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin")
 endef
+endif # UBOOT_ZYNQMP_PMUFW
 
 UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG))
 ifneq ($(UBOOT_ZYNQMP_PM_CFG),)
-- 
2.38.1




More information about the buildroot mailing list