From e1fd715c8486fdf7453b606476c7d18eae901b80 Mon Sep 17 00:00:00 2001
From: Andrew Davis <afd@ti.com>
Date: Thu, 2 Oct 2025 08:54:51 -0500
Subject: [PATCH] meta-ti-extras: dsptop: Simplify for DRA7xx only build

This recipe is already only compatible with the DRA7xx machine, so
no need to set PLATFORM based on the only possibility. This then
allows us to directly set the compile flags for the same. And now
that the package does not change based on the machine, remove the
PACKAGE_ARCH line.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../recipes-bsp/dsptop/debugss-module-drv_git.bb          | 8 ++------
 meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb           | 8 ++------
 meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb           | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

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 b1fa3ab8..c82f6071 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,13 +8,9 @@ S = "${WORKDIR}/git/debugss_module/debugss-mod"
 
 inherit module
 
-PLATFORM = ""
-PLATFORM:dra7xx = "DRA7xx_PLATFORM"
-
-EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}' KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
-
 COMPATIBLE_MACHINE = "dra7xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+EXTRA_OEMAKE = "PLATFORM=DRA7xx_PLATFORM KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 
 include dsptop.inc
 
diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
index c725202a..22111cf7 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
@@ -8,19 +8,15 @@ PR = "${INC_PR}.2"
 
 S = "${WORKDIR}/git/dsptop"
 
-DEVICE = ""
-DEVICE:dra7xx = "DRA7xx"
+COMPATIBLE_MACHINE = "dra7xx"
 
-EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
+EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
 
 do_install() {
     oe_runmake install DESTDIR=${D}
     chown -R root:root ${D}
 }
 
-COMPATIBLE_MACHINE = "dra7xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 RDEPENDS:${PN} = "debugss-module-drv bash"
 
 include dsptop.inc
diff --git a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
index a4670b6e..3365ed07 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
@@ -11,10 +11,9 @@ PR = "${INC_PR}.0"
 
 S = "${WORKDIR}/git/dsptop/ulm"
 
-DEVICE = ""
-DEVICE:dra7xx = "DRA7xx"
+COMPATIBLE_MACHINE = "dra7xx"
 
-EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "release DEVICE=DRA7xx CROSS_COMPILE=${TARGET_PREFIX}"
 
 do_compile() {
     oe_runmake arm XPORT_ONLY CC="${CC}"
@@ -31,9 +30,6 @@ do_install() {
     cp -f release/libtiulm.ae66 ${D}${datadir}/ti/ulm
 }
 
-COMPATIBLE_MACHINE = "dra7xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 FILES:${PN}-dev += "\
     ${datadir}/ti/ulm \
 "