| Message ID | fa26b80b-7807-4248-ba4b-30771727f9cd@grenoble.cnrs.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.12 | expand |
On Tue, 16 Jan 2024 12:49:01 +0100 Edgar Bonet <bonet@grenoble.cnrs.fr> wrote: > Also adjust the include path for the device tree. Since Linux 6.5-rc1 > (724ba67515 "ARM: dts: Move .dts files to vendor sub-directories"), > sama5d31.dtsi lives in the microchip subdirectory. > > Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> > --- > board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 2 +- > configs/acmesystems_acqua_a5_256mb_defconfig | 4 ++-- > configs/acmesystems_acqua_a5_512mb_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas
diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 39fa4df1b1..a7a4a20352 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -9,7 +9,7 @@ * Licensed under GPLv2 or later. */ /dts-v1/; -#include "sama5d31.dtsi" +#include "microchip/sama5d31.dtsi" / { model = "Acme Systems Acqua SOM"; diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 5b32234294..ef57734194 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" 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.1.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 69294cbec0..a69e2a2251 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" 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.1.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts"
Also adjust the include path for the device tree. Since Linux 6.5-rc1 (724ba67515 "ARM: dts: Move .dts files to vendor sub-directories"), sama5d31.dtsi lives in the microchip subdirectory. Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> --- board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 2 +- configs/acmesystems_acqua_a5_256mb_defconfig | 4 ++-- configs/acmesystems_acqua_a5_512mb_defconfig | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)