1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-01-12 01:20:20 +00:00

meta-ti/all: Make DRA7xx support a subset of AM57xx support

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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2025-12-03 14:32:10 -06:00
committed by Ryan Eatmon
parent 534edb03e5
commit 3a9e75ebba
11 changed files with 10 additions and 16 deletions

View File

@@ -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:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"
TI_SECURE_DEV_PKG:ti43x = "${TI_SECURE_DEV_PKG_CAT}/am4x" 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: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 # The SECDEV scripts may need their own location provided through the environment
export TI_SECURE_DEV_PKG export TI_SECURE_DEV_PKG

View File

@@ -2,7 +2,7 @@
#@NAME: DRA7xx EVM #@NAME: DRA7xx EVM
#@DESCRIPTION: Machine configuration for the TI 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" MACHINE_FEATURES += "touchscreen"

View File

@@ -1,5 +1,4 @@
require conf/machine/include/omap-a15.inc require conf/machine/include/omap-a15.inc
SOC_FAMILY:append = ":dra7xx"
SOC_FAMILY:append = ":am57xx" SOC_FAMILY:append = ":am57xx"
MACHINE_FEATURES += "pci" MACHINE_FEATURES += "pci"

View File

@@ -1,4 +0,0 @@
require conf/machine/include/omap-a15.inc
SOC_FAMILY:append = ":dra7xx"
MACHINE_FEATURES += "pci"

View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684da
PV = "${GOODIX_FW_VERSION}" PV = "${GOODIX_FW_VERSION}"
PR = "${INC_PR}.0" PR = "${INC_PR}.0"
COMPATIBLE_MACHINE = "dra7xx" COMPATIBLE_MACHINE = "am57xx"
ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin" ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin"
TARGET = "goodix_9271_cfg.bin" TARGET = "goodix_9271_cfg.bin"

View File

@@ -2,7 +2,7 @@ SUMMARY = "Radio Application Firmware"
LICENSE = "TI-TSPA" LICENSE = "TI-TSPA"
LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3" 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" PR = "r1"

View File

@@ -3,7 +3,7 @@ SUMMARY = "VPDMA firmware for Video Input Port and Video Processing Engine"
LICENSE = "TI-TSPA" LICENSE = "TI-TSPA"
LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c" 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 = "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" SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e"

View File

@@ -43,7 +43,7 @@ do_compile:append:ti43x() {
optee_sign_legacyhs optee_sign_legacyhs
} }
do_compile:append:dra7xx() { do_compile:append:am57xx() {
optee_sign_legacyhs optee_sign_legacyhs
} }
@@ -64,7 +64,7 @@ do_deploy:append:ti43x() {
optee_deploy_legacyhs optee_deploy_legacyhs
} }
do_deploy:append:dra7xx() { do_deploy:append:am57xx() {
optee_deploy_legacyhs optee_deploy_legacyhs
} }

View File

@@ -6,7 +6,7 @@ COMPATIBLE_HOST ?= "null"
COMPATIBLE_HOST:ti-soc = ".*-linux" COMPATIBLE_HOST:ti-soc = ".*-linux"
PLATFORM = "UNKNOWN" PLATFORM = "UNKNOWN"
PLATFORM:dra7xx = "DRA7XX" PLATFORM:am57xx = "DRA7XX"
PLATFORM:omapl138 = "OMAPL138" PLATFORM:omapl138 = "OMAPL138"
ALT_PLATFORM:am57xx = "AM572X AM571X" ALT_PLATFORM:am57xx = "AM572X AM571X"

View File

@@ -22,7 +22,7 @@ SRC_URI += "file://tiipclad-daemon.sh \
CFLAGS += "-I${UNPACKDIR} -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}" CFLAGS += "-I${UNPACKDIR} -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}"
DAEMON = "UNKNOWN" DAEMON = "UNKNOWN"
DAEMON:dra7xx = "lad_dra7xx" DAEMON:am57xx = "lad_dra7xx"
DAEMON:omapl138 = "lad_omapl138" DAEMON:omapl138 = "lad_omapl138"
inherit autotools-brokensep pkgconfig update-rc.d systemd 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} 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 -d ${D}${sysconfdir}/modprobe.d/
install -c -m 644 ${UNPACKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/ install -c -m 644 ${UNPACKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/
} }

View File

@@ -3,7 +3,7 @@ LICENSE = "TI-TSPA"
LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
COMPATIBLE_MACHINE = "dra7xx" COMPATIBLE_MACHINE = "am57xx"
inherit features_check inherit features_check