Rename machine from omap-a15 to am57xx
PATCH 1/1 Rename machine from omap-a15 to am57xx
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 this SoC family include dra7x.inc so both are always defined, then we use 'omap-a15' in several places where we really mean 'am57xx'. 'dra7xx' can't be filtered for as needed like in the case of PRU.
AM57x is arguably the real superset device. Lets use that name then start filtering correctly out the DRA7x to only be used when we actually mean DRA7x.
This patch makes no functional change.
---
.../conf/machine/include/{omap-a15.inc => am57xx.inc} | 2 +-
meta-ti-bsp/conf/machine/include/dra7xx.inc | 2 +-
.../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++--
.../recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb | 6 +++---
.../recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb | 2 +-
.../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 4 ++--
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb | 8 ++++----
meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc | 2 +-
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc | 8 ++++----
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb | 4 ++--
meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb | 6 +++---
.../recipes-ti/uio-test-pruss/uio-test-pruss_git.bb | 4 ++--
meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc | 2 +-
13 files changed, 27 insertions(+), 27 deletions(-)
rename meta-ti-bsp/conf/machine/include/{omap-a15.inc => am57xx.inc} (98%)meta-ti-bsp/conf/machine/include/am57xx.inc renamed from meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
@@ -1,5 +1,5 @@ require conf/machine/include/ti-soc.inc -SOC_FAMILY:append = ":omap-a15" +SOC_FAMILY:append = ":am57xx" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/arm/armv7a/tune-cortexa15.inc
meta-ti-bsp/conf/machine/include/dra7xx.inc +1 -1
@@ -1,4 +1,4 @@ -require conf/machine/include/omap-a15.inc +require conf/machine/include/am57xx.inc SOC_FAMILY:append = ":dra7xx" MACHINE_FEATURES += "pci"
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +2 -2
@@ -7,7 +7,7 @@ inherit module features_check REQUIRED_MACHINE_FEATURES = "gpu" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|k3" MACHINE_KERNEL_PR:append = "x" PR = "${MACHINE_KERNEL_PR}"
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git" SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" +TARGET_PRODUCT:am57xx = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:k3 = "ti654x"
meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb +3 -3
@@ -4,10 +4,10 @@ include uio-module-drv.inc PR = "r1" -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" +COMPATIBLE_MACHINE = "am57xx|ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" -DEVICE_NAME:omap-a15 = "am57xx" +DEVICE_NAME:am57xx = "am57xx" DEVICE_NAME:ti33x = "am33xx" DEVICE_NAME:ti43x = "am43xx" RDEPENDS:${PN} = "uio-module-drv"
@@ -22,7 +22,7 @@ do_install() { install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/. } -do_install:append:omap-a15 () { +do_install:append:am57xx () { install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/. }
meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +1 -1
@@ -7,7 +7,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gc320" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" CLEANBROKEN = "1"
meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +2 -2
@@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx" PR = "r37"
@@ -17,7 +17,7 @@ BRANCH = "ti-img-sgx/dunfell/${PV}" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" SRCREV = "742cf38aba13e1ba1a910cf1f036a1a212c263b6" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" +TARGET_PRODUCT:am57xx = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:am65xx = "ti654x"
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +4 -4
@@ -15,7 +15,7 @@ PR = "r0" require recipes-ti/includes/ti-paths.inc -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES:prepend = " \
@@ -39,7 +39,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs" PLATFORM:ti33x = "am335x" PLATFORM:ti43x = "am437x" -PLATFORM:omap-a15 = "am572x" +PLATFORM:am57xx = "am572x" PLATFORM:am64xx = "am64x" PLATFORM:am65xx = "am65x" PLATFORM:j7 = "j721e"
@@ -86,7 +86,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
@@ -174,7 +174,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: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" PRU_ICSS_ALTERNATIVES:j7 = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"
meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc +1 -1
@@ -7,7 +7,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"
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc +4 -4
@@ -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" \
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb +2 -2
@@ -78,14 +78,14 @@ KFPLAT = "" ALTERNATIVE_PRIORITY = "5" -pkg_postinst:${PN}-fw:omap-a15 () { +pkg_postinst:${PN}-fw:am57xx () { update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY} } -pkg_postrm:${PN}-fw:omap-a15 () { +pkg_postrm:${PN}-fw:am57xx () { update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4
meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb +3 -3
@@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a697230 DEPENDS = "common-csl-ip-rtos doxygen-native libulm ti-xdctools-native ti-ipc-rtos ti-sysbios ti-cgt6x-native zip-native" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git"
@@ -39,10 +39,10 @@ export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" export BUILD_AM572 = "0" -BUILD_AM572:omap-a15 = "1" +BUILD_AM572:am57xx = "1" RELEASE_TARGET = "" -RELEASE_TARGET:omap-a15 = "am57xx" +RELEASE_TARGET:am57xx = "am57xx" do_compile() { make -f utils/product/Makefile .zipfile
meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb +2 -2
@@ -21,12 +21,12 @@ SRCREV = "${UIO_TEST_PRUSS_SRCREV}" PR = "r0" -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" +COMPATIBLE_MACHINE = "am57xx|ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" DEVICE_NAME = "" -DEVICE_NAME:append:am57xx-evm = "am57xx" +DEVICE_NAME:append:am57xx = "am57xx" DEVICE_NAME:append:ti33x = "am33xx" DEVICE_NAME:append:ti43x = "am43xx"
meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc +1 -1
@@ -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"
Signature · 1 line
2.17.1
Andrew,
In the subject - omap-a15 is not a machine, but an SoC family, at least from OE perspective.
Quoted 10 lines · Andrew Davis via lists.yoctoproject.org
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 this SoC family include dra7x.inc so both are always defined, then we use 'omap-a15' in several places where we really mean 'am57xx'. 'dra7xx' can't be filtered for as needed like in the case of PRU.
AM57x is arguably the real superset device. Lets use that name then start filtering correctly out the DRA7x to only be used when we actually mean DRA7x.
There were machines in omap-a15 family that were not in dra7xx family, but those got deprecated from meta-ti by now. E.g. OMAP5 uEVM, which is still supported in the kernel:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/omap5-uevm.dts
Since original AM57xx and DRA7xx use pretty much the same SoC (but EVMs are different), there never was a need for separate SoC families for them.
So, omap-a15 was a superset of dra7xx. The only remaining difference between them that's left, is omap-a15 doesn't have "pci" enabled. So, if you are renaming it into am57xx, that means that all derived AM57xx machines won't have it enabled either...
Quoted 286 lines
This patch makes no functional change.
Signed-off-by Andrew Davis <[email protected]>--- .../conf/machine/include/{omap-a15.inc => am57xx.inc} | 2 +- meta-ti-bsp/conf/machine/include/dra7xx.inc | 2 +- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++-- .../recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb | 6 +++--- .../recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb | 2 +- .../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 4 ++-- meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb | 8 ++++---- meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc | 2 +- meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc | 8 ++++---- meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb | 4 ++-- meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb | 6 +++--- .../recipes-ti/uio-test-pruss/uio-test-pruss_git.bb | 4 ++-- meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) rename meta-ti-bsp/conf/machine/include/{omap-a15.inc => am57xx.inc} (98%)meta-ti-bsp/conf/machine/include/am57xx.inc renamed from meta-ti-bsp/conf/machine/include/omap-a15.inc +1
-1@@ -1,5 +1,5 @@ require conf/machine/include/ti-soc.inc -SOC_FAMILY:append = ":omap-a15" +SOC_FAMILY:append = ":am57xx" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/arm/armv7a/tune-cortexa15.incmeta-ti-bsp/conf/machine/include/dra7xx.inc +1
-1@@ -1,4 +1,4 @@ -require conf/machine/include/omap-a15.inc +require conf/machine/include/am57xx.inc SOC_FAMILY:append = ":dra7xx" MACHINE_FEATURES += "pci"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +2
-2@@ -7,7 +7,7 @@ inherit module features_check REQUIRED_MACHINE_FEATURES = "gpu" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|k3" MACHINE_KERNEL_PR:append = "x" PR = "${MACHINE_KERNEL_PR}"@@ -26,7 +26,7 @@ S = "${WORKDIR}/git" SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" +TARGET_PRODUCT:am57xx = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:k3 = "ti654x"meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb +3
-3@@ -4,10 +4,10 @@ include uio-module-drv.inc PR = "r1" -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" +COMPATIBLE_MACHINE = "am57xx|ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" -DEVICE_NAME:omap-a15 = "am57xx" +DEVICE_NAME:am57xx = "am57xx" DEVICE_NAME:ti33x = "am33xx" DEVICE_NAME:ti43x = "am43xx" RDEPENDS:${PN} = "uio-module-drv"@@ -22,7 +22,7 @@ do_install() { install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/. } -do_install:append:omap-a15 () { +do_install:append:am57xx () { install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/. }meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +1
-1@@ -7,7 +7,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gc320" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" CLEANBROKEN = "1"meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +2
-2@@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx" PR = "r37"@@ -17,7 +17,7 @@ BRANCH = "ti-img-sgx/dunfell/${PV}" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" SRCREV = "742cf38aba13e1ba1a910cf1f036a1a212c263b6" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" +TARGET_PRODUCT:am57xx = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:am65xx = "ti654x"meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +4
-4@@ -15,7 +15,7 @@ PR = "r0" require recipes-ti/includes/ti-paths.inc -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES:prepend = " \@@ -39,7 +39,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs" PLATFORM:ti33x = "am335x" PLATFORM:ti43x = "am437x" -PLATFORM:omap-a15 = "am572x" +PLATFORM:am57xx = "am572x" PLATFORM:am64xx = "am64x" PLATFORM:am65xx = "am65x" PLATFORM:j7 = "j721e"@@ -86,7 +86,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@@ -174,7 +174,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: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" PRU_ICSS_ALTERNATIVES:j7 = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc +1
-1@@ -7,7 +7,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"meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc +4
-4@@ -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" \meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb +2
-2@@ -78,14 +78,14 @@ KFPLAT = "" ALTERNATIVE_PRIORITY = "5" -pkg_postinst:${PN}-fw:omap-a15 () { +pkg_postinst:${PN}-fw:am57xx () { update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY} } -pkg_postrm:${PN}-fw:omap-a15 () { +pkg_postrm:${PN}-fw:am57xx () { update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb +3
-3@@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a697230 DEPENDS = "common-csl-ip-rtos doxygen-native libulm ti-xdctools-native ti-ipc-rtos ti-sysbios ti-cgt6x-native zip-native" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git"@@ -39,10 +39,10 @@ export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" export BUILD_AM572 = "0" -BUILD_AM572:omap-a15 = "1" +BUILD_AM572:am57xx = "1" RELEASE_TARGET = "" -RELEASE_TARGET:omap-a15 = "am57xx" +RELEASE_TARGET:am57xx = "am57xx" do_compile() { make -f utils/product/Makefile .zipfilemeta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb +2
-2@@ -21,12 +21,12 @@ SRCREV = "${UIO_TEST_PRUSS_SRCREV}" PR = "r0" -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" +COMPATIBLE_MACHINE = "am57xx|ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" DEVICE_NAME = "" -DEVICE_NAME:append:am57xx-evm = "am57xx" +DEVICE_NAME:append:am57xx = "am57xx" DEVICE_NAME:append:ti33x = "am33xx" DEVICE_NAME:append:ti43x = "am43xx"meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc +1
-1@@ -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"Signature · 1 line
2.17.1
Quoted 5 lines · Denys Dmytriyenko
Andrew,
In the subject - omap-a15 is not a machine, but an SoC family, at least from OE perspective.
Will fix the wording.
Quoted 9 lines · Andrew Davis via lists.yoctoproject.org
Quoted 7 lines
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 this SoC family include dra7x.inc so both are always defined, then we use 'omap-a15' in several places where we really mean 'am57xx'. 'dra7xx' can't be filtered for as needed like in the case of PRU.
Quoted 9 lines
Quoted 3 lines
AM57x is arguably the real superset device. Lets use that name then start filtering correctly out the DRA7x to only be used when we actually mean DRA7x.
There were machines in omap-a15 family that were not in dra7xx family, but those got deprecated from meta-ti by now. E.g. OMAP5 uEVM, which is still supported in the kernel:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/omap5-uevm.dts
Right, so lets remove that name from meta-ti to avoid any confustion.
Quoted 3 lines
Since original AM57xx and DRA7xx use pretty much the same SoC (but EVMs are different), there never was a need for separate SoC families for them.
Which is why we can make the SoC family at least match some existing SoC. Then still make changes based on EVM if needed. That's the issue I'm trying to fix, there is some confusion it seems for folks adding features for only DRA7x or AM57x. Since both sets of EVM use both have defined 'omap-a15' and 'dra7' SoC family I'm seeing them used interchangeably and when we actually what to differentiate (but that doesn't end up working, as said, all EVMs include both defines).
Quoted 5 lines
So, omap-a15 was a superset of dra7xx. The only remaining difference between them that's left, is omap-a15 doesn't have "pci" enabled. So, if you are renaming it into am57xx, that means that all derived AM57xx machines won't have it enabled either...
If omap-a15 doesn't have PCI and dra7xx does, wouldn't that make dra7xx the superset device..
Anyway, plan is to fold pci into the parent include, then just remove SoC family 'dra7' and drop PCI disablement specific to the dra7 as it should be.
Andrew
Quoted 287 lines
Quoted 287 lines
This patch makes no functional change.
Signed-off-by Andrew Davis <[email protected]>--- .../conf/machine/include/{omap-a15.inc => am57xx.inc} | 2 +- meta-ti-bsp/conf/machine/include/dra7xx.inc | 2 +- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++-- .../recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb | 6 +++--- .../recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb | 2 +- .../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 4 ++-- meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb | 8 ++++---- meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc | 2 +- meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc | 8 ++++---- meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb | 4 ++-- meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb | 6 +++--- .../recipes-ti/uio-test-pruss/uio-test-pruss_git.bb | 4 ++-- meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-)rename meta-ti-bsp/conf/machine/include/{omap-a15.inc => am57xx.inc} (98%)
meta-ti-bsp/conf/machine/include/am57xx.inc renamed from meta-ti-bsp/conf/machine/include/omap-a15.inc +1
-1@@ -1,5 +1,5 @@ require conf/machine/include/ti-soc.inc -SOC_FAMILY:append = ":omap-a15" +SOC_FAMILY:append = ":am57xx" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/arm/armv7a/tune-cortexa15.incmeta-ti-bsp/conf/machine/include/dra7xx.inc +1
-1@@ -1,4 +1,4 @@ -require conf/machine/include/omap-a15.inc +require conf/machine/include/am57xx.inc SOC_FAMILY:append = ":dra7xx" MACHINE_FEATURES += "pci"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +2
-2@@ -7,7 +7,7 @@ inherit module features_check REQUIRED_MACHINE_FEATURES = "gpu" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|k3" MACHINE_KERNEL_PR:append = "x" PR = "${MACHINE_KERNEL_PR}"@@ -26,7 +26,7 @@ S = "${WORKDIR}/git" SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" +TARGET_PRODUCT:am57xx = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:k3 = "ti654x"meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb +3
-3@@ -4,10 +4,10 @@ include uio-module-drv.inc PR = "r1" -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" +COMPATIBLE_MACHINE = "am57xx|ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" -DEVICE_NAME:omap-a15 = "am57xx" +DEVICE_NAME:am57xx = "am57xx" DEVICE_NAME:ti33x = "am33xx" DEVICE_NAME:ti43x = "am43xx" RDEPENDS:${PN} = "uio-module-drv"@@ -22,7 +22,7 @@ do_install() { install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/. } -do_install:append:omap-a15 () { +do_install:append:am57xx () { install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/. }meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +1
-1@@ -7,7 +7,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gc320" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" CLEANBROKEN = "1"meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +2
-2@@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx" PR = "r37"@@ -17,7 +17,7 @@ BRANCH = "ti-img-sgx/dunfell/${PV}" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" SRCREV = "742cf38aba13e1ba1a910cf1f036a1a212c263b6" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" +TARGET_PRODUCT:am57xx = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:am65xx = "ti654x"meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +4
-4@@ -15,7 +15,7 @@ PR = "r0" require recipes-ti/includes/ti-paths.inc -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES:prepend = " \@@ -39,7 +39,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs" PLATFORM:ti33x = "am335x" PLATFORM:ti43x = "am437x" -PLATFORM:omap-a15 = "am572x" +PLATFORM:am57xx = "am572x" PLATFORM:am64xx = "am64x" PLATFORM:am65xx = "am65x" PLATFORM:j7 = "j721e"@@ -86,7 +86,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@@ -174,7 +174,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: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" PRU_ICSS_ALTERNATIVES:j7 = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw"meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc +1
-1@@ -7,7 +7,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"meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc +4
-4@@ -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" \meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb +2
-2@@ -78,14 +78,14 @@ KFPLAT = "" ALTERNATIVE_PRIORITY = "5" -pkg_postinst:${PN}-fw:omap-a15 () { +pkg_postinst:${PN}-fw:am57xx () { update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY} update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY} } -pkg_postrm:${PN}-fw:omap-a15 () { +pkg_postrm:${PN}-fw:am57xx () { update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb +3
-3@@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a697230 DEPENDS = "common-csl-ip-rtos doxygen-native libulm ti-xdctools-native ti-ipc-rtos ti-sysbios ti-cgt6x-native zip-native" -COMPATIBLE_MACHINE = "omap-a15" +COMPATIBLE_MACHINE = "am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git"@@ -39,10 +39,10 @@ export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" export BUILD_AM572 = "0" -BUILD_AM572:omap-a15 = "1" +BUILD_AM572:am57xx = "1" RELEASE_TARGET = "" -RELEASE_TARGET:omap-a15 = "am57xx" +RELEASE_TARGET:am57xx = "am57xx" do_compile() { make -f utils/product/Makefile .zipfilemeta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb +2
-2@@ -21,12 +21,12 @@ SRCREV = "${UIO_TEST_PRUSS_SRCREV}" PR = "r0" -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" +COMPATIBLE_MACHINE = "am57xx|ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" DEVICE_NAME = "" -DEVICE_NAME:append:am57xx-evm = "am57xx" +DEVICE_NAME:append:am57xx = "am57xx" DEVICE_NAME:append:ti33x = "am33xx" DEVICE_NAME:append:ti43x = "am43xx"meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc +1
-1@@ -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"Signature · 1 line
2.17.1