From 4e99bc14eb8bdb25464c8e0f9c718119c71d59b5 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Sat, 25 Jan 2025 22:16:24 +0000 Subject: [PATCH] boot/xilinx-prebuilt: merge hash files There is actually no need to have two hash files for the xilinx-prebuilt package. As long as the boot/xilinx-prebuilt/xilinx-prebuilt.hash contains the hash value for the default version as well as any version used by a xilinx board defconfig, a single hash file is all that is needed. In the future, when bumping the defconfig files independently of the xilinx-prebuilt default version, all that has to be done is the following process. Patch Series: 1. Add new version hash to boot/xilinx-prebuilt/xilinx-prebuilt.hash. 2. Bump board defconfigs to new version. 3. Bump xilinx-prebuilt default version. For this reason, this patch merges the two xilinx-prebuilt.hash files and removes the board/xilinx xilinx-prebuilt.hash file. Signed-off-by: Neal Frager Signed-off-by: Arnout Vandecappelle --- board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash | 2 -- boot/xilinx-prebuilt/xilinx-prebuilt.hash | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash deleted file mode 100644 index fe6963872c..0000000000 --- a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ef61a4b249ecbf632a25cc34c3b03b8290be44397ff739467ac92ec1701e23bf xilinx-prebuilt-xilinx_v2024.2.tar.gz diff --git a/boot/xilinx-prebuilt/xilinx-prebuilt.hash b/boot/xilinx-prebuilt/xilinx-prebuilt.hash index 048b93dcf4..ddb2cf8bd1 100644 --- a/boot/xilinx-prebuilt/xilinx-prebuilt.hash +++ b/boot/xilinx-prebuilt/xilinx-prebuilt.hash @@ -1,5 +1,6 @@ # Locally calculated sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f xilinx-prebuilt-xilinx_v2024.1.tar.gz +sha256 ef61a4b249ecbf632a25cc34c3b03b8290be44397ff739467ac92ec1701e23bf xilinx-prebuilt-xilinx_v2024.2.tar.gz # Locally calculated sha256 7b2074b607264a07347e1a7ef0323229585942793469f34b2cf9628f7623e05f LICENSE