1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-06 19:00:49 +00:00

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>
This commit is contained in:
Denys Dmytriyenko
2025-07-01 21:46:14 -04:00
committed by Ryan Eatmon
parent a598566a33
commit ccf4a5e89d
15 changed files with 19 additions and 19 deletions
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
COMPATIBLE_MACHINE = "beagle.*"
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
COMPATIBLE_MACHINE = "beagle.*"
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc
+1 -1
View File
@@ -20,6 +20,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \
"
FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb"
FIT_CONF_DEFAULT_DTB = "k3-am62a7-sk.dtb"
UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
+1 -1
View File
@@ -11,7 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
KERNEL_DEVICETREE = ""
FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb"
FIT_CONF_DEFAULT_DTB = "k3-am62d2-evm.dtb"
UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
+1 -1
View File
@@ -21,7 +21,7 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \
"
FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb"
FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb"
UBOOT_MACHINE = "am62px_evm_a53_defconfig"
+1 -1
View File
@@ -31,6 +31,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \
"
FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
FIT_CONF_DEFAULT_DTB = "k3-am625-sk.dtb"
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+1 -1
View File
@@ -23,6 +23,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \
"
FIT_CONF_DEFAULT_DTB = "ti/k3-am62-lp-sk.dtb"
FIT_CONF_DEFAULT_DTB = "k3-am62-lp-sk.dtb"
UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+3 -3
View File
@@ -25,9 +25,9 @@ KERNEL_DEVICETREE = " \
ti/k3-am625-sk.dtb \
"
FIT_CONF_DEFAULT_DTB = "ti/k3-am6254xxl-sk.dtb"
FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "ti/k3-am625-sk.dtb"
FIT_CONF_DEFAULT_DTB:bsp-ti-6_1 = "ti/k3-am625-sk.dtb"
FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb"
FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb"
FIT_CONF_DEFAULT_DTB:bsp-ti-6_1 = "k3-am625-sk.dtb"
UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
+2 -3
View File
@@ -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"
@@ -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"
@@ -3,7 +3,7 @@ SUMMARY = "Mainline Linux kernel for TI devices"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/ti-kernel.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit ti-secdev
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit ti-secdev
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit ti-secdev
inherit kernel_deprecated
inherit kernel
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/ti-kernel.inc