From 3b4038e3d70375cd4b16d790fb90508b4f902f99 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Sat, 25 Jan 2025 22:49:29 +0000 Subject: [PATCH] board/zynqmp: add new qspi.bin binary to images This patch adds the new qspi.bin file to the zynqmp sdcard.img. For SD card booting, the qspi.bin file is unnecessary and can just be ignored. For QSPI booting, only the qspi.bin file needs to be written to the flash. This patch enables the Kria BIRT tool for Kria SOM reflashing using qspi.bin as either "ImageA" or "ImageB". Kria BIRT (Boot Image Recovery Tool): https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+SOMs+Starter+Kits#Boot-FW-Update-Process Signed-off-by: Neal Frager Tested-by: Luca Ceresoli Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/zynqmp/genimage.cfg | 1 + configs/zynqmp_kria_kd240_defconfig | 1 + configs/zynqmp_kria_kr260_defconfig | 1 + configs/zynqmp_kria_kv260_defconfig | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu104_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 7 files changed, 7 insertions(+) diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg index 20d8352c08..0a6aea7a29 100644 --- a/board/zynqmp/genimage.cfg +++ b/board/zynqmp/genimage.cfg @@ -3,6 +3,7 @@ image boot.vfat { files = { "boot.bin", "u-boot.itb", + "qspi.bin", "system.dtb", "Image" } diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index 139ad7157e..85ef7d5aa2 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 700b378bd2..c5cfe2fe86 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 4dd0226c33..288606fc02 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 2a316958f2..1e453adeb0 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -34,6 +34,7 @@ BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index 4574898d72..13ee5ff5dc 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -34,6 +34,7 @@ BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index d6e2617552..2669afe1f6 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -34,6 +34,7 @@ BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_FORMAT_QSPI_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y