From 2093bfa0aa48e8803bc93634beca9e0b176fecbb Mon Sep 17 00:00:00 2001 From: Dowan Gullient Date: Fri, 6 Mar 2026 10:34:47 +0100 Subject: [PATCH] configs/khadas_vim3: bump linux to 6.18.15 and u-boot to 2026.01 With U-Boot 2022.04 gnutls is required for building the hostool mkeficapsule. mkeficapsule tool is built by default if EFI_LOADER is set since u-boot 2024.10 [1]. Thus the BR2_TARGET_UBOOT_NEEDS_GNUTLS config is needed. This commit also updates the defconfig to the new convention: - It adds custom hashes, enable BR2_DOWNLOAD_FORCE_CHECK_HASHES=y and BR2_GLOBAL_PATCH_DIR="board/khadas/vim3/patches" to store the files. [1] https://source.denx.de/u-boot/u-boot/-/commit/b7a625b1ce49ac4e45dbacf476c31d8e312350fb Signed-off-by: Dowan Gullient [Julien: - squashed linux and u-boot bumps - change linux.hash comment reuse hashes published upstream - increase BR2_TARGET_ROOTFS_EXT2_SIZE to 256M - remove partition size constraint in genimage.cfg - remove .checkpackageignore entry to fix check-package error ] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - board/khadas/vim3/genimage.cfg | 1 - board/khadas/vim3/patches/linux/linux.hash | 2 ++ board/khadas/vim3/patches/uboot/uboot.hash | 2 ++ configs/khadas_vim3_defconfig | 9 ++++++--- 5 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 board/khadas/vim3/patches/linux/linux.hash create mode 100644 board/khadas/vim3/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 23d622a810..3ce5f08ba3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -106,7 +106,6 @@ configs/imx6ulevk_defconfig lib_defconfig.ForceCheckHash configs/imx6ulpico_defconfig lib_defconfig.ForceCheckHash configs/imx7dpico_defconfig lib_defconfig.ForceCheckHash configs/imx8mqevk_defconfig lib_defconfig.ForceCheckHash -configs/khadas_vim3_defconfig lib_defconfig.ForceCheckHash configs/kontron_bl_imx8mm_defconfig lib_defconfig.ForceCheckHash configs/kontron_smarc_sal28_defconfig lib_defconfig.ForceCheckHash configs/mender_x86_64_efi_defconfig lib_defconfig.ForceCheckHash diff --git a/board/khadas/vim3/genimage.cfg b/board/khadas/vim3/genimage.cfg index 79d7f9ca07..1ceb5e4e8b 100644 --- a/board/khadas/vim3/genimage.cfg +++ b/board/khadas/vim3/genimage.cfg @@ -27,7 +27,6 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext2" - size = 128M offset = 0 } } diff --git a/board/khadas/vim3/patches/linux/linux.hash b/board/khadas/vim3/patches/linux/linux.hash new file mode 100644 index 0000000000..6ef79ed70a --- /dev/null +++ b/board/khadas/vim3/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 7c716216c3c4134ed0de69195701e677577bbcdd3979f331c182acd06bf2f170 linux-6.18.15.tar.xz diff --git a/board/khadas/vim3/patches/uboot/uboot.hash b/board/khadas/vim3/patches/uboot/uboot.hash new file mode 100644 index 0000000000..b6a925ea4e --- /dev/null +++ b/board/khadas/vim3/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/configs/khadas_vim3_defconfig b/configs/khadas_vim3_defconfig index 89bae0f114..32e39fc64b 100644 --- a/configs/khadas_vim3_defconfig +++ b/configs/khadas_vim3_defconfig @@ -4,11 +4,13 @@ BR2_ARM_FPU_VFPV4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/khadas/vim3/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/khadas/vim3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/khadas/vim3/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.15" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12b-a311d-khadas-vim3" @@ -16,13 +18,14 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_DOSFSTOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" 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="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="khadas-vim3" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y