@@ -12,5 +12,5 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
label linux
kernel /Image
devicetree /system.dtb
- append console=${CONSOLE} clk_ignore_unused root=/dev/${ROOT} rw rootwait
+ append console=${CONSOLE} root=/dev/${ROOT} rw rootwait
__HEADER_EOF
@@ -18,9 +18,9 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif"
the_ROM_image:
{
image {
- { type=bootimage, file=${BINARIES_DIR}/${BOARD_NAME}_vpl_gen_fixed.pdi }
- { type=bootloader, file=${BINARIES_DIR}/${BOARD_NAME}_plm.elf }
- { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf }
+ { type=bootimage, file=${BINARIES_DIR}/vpl_gen_fixed.pdi }
+ { type=bootloader, file=${BINARIES_DIR}/plm.elf }
+ { core=psm, file=${BINARIES_DIR}/psmfw.elf }
}
image {
id = 0x1c000000, name=apu_subsystem
deleted file mode 100644
@@ -1 +0,0 @@
-CONFIG_OF_SEPARATE=y
@@ -1,12 +1,12 @@
BR2_aarch64=y
BR2_cortex_a72=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2 vck190"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_versal"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1"
@@ -16,7 +16,7 @@ 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.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -24,16 +24,16 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/versal/uboot.fragment"
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y
BR2_TARGET_UBOOT_FORMAT_DTB=y
BR2_PACKAGE_VERSAL_FIRMWARE=y
-BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="2022.2_br_1"
+BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.1"
BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
@@ -4,13 +4,13 @@ config BR2_PACKAGE_VERSAL_FIRMWARE
help
Pre-built firmware files for Xilinx Versal boards.
- https://github.com/nealfrager/buildroot-firmware
+ https://github.com/Xilinx/soc-prebuilt-firmware
if BR2_PACKAGE_VERSAL_FIRMWARE
config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION
string "firmware version"
- default "2022.2_br_1"
+ default "xilinx_v2023.1"
help
Release version of Versal firmware.
@@ -5,16 +5,16 @@
################################################################################
VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION))
-VERSAL_FIRMWARE_SITE = $(call github,Xilinx,ubuntu-firmware,$(VERSAL_FIRMWARE_VERSION))
-VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only
+VERSAL_FIRMWARE_SITE = $(call github,Xilinx,soc-prebuilt-firmware,$(VERSAL_FIRMWARE_VERSION))
+VERSAL_FIRMWARE_LICENSE = MIT
VERSAL_FIRMWARE_LICENSE_FILES = LICENSE
VERSAL_FIRMWARE_INSTALL_TARGET = NO
VERSAL_FIRMWARE_INSTALL_IMAGES = YES
define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS
$(foreach f,plm.elf psmfw.elf vpl_gen_fixed.pdi,\
- $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)_$(f) \
- $(BINARIES_DIR)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)_$(f)
+ $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)-versal/$(f) \
+ $(BINARIES_DIR)/$(f)
)
endef
This patch bumps the versal_vck190_defconfig to xilinx-v2023.1 which includes the following updates: - Linux v6.1.5 - U-Boot v2023.01 - ATF v2.8 - PLM xilinx_v2023.1 - PSMFW xilinx_v2023.1 - versal-firmware uses new github.com/Xilinx/soc-prebuilt-firmware repo Signed-off-by: Neal Frager <neal.frager@amd.com> --- board/versal/post-build.sh | 2 +- board/versal/post-image.sh | 6 +++--- board/versal/uboot.fragment | 1 - configs/versal_vck190_defconfig | 12 ++++++------ package/versal-firmware/Config.in | 4 ++-- package/versal-firmware/versal-firmware.mk | 8 ++++---- 6 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 board/versal/uboot.fragment