* [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw
@ 2022-11-22 20:17 Brandon Maier via buildroot
2022-11-22 21:28 ` Luca Ceresoli via buildroot
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Brandon Maier via buildroot @ 2022-11-22 20:17 UTC (permalink / raw)
To: buildroot; +Cc: Luca Ceresoli, Brandon Maier, Neal Frager
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.
Signed-off-by: Brandon Maier <brandon.maier@collins.com>
---
v2:
- support pmufw with any extension
---
boot/uboot/uboot.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 19e4183927..d037ae9c12 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -394,8 +394,9 @@ UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH))
define UBOOT_ZYNQMP_KCONFIG_PMUFW
$(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)),
- 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")
+ 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"),
+ $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)"))
endef
UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG))
--
2.38.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw
2022-11-22 20:17 [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw Brandon Maier via buildroot
@ 2022-11-22 21:28 ` Luca Ceresoli via buildroot
2022-11-23 0:03 ` Frager, Neal via buildroot
2022-11-23 10:03 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Luca Ceresoli via buildroot @ 2022-11-22 21:28 UTC (permalink / raw)
To: Brandon Maier; +Cc: Neal Frager, buildroot
Hi Brandon,
On Tue, 22 Nov 2022 14:17:01 -0600
Brandon Maier <brandon.maier@collins.com> wrote:
> 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.
>
> Signed-off-by: Brandon Maier <brandon.maier@collins.com>
> ---
> v2:
> - support pmufw with any extension
> ---
> boot/uboot/uboot.mk | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 19e4183927..d037ae9c12 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -394,8 +394,9 @@ UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH))
>
> define UBOOT_ZYNQMP_KCONFIG_PMUFW
> $(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)),
> - 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")
> + 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"),
> + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)"))
> endef
Using the else branche of $(if) is different from what I had in
mind, but it is fine as well.
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Thanks!
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw
2022-11-22 20:17 [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw Brandon Maier via buildroot
2022-11-22 21:28 ` Luca Ceresoli via buildroot
@ 2022-11-23 0:03 ` Frager, Neal via buildroot
2022-11-23 10:03 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Frager, Neal via buildroot @ 2022-11-23 0:03 UTC (permalink / raw)
To: Brandon Maier, buildroot@buildroot.org; +Cc: Luca Ceresoli
[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]
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.
Signed-off-by: Brandon Maier <brandon.maier@collins.com>
---
v2:
- support pmufw with any extension
---
boot/uboot/uboot.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 19e4183927..d037ae9c12 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -394,8 +394,9 @@ UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH))
define UBOOT_ZYNQMP_KCONFIG_PMUFW
$(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)),
- 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")
+ 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"),
+ $(call
+KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)"))
endef
UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG))
--
2.38.1
Reviewed-by: Neal Frager <neal.frager@amd.com>
Best regards,
Neal Frager
AMD
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 14225 bytes --]
[-- Attachment #3: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw
2022-11-22 20:17 [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw Brandon Maier via buildroot
2022-11-22 21:28 ` Luca Ceresoli via buildroot
2022-11-23 0:03 ` Frager, Neal via buildroot
@ 2022-11-23 10:03 ` Peter Korsgaard
2022-11-26 18:40 ` Peter Korsgaard
2 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2022-11-23 10:03 UTC (permalink / raw)
To: Brandon Maier; +Cc: Neal Frager, Luca Ceresoli, buildroot
>>>>> "Brandon" == Brandon Maier <brandon.maier@collins.com> writes:
> 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.
> Signed-off-by: Brandon Maier <brandon.maier@collins.com>
> ---
> v2:
> - support pmufw with any extension
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw
2022-11-23 10:03 ` Peter Korsgaard
@ 2022-11-26 18:40 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2022-11-26 18:40 UTC (permalink / raw)
To: Brandon Maier; +Cc: buildroot, Luca Ceresoli, Neal Frager
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
>>>>> "Brandon" == Brandon Maier <brandon.maier@collins.com> writes:
>> 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.
>> Signed-off-by: Brandon Maier <brandon.maier@collins.com>
>> ---
>> v2:
>> - support pmufw with any extension
Committed to 2022.08.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-26 18:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-22 20:17 [Buildroot] [PATCH v2 1/1] boot/uboot/uboot.mk: fix zynqmp without pmufw Brandon Maier via buildroot
2022-11-22 21:28 ` Luca Ceresoli via buildroot
2022-11-23 0:03 ` Frager, Neal via buildroot
2022-11-23 10:03 ` Peter Korsgaard
2022-11-26 18:40 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox