]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm64: zynqmp: Do not describe u-boot.itb if SPL is disabled
authorMichal Simek <michal.simek@amd.com>
Fri, 23 Feb 2024 16:18:42 +0000 (17:18 +0100)
committerMichal Simek <michal.simek@amd.com>
Fri, 22 Mar 2024 11:55:52 +0000 (12:55 +0100)
There is no reason to describe u-boot.itb on system without SPL. Pretty
much this is cover all systems which are using only boot.bin which contains
all images inside.

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/561f9d0ee96ebb6cd674042f269f280ab68fbbac.1708705118.git.michal.simek@amd.com
board/xilinx/common/board.c

index e5ab32f901b912ed0beca345b0fe45de7235d5c7..17291a9d3b940c36aa0623a04976eec16e487812 100644 (file)
@@ -43,7 +43,7 @@ struct efi_fw_image fw_images[] = {
                .image_index = 1,
        },
 #endif
-#if defined(XILINX_UBOOT_IMAGE_GUID)
+#if defined(XILINX_UBOOT_IMAGE_GUID) && defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
        {
                .image_type_id = XILINX_UBOOT_IMAGE_GUID,
                .fw_name = u"XILINX-UBOOT",