From 094a1ac4f1db109b3047d771b5765da1feadf627 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Fri, 9 Aug 2024 13:01:42 +0200
Subject: [PATCH] board/aarch64/r2s: enable force check of package hashes

 - Enable BR2_DOWNLOAD_FORCE_CHECK_HASHES for R2S
 - Relocate VisionFive2 patches to global patch dir for sharing with R2S
 - Add hash for ATF v2.9

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 .../visionfive2/patches/linux-headers/linux-headers.hash        | 1 -
 configs/r2s_defconfig                                           | 1 +
 configs/riscv64_defconfig                                       | 2 +-
 patches/arm-trusted-firmware/arm-trusted-firmware.hash          | 2 ++
 patches/linux-headers                                           | 1 +
 patches/linux/linux-headers.hash                                | 1 +
 {board/riscv64/visionfive2/patches => patches}/linux/linux.hash | 1 +
 .../visionfive2/patches => patches}/opensbi/opensbi.hash        | 0
 {board/riscv64/visionfive2/patches => patches}/uboot/uboot.hash | 0
 9 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 120000 board/riscv64/visionfive2/patches/linux-headers/linux-headers.hash
 create mode 100644 patches/arm-trusted-firmware/arm-trusted-firmware.hash
 create mode 120000 patches/linux-headers
 create mode 120000 patches/linux/linux-headers.hash
 rename {board/riscv64/visionfive2/patches => patches}/linux/linux.hash (54%)
 rename {board/riscv64/visionfive2/patches => patches}/opensbi/opensbi.hash (100%)
 rename {board/riscv64/visionfive2/patches => patches}/uboot/uboot.hash (100%)

diff --git a/board/riscv64/visionfive2/patches/linux-headers/linux-headers.hash b/board/riscv64/visionfive2/patches/linux-headers/linux-headers.hash
deleted file mode 120000
index 5808d92a..00000000
--- a/board/riscv64/visionfive2/patches/linux-headers/linux-headers.hash
+++ /dev/null
@@ -1 +0,0 @@
-../linux/linux.hash
\ No newline at end of file
diff --git a/configs/r2s_defconfig b/configs/r2s_defconfig
index f0e59e75..e1790f03 100644
--- a/configs/r2s_defconfig
+++ b/configs/r2s_defconfig
@@ -8,6 +8,7 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache"
 BR2_ENABLE_DEBUG=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="infix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig
index a1fc79ec..346a49c6 100644
--- a/configs/riscv64_defconfig
+++ b/configs/riscv64_defconfig
@@ -4,7 +4,7 @@ BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache"
 BR2_ENABLE_DEBUG=y
-BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches ${BR2_EXTERNAL_INFIX_PATH}/board/riscv64/visionfive2/patches"
+BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="infix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
diff --git a/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/patches/arm-trusted-firmware/arm-trusted-firmware.hash
new file mode 100644
index 00000000..8b69a5a9
--- /dev/null
+++ b/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  06d32acf42808b682859008292f0591d2d872f19aa1a8021bfcd1c1c626285e6  arm-trusted-firmware-v2.9.tar.gz
diff --git a/patches/linux-headers b/patches/linux-headers
new file mode 120000
index 00000000..9c52cb36
--- /dev/null
+++ b/patches/linux-headers
@@ -0,0 +1 @@
+linux
\ No newline at end of file
diff --git a/patches/linux/linux-headers.hash b/patches/linux/linux-headers.hash
new file mode 120000
index 00000000..7c10ad09
--- /dev/null
+++ b/patches/linux/linux-headers.hash
@@ -0,0 +1 @@
+linux.hash
\ No newline at end of file
diff --git a/board/riscv64/visionfive2/patches/linux/linux.hash b/patches/linux/linux.hash
similarity index 54%
rename from board/riscv64/visionfive2/patches/linux/linux.hash
rename to patches/linux/linux.hash
index ccad8068..6dcaaef7 100644
--- a/board/riscv64/visionfive2/patches/linux/linux.hash
+++ b/patches/linux/linux.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256  9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04  linux-6.8.2.tar.xz
+sha256  fa5f22fd67dd05812d39dca579320c493048e26c4a556048a12385e7ae6fc698  linux-6.10.3.tar.xz
diff --git a/board/riscv64/visionfive2/patches/opensbi/opensbi.hash b/patches/opensbi/opensbi.hash
similarity index 100%
rename from board/riscv64/visionfive2/patches/opensbi/opensbi.hash
rename to patches/opensbi/opensbi.hash
diff --git a/board/riscv64/visionfive2/patches/uboot/uboot.hash b/patches/uboot/uboot.hash
similarity index 100%
rename from board/riscv64/visionfive2/patches/uboot/uboot.hash
rename to patches/uboot/uboot.hash