boot/uboot.mk: new zynqmp pmufw prebuilt option

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>
Reviewed-by: Brandon Maier <brandon.maier@collins.com>
[yann.morin.1998@free.fr:
  - add 'custom' to prompt for BR2_TARGET_UBOOT_ZYNQMP_PMUFW
  - fix checkpackage
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Neal Frager
2024-06-13 07:14:20 +01:00
committed by Yann E. MORIN
parent a6648ad8da
commit 35a4ec0553
2 changed files with 24 additions and 3 deletions

View File

@@ -512,9 +512,23 @@ config BR2_TARGET_UBOOT_ZYNQMP
if BR2_TARGET_UBOOT_ZYNQMP
config BR2_TARGET_UBOOT_ZYNQMP_PMUFW
string "PMU firmware location"
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
by the ZynqMP boot ROM) containing both the U-Boot SPL and the
PMU firmware in the Xilinx-specific boot format.
config BR2_TARGET_UBOOT_ZYNQMP_PMUFW
string "Custom 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.

View File

@@ -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