From 89b94252603ba10872e2ff65124caf7fb95dcf60 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Tue, 16 Dec 2025 10:14:26 +0100 Subject: [PATCH] configs/acmesystems_acqua_a5_*: bump to Linux 6.18.1 Also update the device tree: since Linux v6.15-rc1 (510a6190cf5e "ARM: dts: microchip: fix faulty ohci/ehci node names"), the USB nodes are named "usb" instead of "ohci" or "ehci". Signed-off-by: Edgar Bonet [Julien: update linux.hash comment to take hash from upstream] Signed-off-by: Julien Olivain --- .../acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts | 4 ++-- board/acmesystems/acqua-a5/patches/linux/linux.hash | 4 ++-- configs/acmesystems_acqua_a5_256mb_defconfig | 2 +- configs/acmesystems_acqua_a5_512mb_defconfig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts index 60be8a67cd..4754c3cf1c 100644 --- a/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/dts/microchip/at91-sama5d3_acqua.dts @@ -281,11 +281,11 @@ status = "disabled"; }; - usb1: ohci@600000 { + usb1: usb@600000 { status = "okay"; }; - usb2: ehci@700000 { + usb2: usb@700000 { status = "okay"; }; diff --git a/board/acmesystems/acqua-a5/patches/linux/linux.hash b/board/acmesystems/acqua-a5/patches/linux/linux.hash index 2c86a53263..427bcedae7 100644 --- a/board/acmesystems/acqua-a5/patches/linux/linux.hash +++ b/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 6b19a3ae99423de2416964d67251d745910277af258b4c4c63e88fd87dbf0e27 linux-6.12.41.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 d0a78bf3f0d12aaa10af3b5adcaed5bc767b5b78705e5ef885d5e930b72e25d5 linux-6.18.1.tar.xz diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f693ad9baf..74ce958cd3 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.1" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_DIR="board/acmesystems/acqua-a5/dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 3e243cd45e..d3912659db 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.41" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.1" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_DIR="board/acmesystems/acqua-a5/dts"