All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support
@ 2025-12-03 20:32 Andrew Davis
  2025-12-03 20:32 ` [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc Andrew Davis
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Andrew Davis @ 2025-12-03 20:32 UTC (permalink / raw)
  To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis

As AM57xx already defined both "dra7xx" and "am57xx" as SOC_FAMILY the
AM57xx was effectively a superset MACHINE. Although not all features of
AM57xx are needed for DRA7xx, make DRA7xx-EVM use the AM57xx definition.
This allows us to still support DRA7xx as the only differences that
impact device function are the selection of U-Boot defconfig, DTBs, and
OPTEE, all handled by the MACHINE conf file which is left unchanged.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-ti-bsp/classes/ti-secdev.bbclass                        | 1 -
 meta-ti-bsp/conf/machine/dra7xx-evm.conf                     | 2 +-
 meta-ti-bsp/conf/machine/include/am57xx.inc                  | 1 -
 meta-ti-bsp/conf/machine/include/dra7xx.inc                  | 4 ----
 meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb           | 2 +-
 meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb            | 2 +-
 meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb         | 2 +-
 meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc | 4 ++--
 meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc                 | 2 +-
 meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb                     | 4 ++--
 meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb          | 2 +-
 11 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 meta-ti-bsp/conf/machine/include/dra7xx.inc

diff --git a/meta-ti-bsp/classes/ti-secdev.bbclass b/meta-ti-bsp/classes/ti-secdev.bbclass
index b3d70e5c..226e154d 100644
--- a/meta-ti-bsp/classes/ti-secdev.bbclass
+++ b/meta-ti-bsp/classes/ti-secdev.bbclass
@@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K
 TI_SECURE_DEV_PKG:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"
 TI_SECURE_DEV_PKG:ti43x = "${TI_SECURE_DEV_PKG_CAT}/am4x"
 TI_SECURE_DEV_PKG:am57xx = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
-TI_SECURE_DEV_PKG:dra7xx = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
 
 # The SECDEV scripts may need their own location provided through the environment
 export TI_SECURE_DEV_PKG
diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
index f9a3dd0b..237f27b9 100644
--- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
@@ -2,7 +2,7 @@
 #@NAME: DRA7xx EVM
 #@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
 
-require conf/machine/include/dra7xx.inc
+require conf/machine/include/am57xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc
index 85290924..c7c8029f 100644
--- a/meta-ti-bsp/conf/machine/include/am57xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
@@ -1,5 +1,4 @@
 require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
 SOC_FAMILY:append = ":am57xx"
 
 MACHINE_FEATURES += "pci"
diff --git a/meta-ti-bsp/conf/machine/include/dra7xx.inc b/meta-ti-bsp/conf/machine/include/dra7xx.inc
deleted file mode 100644
index a02421d9..00000000
--- a/meta-ti-bsp/conf/machine/include/dra7xx.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
-
-MACHINE_FEATURES += "pci"
diff --git a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
index c43afb5b..11d877a6 100644
--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684da
 PV = "${GOODIX_FW_VERSION}"
 PR = "${INC_PR}.0"
 
-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"
 
 ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
 TARGET = "goodix_9271_cfg.bin"
diff --git a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
index ba320f5f..1b1cff6b 100644
--- a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
+++ b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
@@ -2,7 +2,7 @@ SUMMARY = "Radio Application Firmware"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3"
 
-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"
 
 PR = "r1"
 
diff --git a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
index f147b234..4c2ea375 100644
--- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
+++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
@@ -3,7 +3,7 @@ SUMMARY = "VPDMA firmware for Video Input Port and Video Processing Engine"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c"
 
-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"
 
 SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vpdma-fw/03-2012/exports/vpdma-fw_03-2012.tar.gz;protocol=http;name=dra7xx-evm"
 SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
index 61a74a06..83d0d128 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
@@ -41,7 +41,7 @@ do_compile:append:ti43x() {
     optee_sign_legacyhs
 }
 
-do_compile:append:dra7xx() {
+do_compile:append:am57xx() {
     optee_sign_legacyhs
 }
 
@@ -62,7 +62,7 @@ do_deploy:append:ti43x() {
     optee_deploy_legacyhs
 }
 
-do_deploy:append:dra7xx() {
+do_deploy:append:am57xx() {
     optee_deploy_legacyhs
 }
 
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
index da7e4733..7006a9b6 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
@@ -6,7 +6,7 @@ COMPATIBLE_HOST ?= "null"
 COMPATIBLE_HOST:ti-soc = ".*-linux"
 
 PLATFORM = "UNKNOWN"
-PLATFORM:dra7xx = "DRA7XX"
+PLATFORM:am57xx = "DRA7XX"
 PLATFORM:omapl138 = "OMAPL138"
 
 ALT_PLATFORM:am57xx = "AM572X AM571X"
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
index 539a83f9..3e4be816 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
@@ -22,7 +22,7 @@ SRC_URI += "file://tiipclad-daemon.sh \
 CFLAGS += "-I${UNPACKDIR} -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}"
 
 DAEMON = "UNKNOWN"
-DAEMON:dra7xx = "lad_dra7xx"
+DAEMON:am57xx = "lad_dra7xx"
 DAEMON:omapl138 = "lad_omapl138"
 
 inherit autotools-brokensep pkgconfig update-rc.d systemd
@@ -55,7 +55,7 @@ do_install:append() {
     install -c -m 755 ${UNPACKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }
 
-do_install:append:dra7xx() {
+do_install:append:am57xx() {
     install -d ${D}${sysconfdir}/modprobe.d/
     install -c -m 644 ${UNPACKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/
 }
diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
index bfdf1ac5..bca91df8 100644
--- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -3,7 +3,7 @@ LICENSE = "TI-TSPA"
 
 LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
 
-COMPATIBLE_MACHINE = "dra7xx"
+COMPATIBLE_MACHINE = "am57xx"
 
 inherit features_check
 
-- 
2.39.2



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc
  2025-12-03 20:32 [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support Andrew Davis
@ 2025-12-03 20:32 ` Andrew Davis
  2025-12-09 23:54   ` Denys Dmytriyenko
  2025-12-03 20:42 ` [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support PRC Automation
  2025-12-09 23:53 ` Denys Dmytriyenko
  2 siblings, 1 reply; 5+ messages in thread
From: Andrew Davis @ 2025-12-03 20:32 UTC (permalink / raw)
  To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis

As am57xx.inc is now the only user of omap-a15.inc, merge the content of
omap-a15.inc into am57xx.inc and remove omap-a15.inc. As we no longer have
this common include, also remove "omap-a15" and use "am57xx" in its place.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-ti-bsp/conf/machine/include/am57xx.inc   | 50 +++++++++++++++++--
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 50 -------------------
 .../ti-sgx-ddk-km_1.17.4948957.bb             |  4 +-
 .../libgal/ti-gc320-libs_5.0.11.p7.bb         |  2 +-
 .../ti-sgx-ddk-um_1.17.4948957.bb             |  4 +-
 .../dsptop/debugss-module-drv_git.bb          |  2 +-
 .../recipes-bsp/dsptop/dsptop_git.bb          |  2 +-
 .../recipes-bsp/dsptop/libulm_git.bb          |  2 +-
 .../recipes-bsp/pru/pru-icss_git.bb           |  8 +--
 .../recipes-devtools/gdbc6x/gdbc6x_git.bb     |  2 +-
 .../gdbc6x/gdbserver-c6x_git.bb               |  2 +-
 .../gdbc6x/gdbserverproxy-module-drv_git.bb   |  2 +-
 .../recipes-ti/imglib/imglib-c66x.inc         |  2 +-
 meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc |  8 +--
 .../recipes-ti/ipc/ti-ipc-rtos_git.bb         | 10 ++--
 meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc  |  2 +-
 16 files changed, 73 insertions(+), 79 deletions(-)
 delete mode 100644 meta-ti-bsp/conf/machine/include/omap-a15.inc

diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc
index c7c8029f..6acc0cb0 100644
--- a/meta-ti-bsp/conf/machine/include/am57xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
@@ -1,6 +1,50 @@
-require conf/machine/include/omap-a15.inc
+require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":am57xx"
 
-MACHINE_FEATURES += "pci"
+DEFAULTTUNE ?= "armv7athf-neon"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"
+require conf/machine/include/ti-bsp.inc
+
+# Graphics providers and variables
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPES = "zImage uImage"
+KERNEL_CLASSES += "kernel-uimage"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Generate an extlinux.conf file
+UBOOT_EXTLINUX = "1"
+UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
+UBOOT_EXTLINUX_BOOT_FILES = " \
+    extlinux.conf;extlinux/extlinux.conf \
+    ${KERNEL_IMAGETYPE} \
+    ${DEVICETREE_FILES} \
+"
+
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw prueth-fw prusw-fw pruhsr-fw pruprp-fw"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
+# List common SoC features, may need to add touchscreen for specific machines
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320 pci"
+
+IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
+WKS_FILE ?= "sdimage-2part.wks"
+IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
deleted file mode 100644
index 8e029431..00000000
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omap-a15"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa15.inc
-
-require conf/machine/include/ti-bsp.inc
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILES} \
-"
-
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
-
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-# and u-boot.
-UBI_VOLNAME = "rootfs"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index f5cea270..343f09de 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -7,7 +7,7 @@ inherit module
 
 PROVIDES = "virtual/gpudriver"
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -19,9 +19,9 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;
 
 SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d"
 
-TARGET_PRODUCT:omap-a15 = "ti572x_linux"
 TARGET_PRODUCT:ti33x = "ti335x_linux"
 TARGET_PRODUCT:ti43x = "ti437x_linux"
+TARGET_PRODUCT:am57xx = "ti572x_linux"
 TARGET_PRODUCT:am65xx = "ti654x_linux"
 PVR_BUILD = "release"
 PVR_WS = "lws-generic"
diff --git a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
index bd7cf015..86aa71b8 100644
--- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
@@ -7,7 +7,7 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "gc320"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 CLEANBROKEN = "1"
 
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
index af27981f..c4cc5f10 100644
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
@@ -4,7 +4,7 @@ LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx"
 
 PR = "r38"
 
@@ -37,7 +37,7 @@ inherit ${@pick_init(d)}
 
 TARGET_PRODUCT:ti33x = "ti335x_linux"
 TARGET_PRODUCT:ti43x = "ti437x_linux"
-TARGET_PRODUCT:omap-a15 = "ti572x_linux"
+TARGET_PRODUCT:am57xx = "ti572x_linux"
 TARGET_PRODUCT:am65xx = "ti654x_linux"
 
 RDEPENDS:${PN} += "libdrm ti-sgx-ddk-km"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
index fdb16ec4..e80591b2 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -8,7 +8,7 @@ S:append = "/debugss_module/debugss-mod"
 
 inherit module
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
index c1080468..c5242d5e 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.2"
 
 S:append = "/dsptop"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
 
diff --git a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
index 1bcaa0ea..638973c4 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
@@ -11,7 +11,7 @@ PR = "${INC_PR}.0"
 
 S:append = "/dsptop/ulm"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX}"
 
diff --git a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
index 84d00eed..b7066583 100644
--- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
+++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
@@ -14,7 +14,7 @@ PV = "6.5.0"
 
 require recipes-ti/includes/ti-paths.inc
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e"
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am62xx|am64xx|am65xx|j721e"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES:prepend = " \
@@ -36,7 +36,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
 
 PLATFORM:ti33x = "am335x"
 PLATFORM:ti43x = "am437x"
-PLATFORM:omap-a15 = "am572x"
+PLATFORM:am57xx = "am572x"
 PLATFORM:am62xx = "am62x"
 PLATFORM:am64xx = "am64x"
 PLATFORM:am65xx = "am65x"
@@ -84,7 +84,7 @@ do_install:append:ti43x() {
     done
 }
 
-do_install:append:omap-a15() {
+do_install:append:am57xx() {
     install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
                    ${D}${nonarch_base_libdir}/firmware/pru
     for i in 1 2
@@ -182,7 +182,7 @@ FILES:${PN}-rpmsg-echo = "${nonarch_base_libdir}/firmware/pru/PRU_RPMsg_Echo_Int
 # Set up names for the firmwares
 PRU_ICSS_ALTERNATIVES:ti33x    = "am335x-pru0-fw am335x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
-PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
+PRU_ICSS_ALTERNATIVES:am57xx   = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
 PRU_ICSS_ALTERNATIVES:am62xx   = "am62x-pru0-fw am62x-pru1-fw"
 PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
 PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
index 3e6dfbff..521d06fe 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f
 
 DEPENDS = "ncurses bison-native texinfo flex-native gettext"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 PR = "${INC_PR}.1"
 
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
index a2d8da75..bcb9624f 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
@@ -8,7 +8,7 @@ PR = "${INC_PR}.0"
 
 S:append = "/gdbserver-c6x/src"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM"
 
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
index 1e4fd6c5..799ba019 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -13,7 +13,7 @@ S:append = "/kernel_module/gdbproxy-mod"
 
 inherit module
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
diff --git a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
index 8fa2ceca..3c5efeb1 100644
--- a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
+++ b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
@@ -8,7 +8,7 @@ require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
 require ../includes/ti-unpack.inc
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib"
 
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
index 2f93db72..0b2ef9f5 100644
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
@@ -41,16 +41,16 @@ RELEASE_SUFFIX = ""
 
 PR = "${INC_PR}.r0"
 
-DEPENDS:append:omap-a15 = " ti-cgt6x-native \
-                            ti-cgt-arm-native \
-                            gcc-arm-baremetal-native \
+DEPENDS:append:am57xx = " ti-cgt6x-native \
+                          ti-cgt-arm-native \
+                          gcc-arm-baremetal-native \
 "
 DEPENDS:append:omapl138 = " ti-cgt6x-native \
 "
 
 IPC_TARGETS = ""
 
-IPC_TARGETS:omap-a15 = "\
+IPC_TARGETS:am57xx = "\
     gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
     ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
     ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
index d2ac6276..2162a1ac 100644
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -81,11 +81,11 @@ KFPLAT = ""
 ALTERNATIVE_PRIORITY = "5"
 
 ALTERNATIVE:${PN}-fw:omapl138 = "rproc-dsp-fw"
-ALTERNATIVE:${PN}-fw:omap-a15 = "dra7-dsp1-fw.xe66 \
-                                 dra7-dsp2-fw.xe66 \
-                                 dra7-ipu1-fw.xem4 \
-                                 dra7-ipu2-fw.xem4 \
-                                "
+ALTERNATIVE:${PN}-fw:am57xx = "dra7-dsp1-fw.xe66 \
+                               dra7-dsp2-fw.xe66 \
+                               dra7-ipu1-fw.xem4 \
+                               dra7-ipu2-fw.xem4 \
+                              "
 
 ALTERNATIVE_LINK_NAME[rproc-dsp-fw] = "${nonarch_base_libdir}/firmware/rproc-dsp-fw"
 ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp1-fw.xe66"
diff --git a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
index 94c5d33b..c7c14f91 100644
--- a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
+++ b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
@@ -7,7 +7,7 @@ require ../includes/ti-paths.inc
 require ../includes/ti-staging.inc
 require ../includes/ti-eula-unpack.inc
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "am57xx"
 
 SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin"
 
-- 
2.39.2



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support
  2025-12-03 20:32 [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support Andrew Davis
  2025-12-03 20:32 ` [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc Andrew Davis
@ 2025-12-03 20:42 ` PRC Automation
  2025-12-09 23:53 ` Denys Dmytriyenko
  2 siblings, 0 replies; 5+ messages in thread
From: PRC Automation @ 2025-12-03 20:42 UTC (permalink / raw)
  To: Andrew Davis; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti

meta-ti / na / 20251203203211.1113327-1-afd

PRC Results: PASS

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
All patches passed



=========================================================
  apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support
- Submitter: From: Andrew Davis <afd@ti.com>
- Date: Date: Wed, 3 Dec 2025 14:32:10 -0600
- Num Patches: 2
- Mailing List (public inbox) Commit SHA: 68a91506ab932f0e846b6a42c9087986b3999b24

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master-wip
- Commit Author: Moteen Shah <m-shah@ti.com>
- Commit Subject: am62axx.inc: Add TPS6594 regulator and core modules to initramfs image
- Commit SHA: 98dfd20aad4d065d0fd86750a9765e1535a286f3

Patches
----------------------------------------
All patches applied



=========================================================
  check-yocto-repo: PASS
=========================================================
master
=====================
PASS



=========================================================
  yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed





^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support
  2025-12-03 20:32 [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support Andrew Davis
  2025-12-03 20:32 ` [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc Andrew Davis
  2025-12-03 20:42 ` [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support PRC Automation
@ 2025-12-09 23:53 ` Denys Dmytriyenko
  2 siblings, 0 replies; 5+ messages in thread
From: Denys Dmytriyenko @ 2025-12-09 23:53 UTC (permalink / raw)
  To: afd; +Cc: Ryan Eatmon, meta-ti

On Wed, Dec 03, 2025 at 02:32:10PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> As AM57xx already defined both "dra7xx" and "am57xx" as SOC_FAMILY the
> AM57xx was effectively a superset MACHINE. Although not all features of
> AM57xx are needed for DRA7xx, make DRA7xx-EVM use the AM57xx definition.
> This allows us to still support DRA7xx as the only differences that
> impact device function are the selection of U-Boot defconfig, DTBs, and
> OPTEE, all handled by the MACHINE conf file which is left unchanged.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  meta-ti-bsp/classes/ti-secdev.bbclass                        | 1 -
>  meta-ti-bsp/conf/machine/dra7xx-evm.conf                     | 2 +-
>  meta-ti-bsp/conf/machine/include/am57xx.inc                  | 1 -
>  meta-ti-bsp/conf/machine/include/dra7xx.inc                  | 4 ----
>  meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb           | 2 +-
>  meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb            | 2 +-
>  meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb         | 2 +-
>  meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc | 4 ++--
>  meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc                 | 2 +-
>  meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb                     | 4 ++--
>  meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb          | 2 +-
>  11 files changed, 10 insertions(+), 16 deletions(-)
>  delete mode 100644 meta-ti-bsp/conf/machine/include/dra7xx.inc
> 
> diff --git a/meta-ti-bsp/classes/ti-secdev.bbclass b/meta-ti-bsp/classes/ti-secdev.bbclass
> index b3d70e5c..226e154d 100644
> --- a/meta-ti-bsp/classes/ti-secdev.bbclass
> +++ b/meta-ti-bsp/classes/ti-secdev.bbclass
> @@ -15,7 +15,6 @@ TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K
>  TI_SECURE_DEV_PKG:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"
>  TI_SECURE_DEV_PKG:ti43x = "${TI_SECURE_DEV_PKG_CAT}/am4x"
>  TI_SECURE_DEV_PKG:am57xx = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
> -TI_SECURE_DEV_PKG:dra7xx = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
>  
>  # The SECDEV scripts may need their own location provided through the environment
>  export TI_SECURE_DEV_PKG
> diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
> index f9a3dd0b..237f27b9 100644
> --- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf
> +++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
> @@ -2,7 +2,7 @@
>  #@NAME: DRA7xx EVM
>  #@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
>  
> -require conf/machine/include/dra7xx.inc
> +require conf/machine/include/am57xx.inc
>  
>  MACHINE_FEATURES += "touchscreen"
>  
> diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc
> index 85290924..c7c8029f 100644
> --- a/meta-ti-bsp/conf/machine/include/am57xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
> @@ -1,5 +1,4 @@
>  require conf/machine/include/omap-a15.inc
> -SOC_FAMILY:append = ":dra7xx"
>  SOC_FAMILY:append = ":am57xx"
>  
>  MACHINE_FEATURES += "pci"
> diff --git a/meta-ti-bsp/conf/machine/include/dra7xx.inc b/meta-ti-bsp/conf/machine/include/dra7xx.inc
> deleted file mode 100644
> index a02421d9..00000000
> --- a/meta-ti-bsp/conf/machine/include/dra7xx.inc
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -require conf/machine/include/omap-a15.inc
> -SOC_FAMILY:append = ":dra7xx"
> -
> -MACHINE_FEATURES += "pci"
> diff --git a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
> index c43afb5b..11d877a6 100644
> --- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
> +++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
> @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684da
>  PV = "${GOODIX_FW_VERSION}"
>  PR = "${INC_PR}.0"
>  
> -COMPATIBLE_MACHINE = "dra7xx"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
>  TARGET = "goodix_9271_cfg.bin"
> diff --git a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
> index ba320f5f..1b1cff6b 100644
> --- a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
> +++ b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
> @@ -2,7 +2,7 @@ SUMMARY = "Radio Application Firmware"
>  LICENSE = "TI-TSPA"
>  LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3"
>  
> -COMPATIBLE_MACHINE = "dra7xx"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  PR = "r1"
>  
> diff --git a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
> index f147b234..4c2ea375 100644
> --- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
> +++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
> @@ -3,7 +3,7 @@ SUMMARY = "VPDMA firmware for Video Input Port and Video Processing Engine"
>  LICENSE = "TI-TSPA"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c"
>  
> -COMPATIBLE_MACHINE = "dra7xx"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vpdma-fw/03-2012/exports/vpdma-fw_03-2012.tar.gz;protocol=http;name=dra7xx-evm"
>  SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e"
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
> index 61a74a06..83d0d128 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
> +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
> @@ -41,7 +41,7 @@ do_compile:append:ti43x() {
>      optee_sign_legacyhs
>  }
>  
> -do_compile:append:dra7xx() {
> +do_compile:append:am57xx() {
>      optee_sign_legacyhs
>  }
>  
> @@ -62,7 +62,7 @@ do_deploy:append:ti43x() {
>      optee_deploy_legacyhs
>  }
>  
> -do_deploy:append:dra7xx() {
> +do_deploy:append:am57xx() {
>      optee_deploy_legacyhs
>  }
>  
> diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
> index da7e4733..7006a9b6 100644
> --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
> +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
> @@ -6,7 +6,7 @@ COMPATIBLE_HOST ?= "null"
>  COMPATIBLE_HOST:ti-soc = ".*-linux"
>  
>  PLATFORM = "UNKNOWN"
> -PLATFORM:dra7xx = "DRA7XX"
> +PLATFORM:am57xx = "DRA7XX"
>  PLATFORM:omapl138 = "OMAPL138"
>  
>  ALT_PLATFORM:am57xx = "AM572X AM571X"
> diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
> index 539a83f9..3e4be816 100644
> --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
> +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
> @@ -22,7 +22,7 @@ SRC_URI += "file://tiipclad-daemon.sh \
>  CFLAGS += "-I${UNPACKDIR} -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}"
>  
>  DAEMON = "UNKNOWN"
> -DAEMON:dra7xx = "lad_dra7xx"
> +DAEMON:am57xx = "lad_dra7xx"
>  DAEMON:omapl138 = "lad_omapl138"
>  
>  inherit autotools-brokensep pkgconfig update-rc.d systemd
> @@ -55,7 +55,7 @@ do_install:append() {
>      install -c -m 755 ${UNPACKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
>  }
>  
> -do_install:append:dra7xx() {
> +do_install:append:am57xx() {
>      install -d ${D}${sysconfdir}/modprobe.d/
>      install -c -m 644 ${UNPACKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/
>  }
> diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
> index bfdf1ac5..bca91df8 100644
> --- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
> +++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
> @@ -3,7 +3,7 @@ LICENSE = "TI-TSPA"
>  
>  LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
>  
> -COMPATIBLE_MACHINE = "dra7xx"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  inherit features_check
>  
> -- 
> 2.39.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc
  2025-12-03 20:32 ` [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc Andrew Davis
@ 2025-12-09 23:54   ` Denys Dmytriyenko
  0 siblings, 0 replies; 5+ messages in thread
From: Denys Dmytriyenko @ 2025-12-09 23:54 UTC (permalink / raw)
  To: afd; +Cc: Ryan Eatmon, meta-ti

On Wed, Dec 03, 2025 at 02:32:11PM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> As am57xx.inc is now the only user of omap-a15.inc, merge the content of
> omap-a15.inc into am57xx.inc and remove omap-a15.inc. As we no longer have
> this common include, also remove "omap-a15" and use "am57xx" in its place.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  meta-ti-bsp/conf/machine/include/am57xx.inc   | 50 +++++++++++++++++--
>  meta-ti-bsp/conf/machine/include/omap-a15.inc | 50 -------------------
>  .../ti-sgx-ddk-km_1.17.4948957.bb             |  4 +-
>  .../libgal/ti-gc320-libs_5.0.11.p7.bb         |  2 +-
>  .../ti-sgx-ddk-um_1.17.4948957.bb             |  4 +-
>  .../dsptop/debugss-module-drv_git.bb          |  2 +-
>  .../recipes-bsp/dsptop/dsptop_git.bb          |  2 +-
>  .../recipes-bsp/dsptop/libulm_git.bb          |  2 +-
>  .../recipes-bsp/pru/pru-icss_git.bb           |  8 +--
>  .../recipes-devtools/gdbc6x/gdbc6x_git.bb     |  2 +-
>  .../gdbc6x/gdbserver-c6x_git.bb               |  2 +-
>  .../gdbc6x/gdbserverproxy-module-drv_git.bb   |  2 +-
>  .../recipes-ti/imglib/imglib-c66x.inc         |  2 +-
>  meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc |  8 +--
>  .../recipes-ti/ipc/ti-ipc-rtos_git.bb         | 10 ++--
>  meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc  |  2 +-
>  16 files changed, 73 insertions(+), 79 deletions(-)
>  delete mode 100644 meta-ti-bsp/conf/machine/include/omap-a15.inc
> 
> diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc
> index c7c8029f..6acc0cb0 100644
> --- a/meta-ti-bsp/conf/machine/include/am57xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
> @@ -1,6 +1,50 @@
> -require conf/machine/include/omap-a15.inc
> +require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":am57xx"
>  
> -MACHINE_FEATURES += "pci"
> +DEFAULTTUNE ?= "armv7athf-neon"
> +require conf/machine/include/arm/armv7a/tune-cortexa15.inc
>  
> -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"
> +require conf/machine/include/ti-bsp.inc
> +
> +# Graphics providers and variables
> +require conf/machine/include/mesa-pvr.inc
> +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
> +
> +KERNEL_IMAGETYPE = "zImage"
> +KERNEL_IMAGETYPES = "zImage uImage"
> +KERNEL_CLASSES += "kernel-uimage"
> +
> +UBOOT_ARCH = "arm"
> +UBOOT_ENTRYPOINT = "0x80008000"
> +UBOOT_LOADADDRESS = "0x80008000"
> +
> +# Generate an extlinux.conf file
> +UBOOT_EXTLINUX = "1"
> +UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
> +UBOOT_EXTLINUX_BOOT_FILES = " \
> +    extlinux.conf;extlinux/extlinux.conf \
> +    ${KERNEL_IMAGETYPE} \
> +    ${DEVICETREE_FILES} \
> +"
> +
> +SPL_BINARY = "MLO"
> +UBOOT_SUFFIX = "img"
> +
> +EXTRA_IMAGEDEPENDS += "virtual/bootloader"
> +
> +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
> +
> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw prueth-fw prusw-fw pruhsr-fw pruprp-fw"
> +
> +# Use the expected value of the ubifs filesystem's volume name in the kernel
> +# and u-boot.
> +UBI_VOLNAME = "rootfs"
> +
> +# List common SoC features, may need to add touchscreen for specific machines
> +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320 pci"
> +
> +IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
> +WKS_FILE ?= "sdimage-2part.wks"
> +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
> +do_image_wic[depends] += "virtual/bootloader:do_deploy"
> +do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
> diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
> deleted file mode 100644
> index 8e029431..00000000
> --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -require conf/machine/include/ti-soc.inc
> -SOC_FAMILY:append = ":omap-a15"
> -
> -DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/arm/armv7a/tune-cortexa15.inc
> -
> -require conf/machine/include/ti-bsp.inc
> -
> -# Graphics providers and variables
> -require conf/machine/include/mesa-pvr.inc
> -PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
> -
> -KERNEL_IMAGETYPE = "zImage"
> -KERNEL_IMAGETYPES = "zImage uImage"
> -KERNEL_CLASSES += "kernel-uimage"
> -
> -UBOOT_ARCH = "arm"
> -UBOOT_ENTRYPOINT = "0x80008000"
> -UBOOT_LOADADDRESS = "0x80008000"
> -
> -# Generate an extlinux.conf file
> -UBOOT_EXTLINUX = "1"
> -UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
> -UBOOT_EXTLINUX_BOOT_FILES = " \
> -    extlinux.conf;extlinux/extlinux.conf \
> -    ${KERNEL_IMAGETYPE} \
> -    ${DEVICETREE_FILES} \
> -"
> -
> -SPL_BINARY = "MLO"
> -UBOOT_SUFFIX = "img"
> -
> -EXTRA_IMAGEDEPENDS += "virtual/bootloader"
> -
> -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
> -
> -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
> -
> -# Use the expected value of the ubifs filesystem's volume name in the kernel
> -# and u-boot.
> -UBI_VOLNAME = "rootfs"
> -
> -# List common SoC features, may need to add touchscreen for specific machines
> -MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa mmip dsp gc320"
> -
> -IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
> -WKS_FILE ?= "sdimage-2part.wks"
> -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
> -do_image_wic[depends] += "virtual/bootloader:do_deploy"
> -do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
> diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> index f5cea270..343f09de 100644
> --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> @@ -7,7 +7,7 @@ inherit module
>  
>  PROVIDES = "virtual/gpudriver"
>  
> -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
> +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
> @@ -19,9 +19,9 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;
>  
>  SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d"
>  
> -TARGET_PRODUCT:omap-a15 = "ti572x_linux"
>  TARGET_PRODUCT:ti33x = "ti335x_linux"
>  TARGET_PRODUCT:ti43x = "ti437x_linux"
> +TARGET_PRODUCT:am57xx = "ti572x_linux"
>  TARGET_PRODUCT:am65xx = "ti654x_linux"
>  PVR_BUILD = "release"
>  PVR_WS = "lws-generic"
> diff --git a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
> index bd7cf015..86aa71b8 100644
> --- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
> +++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
> @@ -7,7 +7,7 @@ inherit features_check
>  
>  REQUIRED_MACHINE_FEATURES = "gc320"
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  CLEANBROKEN = "1"
>  
> diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
> index af27981f..c4cc5f10 100644
> --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
> +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
> @@ -4,7 +4,7 @@ LICENSE = "TI-TSPA"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
> +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx"
>  
>  PR = "r38"
>  
> @@ -37,7 +37,7 @@ inherit ${@pick_init(d)}
>  
>  TARGET_PRODUCT:ti33x = "ti335x_linux"
>  TARGET_PRODUCT:ti43x = "ti437x_linux"
> -TARGET_PRODUCT:omap-a15 = "ti572x_linux"
> +TARGET_PRODUCT:am57xx = "ti572x_linux"
>  TARGET_PRODUCT:am65xx = "ti654x_linux"
>  
>  RDEPENDS:${PN} += "libdrm ti-sgx-ddk-km"
> diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
> index fdb16ec4..e80591b2 100644
> --- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
> +++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
> @@ -8,7 +8,7 @@ S:append = "/debugss_module/debugss-mod"
>  
>  inherit module
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
>  
> diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
> index c1080468..c5242d5e 100644
> --- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
> +++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
> @@ -8,7 +8,7 @@ PR = "${INC_PR}.2"
>  
>  S:append = "/dsptop"
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
>  
> diff --git a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
> index 1bcaa0ea..638973c4 100644
> --- a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
> +++ b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
> @@ -11,7 +11,7 @@ PR = "${INC_PR}.0"
>  
>  S:append = "/dsptop/ulm"
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX}"
>  
> diff --git a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
> index 84d00eed..b7066583 100644
> --- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
> +++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
> @@ -14,7 +14,7 @@ PV = "6.5.0"
>  
>  require recipes-ti/includes/ti-paths.inc
>  
> -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e"
> +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am62xx|am64xx|am65xx|j721e"
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
>  PACKAGES:prepend = " \
> @@ -36,7 +36,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
>  
>  PLATFORM:ti33x = "am335x"
>  PLATFORM:ti43x = "am437x"
> -PLATFORM:omap-a15 = "am572x"
> +PLATFORM:am57xx = "am572x"
>  PLATFORM:am62xx = "am62x"
>  PLATFORM:am64xx = "am64x"
>  PLATFORM:am65xx = "am65x"
> @@ -84,7 +84,7 @@ do_install:append:ti43x() {
>      done
>  }
>  
> -do_install:append:omap-a15() {
> +do_install:append:am57xx() {
>      install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU_Halt.out \
>                     ${D}${nonarch_base_libdir}/firmware/pru
>      for i in 1 2
> @@ -182,7 +182,7 @@ FILES:${PN}-rpmsg-echo = "${nonarch_base_libdir}/firmware/pru/PRU_RPMsg_Echo_Int
>  # Set up names for the firmwares
>  PRU_ICSS_ALTERNATIVES:ti33x    = "am335x-pru0-fw am335x-pru1-fw"
>  PRU_ICSS_ALTERNATIVES:ti43x    = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
> -PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
> +PRU_ICSS_ALTERNATIVES:am57xx   = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
>  PRU_ICSS_ALTERNATIVES:am62xx   = "am62x-pru0-fw am62x-pru1-fw"
>  PRU_ICSS_ALTERNATIVES:am64xx   = "am64x-pru0_0-fw am64x-pru0_1-fw am64x-pru1_0-fw am64x-pru1_1-fw am64x-rtu0_0-fw am64x-rtu0_1-fw am64x-rtu1_0-fw am64x-rtu1_1-fw"
>  PRU_ICSS_ALTERNATIVES:am65xx   = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw"
> diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
> index 3e6dfbff..521d06fe 100644
> --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
> +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f
>  
>  DEPENDS = "ncurses bison-native texinfo flex-native gettext"
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  PR = "${INC_PR}.1"
>  
> diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
> index a2d8da75..bcb9624f 100644
> --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
> +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
> @@ -8,7 +8,7 @@ PR = "${INC_PR}.0"
>  
>  S:append = "/gdbserver-c6x/src"
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM"
>  
> diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
> index 1e4fd6c5..799ba019 100644
> --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
> +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
> @@ -13,7 +13,7 @@ S:append = "/kernel_module/gdbproxy-mod"
>  
>  inherit module
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
>  
> diff --git a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
> index 8fa2ceca..3c5efeb1 100644
> --- a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
> +++ b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
> @@ -8,7 +8,7 @@ require ../includes/ti-paths.inc
>  require ../includes/ti-staging.inc
>  require ../includes/ti-unpack.inc
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib"
>  
> diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
> index 2f93db72..0b2ef9f5 100644
> --- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
> +++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
> @@ -41,16 +41,16 @@ RELEASE_SUFFIX = ""
>  
>  PR = "${INC_PR}.r0"
>  
> -DEPENDS:append:omap-a15 = " ti-cgt6x-native \
> -                            ti-cgt-arm-native \
> -                            gcc-arm-baremetal-native \
> +DEPENDS:append:am57xx = " ti-cgt6x-native \
> +                          ti-cgt-arm-native \
> +                          gcc-arm-baremetal-native \
>  "
>  DEPENDS:append:omapl138 = " ti-cgt6x-native \
>  "
>  
>  IPC_TARGETS = ""
>  
> -IPC_TARGETS:omap-a15 = "\
> +IPC_TARGETS:am57xx = "\
>      gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \
>      ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
>      ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \
> diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
> index d2ac6276..2162a1ac 100644
> --- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
> +++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
> @@ -81,11 +81,11 @@ KFPLAT = ""
>  ALTERNATIVE_PRIORITY = "5"
>  
>  ALTERNATIVE:${PN}-fw:omapl138 = "rproc-dsp-fw"
> -ALTERNATIVE:${PN}-fw:omap-a15 = "dra7-dsp1-fw.xe66 \
> -                                 dra7-dsp2-fw.xe66 \
> -                                 dra7-ipu1-fw.xem4 \
> -                                 dra7-ipu2-fw.xem4 \
> -                                "
> +ALTERNATIVE:${PN}-fw:am57xx = "dra7-dsp1-fw.xe66 \
> +                               dra7-dsp2-fw.xe66 \
> +                               dra7-ipu1-fw.xem4 \
> +                               dra7-ipu2-fw.xem4 \
> +                              "
>  
>  ALTERNATIVE_LINK_NAME[rproc-dsp-fw] = "${nonarch_base_libdir}/firmware/rproc-dsp-fw"
>  ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp1-fw.xe66"
> diff --git a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
> index 94c5d33b..c7c14f91 100644
> --- a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
> +++ b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
> @@ -7,7 +7,7 @@ require ../includes/ti-paths.inc
>  require ../includes/ti-staging.inc
>  require ../includes/ti-eula-unpack.inc
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "am57xx"
>  
>  SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin"
>  
> -- 
> 2.39.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-12-09 23:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-03 20:32 [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support Andrew Davis
2025-12-03 20:32 ` [meta-ti][master][PATCH 2/2] meta-ti/all: Merge omap-a15.inc into am57xx.inc Andrew Davis
2025-12-09 23:54   ` Denys Dmytriyenko
2025-12-03 20:42 ` [meta-ti][master][PATCH 1/2] meta-ti/all: Make DRA7xx support a subset of AM57xx support PRC Automation
2025-12-09 23:53 ` Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.