configs/versal_vek280: bump xilinx-prebuilt to xilinx_v2025.1_update1

Bump the versal_vek280_defconfig to use version xilinx_v2025.1_update1 of the
xilinx-prebuilt boot pacakge.

As part of this update, the vek280 pdi file has been updated and the memory
map has been corrected to match the Linux intree dts memory node, so the
vek280 dts memory node patch is no longer required.

f755d022cd

Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Neal Frager
2025-09-04 22:12:38 +01:00
committed by Julien Olivain
parent 4ff963bffd
commit ef400f57ae
2 changed files with 2 additions and 51 deletions

View File

@@ -1,50 +0,0 @@
From e79a96ff89b11fea03680633ab830894288ee9f0 Mon Sep 17 00:00:00 2001
From: Neal Frager <neal.frager@amd.com>
Date: Thu, 28 Nov 2024 07:50:28 +0000
Subject: [PATCH] arm64: versal: vek280 prebuilt pdi is incorrect
The prebuilt vpl_gen_fixed.pdi for the vek280 is incorrect and does not define
the DDR memory region for address 0x8 0000 0000 - 0x8 8000 0000. For this
reason, the intree Linux dts memory node for the vek280 will not boot.
This patch works around the issue until the prebuilt pdi file is changed.
https://github.com/Xilinx/soc-prebuilt-firmware/blob/xilinx_v2024.2/vek280-versal/vpl_gen_fixed.pdi
Upstream: n/a
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts | 2 +-
arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts
index ad5d590318e6..a306eacca5b3 100644
--- a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts
@@ -19,7 +19,7 @@ / {
memory: memory@0 {
device_type = "memory";
- reg = <0 0 0 0x80000000>, <0x8 0x0 0x1 0x80000000>; /* 2GB + 6GB */
+ reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */
};
chosen {
diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts
index a5ee80a373e2..ba54a5ef0c73 100644
--- a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts
+++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts
@@ -19,7 +19,7 @@ / {
memory: memory@0 {
device_type = "memory";
- reg = <0 0 0 0x80000000>, <0x8 0x00000000 0x1 0x80000000>; /* 2GB + 6GB */
+ reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */
};
chosen {
--
2.25.1

View File

@@ -5,7 +5,7 @@ BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y
BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y
BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-buildroot-elf"
BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches"
BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
@@ -43,6 +43,7 @@ BR2_TARGET_XILINX_EMBEDDEDSW=y
BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PLM=y
BR2_TARGET_XILINX_EMBEDDEDSW_VERSAL_PSMFW=y
BR2_TARGET_XILINX_PREBUILT=y
BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2025.1_update1"
BR2_TARGET_XILINX_PREBUILT_BOARD="vek280"
BR2_PACKAGE_HOST_BOOTGEN=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y