| Message ID | 20240603121435.197680-1-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/2] configs/zynqmp_kria_kv260_defconfig: bump to xilinx-v2024.1 | expand |
On Mon, 3 Jun 2024 13:14:34 +0100 Neal Frager <neal.frager@amd.com> wrote: > This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes > the following updates: > > - Linux v6.6.10 > - U-Boot v2024.01 > - ATF v2.10 > - PMUFW xilinx-v2024.1 > > Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer > needed. > > With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now > the offset between the base address of the boot.bin and u-boot.itb instead of > a raw base address of u-boot.itb. This allows for A/B firmware updates since > the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. > > Thus, Kria SOMs come with the following QSPI address table. > > Partition A: > 0x200000 - boot.bin > 0x280000 - u-boot.itb > > Partition B: > 0xF80000 - boot.bin > 0x1000000 - u-boot.itb > > This patch updates the addressing in the readme.txt accordingly. > > Signed-off-by: Neal Frager <neal.frager@amd.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
On Mon, 3 Jun 2024 13:14:34 +0100 Neal Frager <neal.frager@amd.com> wrote: > This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes > the following updates: > > - Linux v6.6.10 > - U-Boot v2024.01 > - ATF v2.10 > - PMUFW xilinx-v2024.1 > > Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer > needed. > > With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now > the offset between the base address of the boot.bin and u-boot.itb instead of > a raw base address of u-boot.itb. This allows for A/B firmware updates since > the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. > > Thus, Kria SOMs come with the following QSPI address table. > > Partition A: > 0x200000 - boot.bin > 0x280000 - u-boot.itb > > Partition B: > 0xF80000 - boot.bin > 0x1000000 - u-boot.itb > > This patch updates the addressing in the readme.txt accordingly. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/zynqmp/kria/readme.txt | 4 ++-- > configs/zynqmp_kria_kv260_defconfig | 14 ++++++-------- > 2 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt > index 96009804b3..c6be22133c 100644 > --- a/board/zynqmp/kria/readme.txt > +++ b/board/zynqmp/kria/readme.txt > @@ -90,8 +90,8 @@ KV260 Flashing Instructions: > Flashing u-boot.itb: > $ sf probe > $ fatload mmc 1 0x1000000 u-boot.itb > - $ sf erase 0xf80000 +$filesize > - $ sf write 0x1000000 0xf80000 $filesize > + $ sf erase 0x280000 +$filesize > + $ sf write 0x1000000 0x280000 $filesize > > Flashing boot.bin: > $ sf probe > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > index a3a157267c..7b402e032c 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches"
Neal, All, On 2024-06-03 13:14 +0100, Neal Frager via buildroot spake thusly: > This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes > the following updates: > > - Linux v6.6.10 > - U-Boot v2024.01 > - ATF v2.10 > - PMUFW xilinx-v2024.1 > > Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer > needed. > > With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now > the offset between the base address of the boot.bin and u-boot.itb instead of > a raw base address of u-boot.itb. This allows for A/B firmware updates since > the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. > > Thus, Kria SOMs come with the following QSPI address table. > > Partition A: > 0x200000 - boot.bin > 0x280000 - u-boot.itb > > Partition B: > 0xF80000 - boot.bin > 0x1000000 - u-boot.itb > > This patch updates the addressing in the readme.txt accordingly. > > Signed-off-by: Neal Frager <neal.frager@amd.com> Applied to next, thanks. Regards, Yann E. MORIN. > --- > board/zynqmp/kria/readme.txt | 4 ++-- > configs/zynqmp_kria_kv260_defconfig | 14 ++++++-------- > 2 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt > index 96009804b3..c6be22133c 100644 > --- a/board/zynqmp/kria/readme.txt > +++ b/board/zynqmp/kria/readme.txt > @@ -90,8 +90,8 @@ KV260 Flashing Instructions: > Flashing u-boot.itb: > $ sf probe > $ fatload mmc 1 0x1000000 u-boot.itb > - $ sf erase 0xf80000 +$filesize > - $ sf write 0x1000000 0xf80000 $filesize > + $ sf erase 0x280000 +$filesize > + $ sf write 0x1000000 0x280000 $filesize > > Flashing boot.bin: > $ sf probe > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > index a3a157267c..7b402e032c 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" > -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" > -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index 96009804b3..c6be22133c 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -90,8 +90,8 @@ KV260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload mmc 1 0x1000000 u-boot.itb - $ sf erase 0xf80000 +$filesize - $ sf write 0x1000000 0xf80000 $filesize + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize Flashing boot.bin: $ sf probe diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index a3a157267c..7b402e032c 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches"
This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer needed. With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now the offset between the base address of the boot.bin and u-boot.itb instead of a raw base address of u-boot.itb. This allows for A/B firmware updates since the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. Thus, Kria SOMs come with the following QSPI address table. Partition A: 0x200000 - boot.bin 0x280000 - u-boot.itb Partition B: 0xF80000 - boot.bin 0x1000000 - u-boot.itb This patch updates the addressing in the readme.txt accordingly. Signed-off-by: Neal Frager <neal.frager@amd.com> --- board/zynqmp/kria/readme.txt | 4 ++-- configs/zynqmp_kria_kv260_defconfig | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-)