| Message ID | 20240613061423.1737631-2-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/5] boot/xilinx-prebuilt: new boot package | expand |
Hi Neal, On 2024.06.13 07:14, Neal Frager via buildroot wrote: > The new BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option will enable u-boot to > use the xilinx-prebuilt package for downloading a pmufw.elf that gets included > in the generated boot.bin. > > If the BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option is enabled, then the > BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw will > be ignored. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > V1->V2: > - Config.in: depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || > BR2_TARGET_XILINX_PREBUILT_KRIA > - uboot.mk: moved endif to after ifneq statement to simplify logic Thank you! Reviewed-by: Brandon Maier <brandon.maier@collins.com> > --- > boot/uboot/Config.in | 16 ++++++++++++++++ > boot/uboot/uboot.mk | 9 ++++++++- > 2 files changed, 24 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index d0901edc9d..41e372939b 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -512,9 +512,25 @@ config BR2_TARGET_UBOOT_ZYNQMP > > if BR2_TARGET_UBOOT_ZYNQMP > > +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT > + bool "xilinx-prebuilt pmufw.elf" > + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG > + depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA > + help > + Use xilinx-prebuilt boot package for downloading prebuilt zynqmp > + pmufw.elf from https://github.com/Xilinx/soc-prebuilt-firmware repo. > + > + U-Boot build process will generate a boot.bin (to be loaded by the > + ZynqMP boot ROM) containing both the U-Boot SPL and the PMU firmware > + in the Xilinx-specific boot format. > + > + If this option is selected, the BR2_TARGET_UBOOT_ZYNQMP_PMUFW > + prebuilt option will be ignored. > + > config BR2_TARGET_UBOOT_ZYNQMP_PMUFW > string "PMU firmware location" > depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG > + depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT > help > Location of a PMU firmware binary. > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index b9f165f041..19f4cdb557 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -436,6 +436,10 @@ endef > > ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) > > +ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT),y) > +UBOOT_DEPENDENCIES += xilinx-prebuilt > +UBOOT_ZYNQMP_PMUFW_PATH = $(BINARIES_DIR)/pmufw.elf > +else > UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW)) > > ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) > @@ -444,7 +448,10 @@ BR_NO_CHECK_HASH_FOR += $(notdir $(UBOOT_ZYNQMP_PMUFW)) > UBOOT_ZYNQMP_PMUFW_PATH = $(UBOOT_DL_DIR)/$(notdir $(UBOOT_ZYNQMP_PMUFW)) > else ifneq ($(UBOOT_ZYNQMP_PMUFW),) > UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) > -endif > +endif #ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) > + > +endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT > + > UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) > > define UBOOT_ZYNQMP_KCONFIG_PMUFW > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Neal, All, On 2024-06-13 07:14 +0100, Neal Frager via buildroot spake thusly: > The new BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option will enable u-boot to > use the xilinx-prebuilt package for downloading a pmufw.elf that gets included > in the generated boot.bin. > > If the BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option is enabled, then the > BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw will > be ignored. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- [--SNIP--] > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index d0901edc9d..41e372939b 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -512,9 +512,25 @@ config BR2_TARGET_UBOOT_ZYNQMP > > if BR2_TARGET_UBOOT_ZYNQMP > > +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT > + bool "xilinx-prebuilt pmufw.elf" > + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG > + depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA > + help > + Use xilinx-prebuilt boot package for downloading prebuilt zynqmp > + pmufw.elf from https://github.com/Xilinx/soc-prebuilt-firmware repo. > + > + U-Boot build process will generate a boot.bin (to be loaded by the > + ZynqMP boot ROM) containing both the U-Boot SPL and the PMU firmware > + in the Xilinx-specific boot format. > + > + If this option is selected, the BR2_TARGET_UBOOT_ZYNQMP_PMUFW > + prebuilt option will be ignored. $ ./utils/docker-run make check-package WARNING: boot/uboot/Config.in:520: help text: <tab><2 spaces><62 chars> (https://nightly.buildroot.org/#writing-rules-config-in) boot/uboot/Config.in:521: help text: <tab><2 spaces><62 chars> (https://nightly.buildroot.org/#writing-rules-config-in) boot/uboot/Config.in:523: help text: <tab><2 spaces><62 chars> (https://nightly.buildroot.org/#writing-rules-config-in) boot/uboot/Config.in:524: help text: <tab><2 spaces><62 chars> (https://nightly.buildroot.org/#writing-rules-config-in) I've reflowed the help text to fit. > config BR2_TARGET_UBOOT_ZYNQMP_PMUFW > string "PMU firmware location" I have added "Custom" in front of that prompt, because that is what it now is: use of a custom PMU that if not in the repo above. Applied to master with the above fixes, thanks. Regards, Yann E. MORIN.
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d0901edc9d..41e372939b 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -512,9 +512,25 @@ config BR2_TARGET_UBOOT_ZYNQMP if BR2_TARGET_UBOOT_ZYNQMP +config BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + bool "xilinx-prebuilt pmufw.elf" + depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA + help + Use xilinx-prebuilt boot package for downloading prebuilt zynqmp + pmufw.elf from https://github.com/Xilinx/soc-prebuilt-firmware repo. + + U-Boot build process will generate a boot.bin (to be loaded by the + ZynqMP boot ROM) containing both the U-Boot SPL and the PMU firmware + in the Xilinx-specific boot format. + + If this option is selected, the BR2_TARGET_UBOOT_ZYNQMP_PMUFW + prebuilt option will be ignored. + config BR2_TARGET_UBOOT_ZYNQMP_PMUFW string "PMU firmware location" depends on BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG + depends on !BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT help Location of a PMU firmware binary. diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index b9f165f041..19f4cdb557 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -436,6 +436,10 @@ endef ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y) +ifeq ($(BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT),y) +UBOOT_DEPENDENCIES += xilinx-prebuilt +UBOOT_ZYNQMP_PMUFW_PATH = $(BINARIES_DIR)/pmufw.elf +else UBOOT_ZYNQMP_PMUFW = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PMUFW)) ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) @@ -444,7 +448,10 @@ BR_NO_CHECK_HASH_FOR += $(notdir $(UBOOT_ZYNQMP_PMUFW)) UBOOT_ZYNQMP_PMUFW_PATH = $(UBOOT_DL_DIR)/$(notdir $(UBOOT_ZYNQMP_PMUFW)) else ifneq ($(UBOOT_ZYNQMP_PMUFW),) UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) -endif +endif #ifneq ($(findstring ://,$(UBOOT_ZYNQMP_PMUFW)),) + +endif #BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT + UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) define UBOOT_ZYNQMP_KCONFIG_PMUFW
The new BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option will enable u-boot to use the xilinx-prebuilt package for downloading a pmufw.elf that gets included in the generated boot.bin. If the BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT option is enabled, then the BR2_TARGET_UBOOT_ZYNQMP_PMUFW config for downloading a prebuilt pmufw will be ignored. Signed-off-by: Neal Frager <neal.frager@amd.com> --- V1->V2: - Config.in: depends on BR2_TARGET_XILINX_PREBUILT_ZYNQMP || BR2_TARGET_XILINX_PREBUILT_KRIA - uboot.mk: moved endif to after ifneq statement to simplify logic --- boot/uboot/Config.in | 16 ++++++++++++++++ boot/uboot/uboot.mk | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-)