mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-01-12 01:20:20 +00:00
Code Issues Projects Releases Wiki Activity

meta-ti/all: Merge omap-a15.inc into am57xx.inc

Browse Source 
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>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2025-12-03 14:32:11 -06:00
committed by Ryan Eatmon
parent 3a9e75ebba
commit 010c6a4336
16 changed files with 73 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
meta-ti-bsp/conf/machine/include/am57xx.inc
View File

@@ -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"

50
meta-ti-bsp/conf/machine/include/omap-a15.inc
View File

@@ -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"

4
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
View File

@@ -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"

2
meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
View File

@@ -7,7 +7,7 @@ inherit features_check
REQUIRED_MACHINE_FEATURES = "gc320"
COMPATIBLE_MACHINE = "omap-a15"
COMPATIBLE_MACHINE = "am57xx"
CLEANBROKEN = "1"

4
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
View File

@@ -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"

2
meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
View File

@@ -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}"

2
meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
View File

@@ -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}""

2
meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
View File

@@ -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}"

8
meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
View File

@@ -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"

2
meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
View File

@@ -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"

2
meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
View File

@@ -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"

2
meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
View File

@@ -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}"

2
meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
View File

@@ -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"

8
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
View File

@@ -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" \

10
meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
View File

@@ -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"

2
meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
View File

@@ -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"