From 3f481e3110db0e7df14420e225a6b8f10855324a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 10 Feb 2026 01:08:27 +0100 Subject: [PATCH] configs/olimex_a64_olinuxino: bump Linux to 6.18.8 and U-Boot to 2026.01 The patch: * bumps Linux kernel to version 6.18.8 * bumps U-Boot to version 2026.01 * bumps ATF to version 2.14.0 * forces check hashes * switches to extlinux Signed-off-by: Giulio Benetti [Julien: change linux.hash comment to use hash from upstream] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - board/olimex/a64-olinuxino/boot.cmd | 6 ------ board/olimex/a64-olinuxino/genimage.cfg | 18 ------------------ .../patches/linux-headers/linux-headers.hash | 1 + .../a64-olinuxino/patches/linux/linux.hash | 2 ++ .../a64-olinuxino/patches/uboot/uboot.hash | 2 ++ .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 ++++ configs/olimex_a64_olinuxino_defconfig | 15 ++++++++------- 8 files changed, 17 insertions(+), 32 deletions(-) delete mode 100644 board/olimex/a64-olinuxino/boot.cmd create mode 120000 board/olimex/a64-olinuxino/patches/linux-headers/linux-headers.hash create mode 100644 board/olimex/a64-olinuxino/patches/linux/linux.hash create mode 100644 board/olimex/a64-olinuxino/patches/uboot/uboot.hash create mode 100644 board/olimex/a64-olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf diff --git a/.checkpackageignore b/.checkpackageignore index 93d1809330..695e0d50c6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -131,7 +131,6 @@ configs/nitrogen8mm_defconfig lib_defconfig.ForceCheckHash configs/nitrogen8mn_defconfig lib_defconfig.ForceCheckHash configs/nitrogen8mp_defconfig lib_defconfig.ForceCheckHash configs/odroidc2_defconfig lib_defconfig.ForceCheckHash -configs/olimex_a64_olinuxino_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo175_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo1_defconfig lib_defconfig.ForceCheckHash configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash diff --git a/board/olimex/a64-olinuxino/boot.cmd b/board/olimex/a64-olinuxino/boot.cmd deleted file mode 100644 index 28ed6d9dc9..0000000000 --- a/board/olimex/a64-olinuxino/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-olinuxino.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/olimex/a64-olinuxino/genimage.cfg b/board/olimex/a64-olinuxino/genimage.cfg index ac59e915d9..f6adbb1881 100644 --- a/board/olimex/a64-olinuxino/genimage.cfg +++ b/board/olimex/a64-olinuxino/genimage.cfg @@ -1,15 +1,3 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-olinuxino.dtb", - "boot.scr" - } - } - - size = 64M -} - image sdcard.img { hdimage { } @@ -21,12 +9,6 @@ image sdcard.img { size = 1032K # 1MB - 8KB + 16KB(GPT) } - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/olimex/a64-olinuxino/patches/linux-headers/linux-headers.hash b/board/olimex/a64-olinuxino/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/olimex/a64-olinuxino/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/olimex/a64-olinuxino/patches/linux/linux.hash b/board/olimex/a64-olinuxino/patches/linux/linux.hash new file mode 100644 index 0000000000..f83883b936 --- /dev/null +++ b/board/olimex/a64-olinuxino/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 37f0c5d5c242c1d604e87d48f08795e861a5a85f725b4ca11d0a538f12ff8cff linux-6.18.8.tar.xz diff --git a/board/olimex/a64-olinuxino/patches/uboot/uboot.hash b/board/olimex/a64-olinuxino/patches/uboot/uboot.hash new file mode 100644 index 0000000000..b6a925ea4e --- /dev/null +++ b/board/olimex/a64-olinuxino/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/board/olimex/a64-olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf b/board/olimex/a64-olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..6a5a088666 --- /dev/null +++ b/board/olimex/a64-olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label A64-Olinuxino + kernel /boot/zImage + fdtdir /boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index ad446ea18c..6173fc8c20 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -1,12 +1,15 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18=y +BR2_GLOBAL_PATCH_DIR="board/olimex/a64-olinuxino/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" +BR2_ROOTFS_OVERLAY="board/olimex/a64-olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a64-olinuxino/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.8" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" @@ -16,16 +19,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.8" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.14.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" 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_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" @@ -33,6 +37,3 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd"