15 files changed, 36 insertions, 21 deletions

diff --git a/check_yocto_rules.json b/check_yocto_rules.json
index 7e8eb211..6d33c0aa 100644
--- a/check_yocto_rules.json
+++ b/check_yocto_rules.json
@@ -17,7 +17,8 @@
         "skip_files" : [
             "meta-ti-bsp/recipes-core/udev/eudev_%.bbappend",
             "meta-ti-bsp/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend",
-            "meta-ti-bsp/recipes-security/optee/optee-%.bbappend"
+            "meta-ti-bsp/recipes-security/optee/optee-%.bbappend",
+            "meta-ti-bsp/dynamic-layers/openembedded-layer/recipes-bsp/u-boot/u-boot-ti-%.bbappend"
         ]
     },
     "GUARD-2" : {
diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc
index 3f9828f3..d180c297 100644
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -14,6 +14,7 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org"
 BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
 BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
 BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"
+KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
 
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
@@ -36,6 +37,7 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org"
 BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
 BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
 BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
+KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
 
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf
index 02519f76..828814ce 100644
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -25,6 +25,7 @@ LAYERRECOMMENDS_meta-ti-bsp = " \
 BBFILES_DYNAMIC += " \
     meta-arago-distro:${LAYERDIR}/dynamic-layers/meta-arago-distro/recipes*/*/*.bbappend \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
+    core:${LAYERDIR}/dynamic-layers/core/recipes*/*/*.bbappend \
 "
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index 56b56afe..27165547 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -35,4 +35,4 @@ OPTEEMACHINE = "k3-am64x"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw"
 
-TI_WKS_BOOTLOADER_APPEND="console=ttyS2,115200n8"
+TI_WKS_BOOTLOADER_APPEND = "console=ttyS2,115200n8"
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend
new file mode 100644
index 00000000..db5a0dc5
--- /dev/null
+++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend
@@ -0,0 +1,4 @@
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
+
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend
new file mode 100644
index 00000000..db5a0dc5
--- /dev/null
+++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend
@@ -0,0 +1,4 @@
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
+
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-arago.inc b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-ti.inc
index 31c6b6f7..31c6b6f7 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-arago.inc
+++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-ti.inc
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-ti.inc b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-ti.inc
new file mode 100644
index 00000000..31c6b6f7
--- /dev/null
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/image-ti.inc
@@ -0,0 +1,3 @@
+include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
+
+do_image_wic[depends] += "virtual/kernel:do_shared_workdir"
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend
index 36e6f793..db5a0dc5 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-base-image.bbappend
@@ -1,4 +1,4 @@
-IMAGE_ARAGO = ""
-IMAGE_ARAGO:arago = "image-arago.inc"
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
 
-require ${IMAGE_ARAGO}
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend
index 36e6f793..db5a0dc5 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bbappend
@@ -1,4 +1,4 @@
-IMAGE_ARAGO = ""
-IMAGE_ARAGO:arago = "image-arago.inc"
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
 
-require ${IMAGE_ARAGO}
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend
index 36e6f793..db5a0dc5 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bbappend
@@ -1,4 +1,4 @@
-IMAGE_ARAGO = ""
-IMAGE_ARAGO:arago = "image-arago.inc"
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
 
-require ${IMAGE_ARAGO}
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend
index 36e6f793..db5a0dc5 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-default-image.bbappend
@@ -1,4 +1,4 @@
-IMAGE_ARAGO = ""
-IMAGE_ARAGO:arago = "image-arago.inc"
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
 
-require ${IMAGE_ARAGO}
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend
index 36e6f793..db5a0dc5 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bbappend
@@ -1,4 +1,4 @@
-IMAGE_ARAGO = ""
-IMAGE_ARAGO:arago = "image-arago.inc"
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
 
-require ${IMAGE_ARAGO}
+require ${IMAGE_TI}
diff --git a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend
index 36e6f793..db5a0dc5 100644
--- a/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend
+++ b/meta-ti-bsp/dynamic-layers/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bbappend
@@ -1,4 +1,4 @@
-IMAGE_ARAGO = ""
-IMAGE_ARAGO:arago = "image-arago.inc"
+IMAGE_TI = ""
+IMAGE_TI:ti-soc = "image-ti.inc"
 
-require ${IMAGE_ARAGO}
+require ${IMAGE_TI}
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb b/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
index 3ab00ec3..27b2520e 100644
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
+++ b/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Units to initialize usb gadgets"
+SUMMARY = "Units to initialize usb gadgets"
 
 PR = "r19"