From fd88b0104fd0e0e39edf80518f3454d94f671405 Mon Sep 17 00:00:00 2001 From: Jamie Gibbons Date: Fri, 9 Aug 2024 09:53:34 +0100 Subject: [PATCH] configs/microchip_mpfs_icicle: update custom tarballs The Linux kernel and U-Boot custom tarballs were updated incorrectly in commit 45db64545742. Update these to select specific release tags instead of branches. Update the U-Boot and Linux hashes to match these changes. Fixes: 45db64545742 ("configs/microchip_mpfs_icicle: bump Linux and U-Boot, add hashes") Signed-off-by: Jamie Gibbons Tested-by: Prajna Rajendra Kumar Signed-off-by: Thomas Petazzoni --- board/microchip/mpfs_icicle/patches/linux/linux.hash | 2 +- board/microchip/mpfs_icicle/patches/uboot/uboot.hash | 2 +- configs/microchip_mpfs_icicle_defconfig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/microchip/mpfs_icicle/patches/linux/linux.hash b/board/microchip/mpfs_icicle/patches/linux/linux.hash index 025d630f7d..416a8b1550 100644 --- a/board/microchip/mpfs_icicle/patches/linux/linux.hash +++ b/board/microchip/mpfs_icicle/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a45642bd69b11d9312c15faac67fbd15b0ef90a6d90662d18c0760e37165c7cc linux4microchip+fpga-2024.06.tar.gz +sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux-linux4microchip+fpga-2024.06.tar.gz diff --git a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash index ddb73b9a71..2628d4b4fd 100644 --- a/board/microchip/mpfs_icicle/patches/uboot/uboot.hash +++ b/board/microchip/mpfs_icicle/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d9bcbebe9723ab12cbf2b60277268741e84e4aadbe7ecd8c05be046f202d8a1 linux4microchip+fpga-2024.06.tar.gz +sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 uboot-linux4microchip+fpga-2024.06.tar.gz diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig index 30d07550ac..4337ac34b4 100644 --- a/configs/microchip_mpfs_icicle_defconfig +++ b/configs/microchip_mpfs_icicle_defconfig @@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux-6.6-mchp+fpga)/linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux-linux4microchip+fpga-2024.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=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,linux4microchip,u-boot-mchp,u-boot-2023.07-mchp)/linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/uboot-linux4microchip+fpga-2024.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="microchip_mpfs_icicle" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/uboot-fragment-rootfs.config" BR2_TARGET_UBOOT_NEEDS_DTC=y