| Message ID | 20250117080009.774814-5-neal.frager@amd.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v5,1/6] boot/uboot: binman generates u-boot.itb | expand |
On Fri, 17 Jan 2025 08:00:08 +0000 Neal Frager <neal.frager@amd.com> wrote: > 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 <neal.frager@amd.com> [Tested on Kria KV260 starter kit] Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
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 48717eaea0..3668ae6eb1 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -33,6 +33,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 cd1b6e6f7f..637d5cb394 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -33,6 +33,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 cd5ff8b07a..c25c6938d8 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -33,6 +33,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 0a4c4bd9cd..141ec1e2fb 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -32,6 +32,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 2bf00b1b75..a31ddec2b7 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -32,6 +32,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 0117ce0d51..0af4b59b49 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -32,6 +32,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
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 <neal.frager@amd.com> --- V1->V2: - new to patch series V2->V3: - corrected commit message to use BIRT instead of SBIRT V3->V4: - changed config to BR2_TARGET_UBOOT_FORMAT_QSPI_BIN V4->V5: - no changes --- 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(+)