From: Brandon Maier via buildroot <buildroot@buildroot.org>
To: buildroot@buildroot.org
Cc: Luca Ceresoli <luca.ceresoli@bootlin.com>,
Brandon Maier <brandon.maier@collins.com>,
Neal Frager <neal.frager@amd.com>
Subject: [Buildroot] [PATCH 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw
Date: Mon, 21 Nov 2022 14:16:38 -0600 [thread overview]
Message-ID: <20221121201638.30951-1-brandon.maier@collins.com> (raw)
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@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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2022-11-21 20:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 20:16 Brandon Maier via buildroot [this message]
2022-11-21 22:13 ` [Buildroot] [PATCH 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw Luca Ceresoli via buildroot
2022-11-22 5:55 ` Frager, Neal via buildroot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221121201638.30951-1-brandon.maier@collins.com \
--to=buildroot@buildroot.org \
--cc=brandon.maier@collins.com \
--cc=luca.ceresoli@bootlin.com \
--cc=neal.frager@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.