From 859d41d7e5e768a64cdc31d976f5e7008d1a77f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Sun, 31 Aug 2025 14:39:50 +0200 Subject: [PATCH] configs/aspeed-*: bump Linux to 6.16.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Linux 6.5 moved .dts files to vendor sub-directories, adjust the post-image.sh script to take into account the 'aspeed/' prefix in .dts file names. Signed-off-by: Cédric Le Goater Reviewed-by: Joel Stanley Signed-off-by: Julien Olivain --- board/aspeed/common/post-image.sh | 4 ++-- configs/aspeed_ast2500evb_defconfig | 6 +++--- configs/aspeed_ast2600evb_defconfig | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/board/aspeed/common/post-image.sh b/board/aspeed/common/post-image.sh index ea65a49aff..8c953e038c 100755 --- a/board/aspeed/common/post-image.sh +++ b/board/aspeed/common/post-image.sh @@ -3,8 +3,8 @@ BOARD_DIR="$(dirname $0)" mkimage=$HOST_DIR/bin/mkimage -BOARD_DT=$(sed -n \ - 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ +BOARD_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(aspeed/)?([a-z0-9\-]*).*"$|\2|p' \ ${BR2_CONFIG}) sed -e "s/%BOARD_DTB%/${BOARD_DT}.dtb/" \ diff --git a/configs/aspeed_ast2500evb_defconfig b/configs/aspeed_ast2500evb_defconfig index 2312242e64..ffc0ec8d52 100644 --- a/configs/aspeed_ast2500evb_defconfig +++ b/configs/aspeed_ast2500evb_defconfig @@ -1,17 +1,17 @@ BR2_arm=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_16=y BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.16.4" BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/linux.fragment" BR2_LINUX_KERNEL_XZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2500-evb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed/aspeed-ast2500-evb" BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y diff --git a/configs/aspeed_ast2600evb_defconfig b/configs/aspeed_ast2600evb_defconfig index 104f685200..4e49c4acbe 100644 --- a/configs/aspeed_ast2600evb_defconfig +++ b/configs/aspeed_ast2600evb_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_16=y BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.16.4" BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2600-evb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed/aspeed-ast2600-evb" BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_XZ=y