| Message ID | 20251107214128.1491466-4-afd@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-arago,master,1/5] tisdk-core-bundle: Make DTB filter work with DRA7xx HS EVM | expand |
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc index 200ccf52..2e3a3072 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc @@ -7,7 +7,7 @@ IMAGE_NAME_SUFFIX = "" inherit tisdk-bundle -COMPATIBLE_MACHINE = "omapl138|ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "omapl138|ti33x|ti43x|am57xx|k3" # List of packages to remove from the host package. This is usually due to # licensing issues and unneeded dependencies. @@ -18,7 +18,6 @@ TOOLCHAIN_CLEANUP_PACKAGES = "libgnutls-dev libgnutls-extra26 libgnutls-openssl2 # picking up DTB files for devices with no DTB support. DTB_FILTER = "unknown" DTB_FILTER:ti33x = "am335x" -DTB_FILTER:dra7xx = "dra7" DTB_FILTER:am57xx = "am57xx" DTB_FILTER:ti43x = "am43" DTB_FILTER:omapl138 = "da850" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-bootstrap.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-bootstrap.bb index 3c05895a..a1b9636d 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-bootstrap.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-bootstrap.bb @@ -42,7 +42,7 @@ UTILS:append:ti43x = " \ omapconf \ " -UTILS:append:omap-a15 = " \ +UTILS:append:am57xx = " \ omapconf \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb index 2a4bc0eb..f309dc4a 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb @@ -19,7 +19,7 @@ GSTREAMER_DEPS = " \ GSTREAMER_DEPS:append:arago = " gstreamer1.0-libav" GSTREAMER_ACCEL_MM = "" -#GSTREAMER_ACCEL_MM:omap-a15 = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', "gstreamer1.0-plugins-ducati", '', d)}" +#GSTREAMER_ACCEL_MM:am57xx = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', "gstreamer1.0-plugins-ducati", '', d)}" #GSTREAMER_ACCEL_MM:append:dra7xx = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', " gstreamer1.0-plugins-vpe", '', d)}" RDEPENDS:${PN} = "\ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb index 9f5e189e..95be18ba 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb @@ -38,7 +38,7 @@ IPCDEV = " \ ti-ipc-staticdev \ " -EXTRA_PACKAGES:append:omap-a15 = " ${IPCDEV}" +EXTRA_PACKAGES:append:am57xx = " ${IPCDEV}" EXTRA_PACKAGES:append:omapl138 = " ${IPCDEV}" RDEPENDS:${PN} = "\ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb index 58fffd26..67f3de16 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb @@ -42,7 +42,7 @@ UTILS:append:ti43x = " mmc-utils \ pru-icss \ " -UTILS:append:omap-a15 = " mmc-utils \ +UTILS:append:am57xx = " mmc-utils \ switch-config \ libdrm-omap \ stream-openmp \ @@ -72,8 +72,8 @@ UTILS:append:j721e = " pru-icss" UTILS:append:omapl138 = " ti-ipc-rtos-fw" -UTILS:append:dra7xx = " \ - ${UTILS_DSP} \ +UTILS:append:am57xx = " \ + ${UTILS_DSP} \ " EXTRA_PACKAGES = " \ @@ -86,7 +86,7 @@ EXTRA_PACKAGES:omapl138 = " \ protobuf \ " -EXTRA_PACKAGES:append:omap-a15 = " ti-ipc-examples-linux" +EXTRA_PACKAGES:append:am57xx = " ti-ipc-examples-linux" RDEPENDS:${PN} = "\ ${UTILS} \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb index 6eb49b46..54690317 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb @@ -26,7 +26,7 @@ MULTIMEDIA:append:dra7xx = " \ ACCEL_MM = "" -ACCEL_MM:append:omap-a15 = " \ +ACCEL_MM:append:am57xx = " \ ipumm-fw \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index 64af6d93..25642831 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -8,7 +8,7 @@ inherit packagegroup INSANE_SKIP:${PN} += "dev-deps" CHROMIUM = "" -CHROMIUM:append:omap-a15 = "\ +CHROMIUM:append:am57xx = "\ chromium-ozone-wayland \ " CHROMIUM:append:k3 = "\ diff --git a/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb b/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb index c2076099..936e61e8 100644 --- a/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb +++ b/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb @@ -3,7 +3,7 @@ SUMMARY = "Test application for GC320 2D API" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://dra7x-sdk-ti-gc320-tests_manifest.html;md5=22a001855467f373c47f45de5330e3c9" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" DEPENDS = "ti-gc320-libs" diff --git a/meta-arago-test/recipes-core/packagegroups/ti-test.bb b/meta-arago-test/recipes-core/packagegroups/ti-test.bb index cb779123..f47cebe1 100644 --- a/meta-arago-test/recipes-core/packagegroups/ti-test.bb +++ b/meta-arago-test/recipes-core/packagegroups/ti-test.bb @@ -115,7 +115,7 @@ TI_TEST_TI_TOOLS:append:ti43x = " \ switch-config \ " -TI_TEST_TI_TOOLS:append:omap-a15 = " \ +TI_TEST_TI_TOOLS:append:am57xx = " \ omapconf \ pru-icss \ switch-config \ diff --git a/meta-arago-test/recipes-devtools/omapconf/omapconf_git.bb b/meta-arago-test/recipes-devtools/omapconf/omapconf_git.bb index 53fd3e12..84226dd8 100644 --- a/meta-arago-test/recipes-devtools/omapconf/omapconf_git.bb +++ b/meta-arago-test/recipes-devtools/omapconf/omapconf_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=205c83c4e2242a765acb923fc766e914" PV = "1.75+git" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" BRANCH ?= "master" SRCREV = "ff07b6992bacb1e1586c72b7d2be469caee4a347"
The "omap-a15" is a bit of a legacy holdover and is confusing. This causes issues with mixed usage of 'dra7xx' and 'omap-a15'. For example all EVM using the AM57xx SoC family include dra7x.inc so both are always defined, then we use 'omap-a15' in several places where we really mean just 'am57xx'. 'dra7xx' can't be filtered for as needed like in the case of PRU. AM57x is arguably the real superset device and DRA7x support is being removed, so rename all uses of the combined 'omap-a15' to 'am57xx'. Signed-off-by: Andrew Davis <afd@ti.com> --- .../recipes-core/images/tisdk-core-bundle.inc | 3 +-- .../packagegroups/packagegroup-arago-bootstrap.bb | 2 +- .../recipes-core/packagegroups/packagegroup-arago-gst.bb | 2 +- .../packagegroup-arago-tisdk-addons-sdk-target.bb | 2 +- .../packagegroups/packagegroup-arago-tisdk-addons.bb | 8 ++++---- .../packagegroups/packagegroup-arago-tisdk-multimedia.bb | 2 +- meta-arago-distro/recipes-core/packagegroups/ti-world.bb | 2 +- .../ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb | 2 +- meta-arago-test/recipes-core/packagegroups/ti-test.bb | 2 +- meta-arago-test/recipes-devtools/omapconf/omapconf_git.bb | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-)