meta-ti-bsp, meta-beagle: switch to the new FIT image wrapper

Switch all kernel recipes and K3 based platforms to use the new
FIT image wrapper functionality.

Update FIT default DTB entry to not contain vendor dubdir, as it
is now handled through a conf prefix.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 692979d7..b743c8cc 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -9,8 +9,7 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 require conf/machine/include/ti-bsp.inc
 
 KERNEL_IMAGETYPE = "Image"
-KERNEL_IMAGETYPES = "Image fitImage"
-KERNEL_CLASSES += "kernel-fitimage-deprecated"
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
 
 UBOOT_ARCH = "arm"
 UBOOT_DTB_LOADADDRESS = "0x88000000"
@@ -26,7 +25,7 @@ FIT_SIGN_ALG ?= "rsa4096"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image ti-kernel-fitimage"
 
 TFA_PLATFORM = "k3"
 
diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
index e436932e..5f5e2148 100644
--- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -1,4 +1,5 @@
 IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
-KERNEL_CLASSES:remove = "kernel-fitimage-deprecated"
+KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage"
 KERNEL_CLASSES += "kernel-fitimage-legacyhs"
 FIT_KERNEL_COMP_ALG = "none"