From c7f82d7e4b0a17f3e188f6bbf350f686766021c3 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Fri, 13 Jun 2025 12:06:43 +0800 Subject: Replace kernel-fitimage KERNER_CLASSES with kernel-fit-extra-artifacts kernel-fitimage class has been replaced by kernel-fit-image class in following commit of poky: | 1d8c78c8cd6 kernel-fitimage.bbclass: remove it and according to migration-5.3.rst |d01f9c44ed98d0b2517 migration-5.3: replace kernel-fitimage by kernel-fit-image now we should set KERNEL_CLASSES to kernel-fit-extra-artifacts " - ``kernel-fitimage.bbclass``: the class has been replaced by the :ref:`ref-classes-kernel-fit-image` class. The new implementation resolves the long-standing :yocto_bugs:`bug 12912`. If you are using the kernel FIT image support, you will need to: #. Make sure to include ``kernel-fit-extra-artifacts`` in your :term:`KERNEL_CLASSES` variable to ensure the required files are exposed to the :term:`DEPLOY_DIR_IMAGE` directory:: KERNEL_CLASSES += "kernel-fit-extra-artifacts" " Signed-off-by: Liu Yiding --- conf/machine/ls1012afrwy.conf | 3 +-- conf/machine/ls1012ardb.conf | 3 +-- conf/machine/ls1028ardb.conf | 3 +-- conf/machine/ls1043ardb.conf | 3 +-- conf/machine/ls1046afrwy.conf | 3 +-- conf/machine/ls1046ardb.conf | 3 +-- conf/machine/ls1088ardb-pb.conf | 3 +-- conf/machine/ls1088ardb.conf | 3 +-- conf/machine/ls2088ardb.conf | 3 +-- conf/machine/lx2160ardb.conf | 3 +-- conf/machine/lx2162aqds.conf | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf index 7de1e990a..2bc827153 100644 --- a/conf/machine/ls1012afrwy.conf +++ b/conf/machine/ls1012afrwy.conf @@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf index 879e3f8fb..a170b0529 100644 --- a/conf/machine/ls1012ardb.conf +++ b/conf/machine/ls1012ardb.conf @@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf index 268a60c3e..68249a402 100644 --- a/conf/machine/ls1028ardb.conf +++ b/conf/machine/ls1028ardb.conf @@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf index 4ff3c0acb..8723a7ddd 100644 --- a/conf/machine/ls1043ardb.conf +++ b/conf/machine/ls1043ardb.conf @@ -12,8 +12,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf index eb3c0bb6f..4de0d9def 100644 --- a/conf/machine/ls1046afrwy.conf +++ b/conf/machine/ls1046afrwy.conf @@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index 2b82c98f0..b2d9fa1ca 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf index f9d05b690..ba66ab355 100644 --- a/conf/machine/ls1088ardb-pb.conf +++ b/conf/machine/ls1088ardb-pb.conf @@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf index 1b7a4f3cb..13a1f6240 100644 --- a/conf/machine/ls1088ardb.conf +++ b/conf/machine/ls1088ardb.conf @@ -11,8 +11,7 @@ require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf index 8c8e586a4..617591e4b 100644 --- a/conf/machine/ls2088ardb.conf +++ b/conf/machine/ls2088ardb.conf @@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:" MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" UBOOT_DTB_LOADADDRESS = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf index 1945ad310..c8fbcc1cd 100644 --- a/conf/machine/lx2160ardb.conf +++ b/conf/machine/lx2160ardb.conf @@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:" MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" DTB_LOAD = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf index 80f91331b..1842daff6 100644 --- a/conf/machine/lx2162aqds.conf +++ b/conf/machine/lx2162aqds.conf @@ -11,8 +11,7 @@ MACHINEOVERRIDES =. "fsl-lsch3:lx2162a:" MACHINE_FEATURES += "optee" -KERNEL_CLASSES = " kernel-fitimage " -KERNEL_IMAGETYPES = "fitImage" +KERNEL_CLASSES += "kernel-fit-extra-artifacts" DTB_LOAD = "0x90000000" UBOOT_ENTRYPOINT = "0x80080000" -- cgit v1.2.3-54-g00ecf