package/versal-firmware: remove package

This patch removes the package/versal-firmware as this package is replaced
by the boot/xilinx-prebuilt target boot firmware package.

Signed-off-by: Neal Frager <[email protected]>
Reviewed-by: Brandon Maier <[email protected]>
[[email protected]: handle legacy]
Signed-off-by: Yann E. MORIN <[email protected]>

diff --git a/Config.in.legacy b/Config.in.legacy
index c1d6fd646e6a89dff3aae8c2a7a400a14bd8b960..29c386bec4318ea6e7f936680799ed8b1c58489f 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2024.08"
 
+config BR2_PACKAGE_VERSAL_FIRMWARE
+       bool "versal-firmware has been replaced by xilinx-prebuilt"
+       select BR2_TARGET_XILINX_PREBUILT
+       select BR2_LEGACY
+       help
+         The versal-firmware package has been replaced by the more
+         generic xilinx-prebuilt package.
+
 config BR2_KERNEL_HEADERS_6_8
        bool "kernel headers version 6.8.x are no longer supported"
        select BR2_LEGACY

diff --git a/DEVELOPERS b/DEVELOPERS
index 75642ed77f85b36bc0d582a25a11ae8f8456e26d..8bfd36f1d891b308b788d19be19405b0df7e0ed4 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2353,7 +2353,6 @@ F:        package/binutils-bare-metal/
 F:     package/bootgen/
 F:     package/gcc-bare-metal/
 F:     package/newlib-bare-metal/
-F:     package/versal-firmware/
 F:     toolchain/toolchain-bare-metal-buildroot/
 
 N:     Nicola Di Lieto <[email protected]>

diff --git a/board/xilinx/patches/versal-firmware/versal-firmware.hash b/board/xilinx/patches/versal-firmware/versal-firmware.hash
deleted file mode 100644 (file)
index c4d745f..0000000
--- a/board/xilinx/patches/versal-firmware/versal-firmware.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f  versal-firmware-xilinx_v2024.1.tar.gz

diff --git a/boot/xilinx-prebuilt/Config.in b/boot/xilinx-prebuilt/Config.in
index 7c992e6de3dd2ea6daa6ffd382b39ac27e96023e..d3df1c06e7bd3d2625368216e17238798276a2fc 100644 (file)
--- a/boot/xilinx-prebuilt/Config.in
+++ b/boot/xilinx-prebuilt/Config.in
@@ -17,6 +17,7 @@ config BR2_TARGET_XILINX_PREBUILT_VERSION
 
 choice
        bool "family variant"
+       default BR2_TARGET_XILINX_PREBUILT_VERSAL if BR2_PACKAGE_VERSAL_FIRMWARE  # legacy
        default BR2_TARGET_XILINX_PREBUILT_ZYNQMP
 
 config BR2_TARGET_XILINX_PREBUILT_ZYNQMP

diff --git a/package/Config.in b/package/Config.in
index bfbec1c21d04f6b36321f5d5317439f2cd64007d..550fdc1f411ef5f9356942aeddcf018662846344 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -459,7 +459,6 @@ menu "Firmware"
        source "package/sunxi-boards/Config.in"
        source "package/ts4900-fpga/Config.in"
        source "package/ux500-firmware/Config.in"
-       source "package/versal-firmware/Config.in"
        source "package/wilc-firmware/Config.in"
        source "package/wilink-bt-firmware/Config.in"
        source "package/zd1211-firmware/Config.in"

diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in
deleted file mode 100644 (file)
index 01daefd..0000000
--- a/package/versal-firmware/Config.in
+++ /dev/null
@@ -1,24 +0,0 @@
-config BR2_PACKAGE_VERSAL_FIRMWARE
-       bool "versal-firmware"
-       depends on BR2_aarch64
-       help
-         Pre-built firmware files for Xilinx Versal boards.
-
-         https://github.com/Xilinx/soc-prebuilt-firmware
-
-if BR2_PACKAGE_VERSAL_FIRMWARE
-
-config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION
-       string "firmware version"
-       default "xilinx_v2023.1"
-       help
-         Release version of Versal firmware.
-
-config BR2_PACKAGE_VERSAL_FIRMWARE_BOARD
-       string "board name"
-       default "vck190"
-       help
-         Name of Versal target board.
-         Used for installing the appropriate firmware.
-
-endif # BR2_PACKAGE_VERSAL_FIRMWARE

diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk
deleted file mode 100644 (file)
index 1ced259..0000000
--- a/package/versal-firmware/versal-firmware.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# versal-firmware
-#
-################################################################################
-
-VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION))
-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)-versal/$(f) \
-                       $(BINARIES_DIR)/$(f)
-       )
-endef
-
-$(eval $(generic-package))