From 1ba1055d3da2d98874aae1eedf1983a2ed933605 Mon Sep 17 00:00:00 2001 From: Francois Dugast Date: Fri, 28 Mar 2025 20:57:41 +0100 Subject: [PATCH] configs/hifive_unleashed: bump Linux to 6.12.20 and U-Boot to 2025.01 This commit bumps Linux to 6.12.20 and U-Boot to 2025.01, to align versions to those used in the Hifive Unmatched defconfig to make maintenance easier. The new U-Boot version needs gnutls. This commit also enabled BR2_DOWNLOAD_FORCE_CHECK_HASHES in defconfigs. The .checkpackageignore is updated to reflect that change. Signed-off-by: Francois Dugast [Julien: - reword commit log - add missing BR2_TARGET_UBOOT_NEEDS_GNUTLS=y - change linux.hash comment to take hash from upstream - change linux-headers.hash file to a symlink ] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - .../patches/linux-headers/linux-headers.hash | 1 + board/sifive/hifive-unleashed/patches/linux/linux.hash | 2 ++ .../sifive/hifive-unleashed/patches/opensbi/opensbi.hash | 2 ++ configs/hifive_unleashed_defconfig | 9 ++++++--- 5 files changed, 11 insertions(+), 4 deletions(-) create mode 120000 board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash create mode 100644 board/sifive/hifive-unleashed/patches/linux/linux.hash create mode 100644 board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash diff --git a/.checkpackageignore b/.checkpackageignore index 7b02d2a8d0..1a61aa1ac0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -146,7 +146,6 @@ configs/freescale_t2080_qds_rdb_defconfig lib_defconfig.ForceCheckHash configs/friendlyarm_nanopi_r2s_defconfig lib_defconfig.ForceCheckHash configs/galileo_defconfig lib_defconfig.ForceCheckHash configs/globalscale_espressobin_defconfig lib_defconfig.ForceCheckHash -configs/hifive_unleashed_defconfig lib_defconfig.ForceCheckHash configs/imx23evk_defconfig lib_defconfig.ForceCheckHash configs/imx6-sabreauto_defconfig lib_defconfig.ForceCheckHash configs/imx6-sabresd_defconfig lib_defconfig.ForceCheckHash diff --git a/board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash b/board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sifive/hifive-unleashed/patches/linux/linux.hash b/board/sifive/hifive-unleashed/patches/linux/linux.hash new file mode 100644 index 0000000000..b356207dc4 --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 230e89b07b0ab82e74f07ecc1bee3105dca81d0ef4a97f900929c407249b6ac7 linux-6.12.20.tar.xz diff --git a/board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash b/board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash new file mode 100644 index 0000000000..1408f547b8 --- /dev/null +++ b/board/sifive/hifive-unleashed/patches/opensbi/opensbi.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 opensbi-1.2.tar.gz diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index f96e171e43..e83af773f7 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -5,7 +5,9 @@ BR2_RISCV_ISA_RVA=y BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_RVC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/sifive/hifive-unleashed/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/common/post-build.sh" @@ -13,7 +15,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/common/genimage_sdcard.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.190" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.20" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/common/linux.config.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -29,11 +31,12 @@ BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"