diff options
283 files changed, 4164 insertions, 3583 deletions
diff --git a/meta-ti-bsp/README b/meta-ti-bsp/README index c5780531..17f87597 100644 --- a/meta-ti-bsp/README +++ b/meta-ti-bsp/README @@ -8,11 +8,11 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta -branch: master +branch: kirkstone URI: git://git.yoctoproject.org/meta-arm layers: meta-arm -branch: master +branch: kirkstone The base BSP part of meta-ti should work with different OpenEmbedded/Yocto diff --git a/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass b/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass new file mode 100644 index 00000000..5e1fa56a --- /dev/null +++ b/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass @@ -0,0 +1,758 @@ +inherit ti-secdev kernel-uboot uboot-sign-legacyhs + +FITIMAGE_HASH_ALGO ?= "sha1" +FITIMAGE_PACK_TEE ?= "0" +FITIMAGE_DTB_BY_NAME ?= "0" +FITIMAGE_TEE_BY_NAME ?= "0" +FITIMAGE_CONF_BY_NAME ?= "0" + +python __anonymous () { + kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" + if 'fitImage' in kerneltypes.split(): + depends = d.getVar("DEPENDS") + depends = "%s u-boot-mkimage-native dtc-native" % depends + d.setVar("DEPENDS", depends) + + uarch = d.getVar("UBOOT_ARCH") + if uarch == "arm64": + replacementtype = "Image" + elif uarch == "mips": + replacementtype = "vmlinuz.bin" + elif uarch == "x86": + replacementtype = "bzImage" + elif uarch == "microblaze": + replacementtype = "linux.bin" + else: + replacementtype = "zImage" + + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We have to override it, since we pack zImage + # (at least for now) into the fitImage . + typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or "" + if 'fitImage' in typeformake.split(): + d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', replacementtype)) + + image = d.getVar('INITRAMFS_IMAGE') + if image: + d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') + + # Verified boot will sign the fitImage and append the public key to + # U-boot dtb. We ensure the U-Boot dtb is deployed before assembling + # the fitImage: + if d.getVar('UBOOT_SIGN_ENABLE'): + uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot' + d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' % uboot_pn) + + if d.getVar('FITIMAGE_PACK_TEE') == "1": + d.appendVarFlag('do_assemble_fitimage', 'depends', ' optee-os:do_deploy') +} + +# Options for the device tree compiler passed to mkimage '-D' feature: +UBOOT_MKIMAGE_DTCOPTS ??= "" + +fitimage_ti_secure() { + if test -f "${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh"; then + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh $1 $2 + else + cp $1 $2 + fi +} + +# +# Emit the fitImage ITS header +# +# $1 ... .its filename +fitimage_emit_fit_header() { + cat << EOF >> ${1} +/dts-v1/; + +/ { + description = "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}"; + #address-cells = <1>; +EOF +} + +# +# Emit the fitImage section bits +# +# $1 ... .its filename +# $2 ... Section bit type: imagestart - image section start +# confstart - configuration section start +# sectend - section end +# fitend - fitimage end +# +fitimage_emit_section_maint() { + case $2 in + imagestart) + cat << EOF >> ${1} + + images { +EOF + ;; + confstart) + cat << EOF >> ${1} + + configurations { +EOF + ;; + sectend) + cat << EOF >> ${1} + }; +EOF + ;; + fitend) + cat << EOF >> ${1} +}; +EOF + ;; + esac +} + +# +# Emit the fitImage ITS kernel section +# +# $1 ... .its filename +# $2 ... Image counter +# $3 ... Path to kernel image +# $4 ... Compression type +fitimage_emit_section_kernel() { + + kernel_csum=${FITIMAGE_HASH_ALGO} + + ENTRYPOINT="${UBOOT_ENTRYPOINT}" + if test -n "${UBOOT_ENTRYSYMBOL}"; then + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$4=="${UBOOT_ENTRYSYMBOL}" {print $2}'` + fi + + cat << EOF >> ${1} + kernel-${2} { + description = "Linux kernel"; + data = /incbin/("${3}"); + type = "kernel"; + arch = "${UBOOT_ARCH}"; + os = "linux"; + compression = "${4}"; + load = <${UBOOT_LOADADDRESS}>; + entry = <${ENTRYPOINT}>; +EOF + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${kernel_csum}"; + }; +EOF + fi + cat << EOF >> ${1} + }; +EOF +} + +# +# Emit the fitImage ITS DTB section +# +# $1 ... .its filename +# $2 ... Image counter/name +# $3 ... Path to DTB image +# $4 ... Load address +fitimage_emit_section_dtb() { + + dtb_csum=${FITIMAGE_HASH_ALGO} + dtb_loadline="${4}" + + cat << EOF >> ${1} + ${2} { + description = "Flattened Device Tree blob"; + data = /incbin/("${3}"); + type = "flat_dt"; + arch = "${UBOOT_ARCH}"; + compression = "none"; + ${dtb_loadline} +EOF + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${dtb_csum}"; + }; +EOF + fi + cat << EOF >> ${1} + }; +EOF +} + +# +# Emit the fitImage ITS TEE section +# +# $1 ... .its filename +# $2 ... Image counter/name +# $3 ... Path to TEE image +fitimage_emit_section_tee() { + + tee_csum=${FITIMAGE_HASH_ALGO} + + cat << EOF >> ${1} + ${2} { + description = "OPTEE OS Image"; + data = /incbin/("${3}"); + type = "tee"; + arch = "${UBOOT_ARCH}"; + compression = "none"; +EOF + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${tee_csum}"; + }; +EOF + fi + cat << EOF >> ${1} + }; +EOF +} + +# +# Emit the fitImage ITS setup section +# +# $1 ... .its filename +# $2 ... Image counter +# $3 ... Path to setup image +fitimage_emit_section_setup() { + + setup_csum=${FITIMAGE_HASH_ALGO} + + cat << EOF >> ${1} + setup-${2} { + description = "Linux setup.bin"; + data = /incbin/("${3}"); + type = "x86_setup"; + arch = "${UBOOT_ARCH}"; + os = "linux"; + compression = "none"; + load = <0x00090000>; + entry = <0x00090000>; +EOF + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${setup_csum}"; + }; +EOF + fi + cat << EOF >> ${1} + }; +EOF +} + +# +# Emit the fitImage ITS ramdisk section +# +# $1 ... .its filename +# $2 ... Image counter +# $3 ... Path to ramdisk image +fitimage_emit_section_ramdisk() { + + ramdisk_csum=${FITIMAGE_HASH_ALGO} + ramdisk_ctype="none" + + case $3 in + *.gz|*.gz.sec) + ramdisk_ctype="gzip" + ;; + *.bz2|*.bz2.sec) + ramdisk_ctype="bzip2" + ;; + *.lzma|*.lzma.sec) + ramdisk_ctype="lzma" + ;; + *.lzo|*.lzo.sec) + ramdisk_ctype="lzo" + ;; + *.lz4|*.lz4.sec) + ramdisk_ctype="lz4" + ;; + esac + + cat << EOF >> ${1} + ramdisk-${2} { + description = "ramdisk image"; + data = /incbin/("${3}"); + type = "ramdisk"; + arch = "${UBOOT_ARCH}"; + os = "linux"; + compression = "${ramdisk_ctype}"; +EOF + if test -n "${UBOOT_RD_LOADADDRESS}"; then + cat << EOF >> ${1} + load = <${UBOOT_RD_LOADADDRESS}>; +EOF + fi + + if test -n "${UBOOT_RD_ENTRYPOINT}"; then + cat << EOF >> ${1} + entry = <${UBOOT_RD_ENTRYPOINT}>; +EOF + fi + + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${ramdisk_csum}"; + }; +EOF + fi + cat << EOF >> ${1} + }; +EOF +} + +# +# Emit the fitImage ITS configuration section +# +# $1 ... .its filename +# $2 ... Linux kernel ID +# $3 ... DTB image ID/name +# $4 ... ramdisk ID +# $5 ... config ID +# $6 ... tee ID/name +fitimage_emit_section_config() { + + conf_csum=${FITIMAGE_HASH_ALGO} + if [ -n "${UBOOT_SIGN_ENABLE}" ] ; then + conf_sign_keyname="${UBOOT_SIGN_KEYNAME}" + fi + + sep="" + conf_desc="" + kernel_line="" + fdt_line="" + ramdisk_line="" + setup_line="" + default_line="" + + if [ -n "${2}" ]; then + conf_desc="Linux kernel" + sep=", " + kernel_line="kernel = \"kernel-${2}\";" + fi + + if [ -n "${3}" ]; then + conf_desc="${conf_desc}${sep}FDT blob" + sep=", " + fi + + if [ -n "${4}" ]; then + conf_desc="${conf_desc}${sep}ramdisk" + sep=", " + ramdisk_line="ramdisk = \"ramdisk-${4}\";" + fi + + if [ -n "${5}" ]; then + conf_desc="${conf_desc}${sep}setup" + sep=", " + setup_line="setup = \"setup-${5}\";" + fi + + if [ -n "${6}" -a "x${FITIMAGE_PACK_TEE}" = "x1" ]; then + if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ]; then + loadables_line="loadables = \"${6}.optee\";" + loadables_pager_line="loadables = \"${6}-pager.optee\";" + else + loadables_line="loadables = \"tee-${6}\";" + nextnum=`expr ${6} + 1` + loadables_pager_line="loadables = \"tee-${nextnum}\";" + fi + final_conf_desc="${conf_desc}${sep}OPTEE OS Image" + else + loadables_line="" + loadables_pager_line="" + final_conf_desc="${conf_desc}" + fi + + dtbcount=1 + for DTB in ${KERNEL_DEVICETREE}; do + DTB=$(basename "${DTB}") + dtb_ext=${DTB##*.} + if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then + conf_name="${DTB}" + else + conf_name="conf-${dtbcount}" + fi + + if [ "x${FITIMAGE_DTB_BY_NAME}" = "x1" ] ; then + fdt_line="fdt = \"${DTB}\";" + else + fdt_line="fdt = \"fdt-${dtbcount}\";" + fi + + if [ "x${dtbcount}" = "x1" ]; then + cat << EOF >> ${1} + default = "${conf_name}"; +EOF + fi + +# Generate a single configuration section + cat << EOF >> ${1} + ${conf_name} { + description = "${final_conf_desc}"; + ${fdt_line} +EOF + if [ "${dtb_ext}" != "dtbo" ]; then + cat << EOF >> ${1} + ${kernel_line} + ${ramdisk_line} + ${setup_line} + ${loadables_line} +EOF + fi + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${conf_csum}"; + }; +EOF + fi + + if [ ! -z "${conf_sign_keyname}" ] ; then + + sign_line="sign-images = \"kernel\"" + + if [ -n "${3}" ]; then + sign_line="${sign_line}, \"fdt\"" + fi + + if [ -n "${4}" ]; then + sign_line="${sign_line}, \"ramdisk\"" + fi + + if [ -n "${5}" ]; then + sign_line="${sign_line}, \"setup\"" + fi + + sign_line="${sign_line};" + + cat << EOF >> ${1} + signature-1 { + algo = "${conf_csum},rsa2048"; + key-name-hint = "${conf_sign_keyname}"; + ${sign_line} + }; +EOF + fi + + cat << EOF >> ${1} + }; +EOF +# End single config section + +# Generate a single "pager" configuration section + if [ "${OPTEEPAGER}" = "y" ]; then + if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then + conf_name="${DTB}-pager" + else + conf_name="conf-${dtbcount}" + fi + + cat << EOF >> ${1} + ${conf_name} { + description = "${final_conf_desc}"; + ${fdt_line} +EOF + if [ "${dtb_ext}" != "dtbo" ]; then + cat << EOF >> ${1} + ${kernel_line} + ${ramdisk_line} + ${setup_line} + ${loadables_pager_line} +EOF + fi + if test -n "${FITIMAGE_HASH_ALGO}"; then + cat << EOF >> ${1} + hash-1 { + algo = "${conf_csum}"; + }; +EOF + fi + + if [ ! -z "${conf_sign_keyname}" ] ; then + + sign_line="sign-images = \"kernel\"" + + if [ -n "${3}" ]; then + sign_line="${sign_line}, \"fdt\"" + fi + + if [ -n "${4}" ]; then + sign_line="${sign_line}, \"ramdisk\"" + fi + + if [ -n "${5}" ]; then + sign_line="${sign_line}, \"setup\"" + fi + + sign_line="${sign_line};" + + cat << EOF >> ${1} + signature-1 { + algo = "${conf_csum},rsa2048"; + key-name-hint = "${conf_sign_keyname}"; + ${sign_line} + }; +EOF + fi + + cat << EOF >> ${1} + }; +EOF + fi +# End single config section + + dtbcount=`expr ${dtbcount} + 1` + done +} + +# +# Assemble fitImage +# +# $1 ... .its filename +# $2 ... fitImage name +# $3 ... include ramdisk +fitimage_assemble() { + kernelcount=1 + dtbcount="" + ramdiskcount=${3} + setupcount="" + teecount=1 + rm -f ${1} arch/${ARCH}/boot/${2} + + fitimage_emit_fit_header ${1} + + # + # Step 1: Prepare a kernel image section. + # + fitimage_emit_section_maint ${1} imagestart + + uboot_prep_kimage + fitimage_ti_secure linux.bin linux.bin.sec + fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin.sec "${linux_comp}" + + # + # Step 2: Prepare a DTB image section + # + if test -n "${KERNEL_DEVICETREE}"; then + dtbcount=1 + dtboaddress="${UBOOT_DTBO_LOADADDRESS}" + for DTB in ${KERNEL_DEVICETREE}; do + if echo ${DTB} | grep -q '/dts/'; then + bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." + DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` + fi + DTB_PATH="arch/${ARCH}/boot/dts/${DTB}" + if [ ! -e "${DTB_PATH}" ]; then + DTB_PATH="arch/${ARCH}/boot/${DTB}" + fi + DTB=$(basename "${DTB}") + + dtb_ext=${DTB##*.} + if [ "${dtb_ext}" = "dtbo" ]; then + if [ -n "${UBOOT_DTBO_LOADADDRESS}" ]; then + dtb_loadline="load = <${dtboaddress}>;" + num1=`printf "%d\n" ${dtboaddress}` + num2=`printf "%d\n" ${UBOOT_DTBO_OFFSET}` + num3=`expr $num1 + $num2` + dtboaddress=`printf "0x%x\n" $num3` + fi + elif [ -n "${UBOOT_DTB_LOADADDRESS}" ]; then + dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;" + fi + + fitimage_ti_secure ${DTB_PATH} ${DTB_PATH}.sec + if [ "x${FITIMAGE_DTB_BY_NAME}" = "x1" ] ; then + fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}.sec "${dtb_loadline}" + else + fitimage_emit_section_dtb ${1} "fdt-${dtbcount}" ${DTB_PATH}.sec "${dtb_loadline}" + fi + if [ "x${dtbcount}" = "x1" ]; then + dtbref=${DTB} + fi + dtbcount=`expr ${dtbcount} + 1` + done + fi + + # + # Step 2a: Prepare OP/TEE image section + # + if [ "x${FITIMAGE_PACK_TEE}" = "x1" ] ; then + mkdir -p ${B}/usr + rm -f ${B}/usr/${OPTEEFLAVOR}.optee + if [ -e "${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}.optee" ]; then + cp ${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}.optee ${B}/usr/. + fi + TEE_PATH="usr/${OPTEEFLAVOR}.optee" + fitimage_ti_secure ${TEE_PATH} ${TEE_PATH}.sec + if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ] ; then + fitimage_emit_section_tee ${1} ${OPTEEFLAVOR}.optee ${TEE_PATH}.sec + else + fitimage_emit_section_tee ${1} "tee-${teecount}" ${TEE_PATH}.sec + fi + + if [ "${OPTEEPAGER}" = "y" ]; then + teecount=`expr ${teecount} + 1` + rm -f ${B}/usr/${OPTEEFLAVOR}-pager.optee + if [ -e "${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}-pager.optee" ]; then + cp ${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}-pager.optee ${B}/usr/. + fi + TEE_PATH="usr/${OPTEEFLAVOR}-pager.optee" + fitimage_ti_secure ${TEE_PATH} ${TEE_PATH}.sec + if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ] ; then + fitimage_emit_section_tee ${1} ${OPTEEFLAVOR}-pager.optee ${TEE_PATH}.sec + else + fitimage_emit_section_tee ${1} "tee-${teecount}" ${TEE_PATH}.sec + fi + fi + fi + + # + # Step 3: Prepare a setup section. (For x86) + # + if test -e arch/${ARCH}/boot/setup.bin ; then + setupcount=1 + fitimage_emit_section_setup ${1} "${setupcount}" arch/${ARCH}/boot/setup.bin + fi + + # + # Step 4: Prepare a ramdisk section. + # + if [ "x${ramdiskcount}" = "x1" ] ; then + # Find and use the first initramfs image archive type we find + for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio; do + initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${img}" + initramfs_local="usr/${INITRAMFS_IMAGE}-${MACHINE}.${img}" + echo "Using $initramfs_path" + if [ -e "${initramfs_path}" ]; then + fitimage_ti_secure ${initramfs_path} ${initramfs_local}.sec + fitimage_emit_section_ramdisk ${1} "${ramdiskcount}" ${initramfs_local}.sec + break + fi + done + fi + + fitimage_emit_section_maint ${1} sectend + + # Force the first Kernel and DTB in the default config + kernelcount=1 + if test -n "${dtbcount}"; then + dtbcount=1 + fi + teecount=1 + + # + # Step 5: Prepare a configurations section + # + fitimage_emit_section_maint ${1} confstart + + if [ "x${FITIMAGE_DTB_BY_NAME}" != "x1" ] ; then + dtbref="fdt-${dtbcount}" + fi + if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ] ; then + teeref="${OPTEEFLAVOR}" + else + teeref="${teecount}" + fi + fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" + + fitimage_emit_section_maint ${1} sectend + + fitimage_emit_section_maint ${1} fitend + + # + # Step 6: Assemble the image + # + uboot-mkimage \ + ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ + -f ${1} \ + arch/${ARCH}/boot/${2} + + # + # Step 7: Sign the image and add public key to U-Boot dtb + # + if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then + uboot-mkimage \ + ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ + -F -k "${UBOOT_SIGN_KEYDIR}" \ + -K "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}" \ + -r arch/${ARCH}/boot/${2} + fi +} + +do_assemble_fitimage() { + if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then + cd ${B} + fitimage_assemble fit-image.its fitImage + fi +} + +addtask assemble_fitimage before do_install after do_compile + +do_assemble_fitimage_initramfs() { + if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage" && \ + test -n "${INITRAMFS_IMAGE}" ; then + cd ${B} + fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-${INITRAMFS_IMAGE} 1 + fi +} + +addtask assemble_fitimage_initramfs before do_deploy after do_install + +FITIMAGE_ITS_SUFFIX ?= "its" +FITIMAGE_ITB_SUFFIX ?= "itb" + +FITIMAGE_ITS_IMAGE ?= "fitImage-its-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITS_SUFFIX}" +FITIMAGE_ITS_IMAGE[vardepsexclude] = "DATETIME" +FITIMAGE_ITS_BINARY ?= "fitImage-its.${FITIMAGE_ITS_SUFFIX}" +FITIMAGE_ITS_SYMLINK ?= "fitImage-its-${MACHINE}.${FITIMAGE_ITS_SUFFIX}" + +FITIMAGE_ITB_IMAGE ?= "fitImage-linux.bin-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITB_SUFFIX}" +FITIMAGE_ITB_IMAGE[vardepsexclude] = "DATETIME" +FITIMAGE_ITB_BINARY ?= "fitImage-linux.bin.${FITIMAGE_ITB_SUFFIX}" +FITIMAGE_ITB_SYMLINK ?= "fitImage-linux.bin-${MACHINE}.${FITIMAGE_ITB_SUFFIX}" + +FITIMAGE_INITRAMFS_ITS_IMAGE ?= "fitImage-its-${INITRAMFS_IMAGE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITS_SUFFIX}" +FITIMAGE_INITRAMFS_ITS_IMAGE[vardepsexclude] = "DATETIME" +FITIMAGE_INITRAMFS_ITS_BINARY ?= "fitImage-its-${INITRAMFS_IMAGE}.${FITIMAGE_ITS_SUFFIX}" +FITIMAGE_INITRAMFS_ITS_SYMLINK ?= "fitImage-its-${INITRAMFS_IMAGE}-${MACHINE}.${FITIMAGE_ITS_SUFFIX}" + +FITIMAGE_INITRAMFS_ITB_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITB_SUFFIX}" +FITIMAGE_INITRAMFS_ITB_IMAGE[vardepsexclude] = "DATETIME" +FITIMAGE_INITRAMFS_ITB_BINARY ?= "fitImage-${INITRAMFS_IMAGE}.${FITIMAGE_ITB_SUFFIX}" +FITIMAGE_INITRAMFS_ITB_SYMLINK ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}.${FITIMAGE_ITB_SUFFIX}" + +kernel_do_deploy:append() { + # Update deploy directory + if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then + cd ${B} + echo "Copying fit-image.its source file..." + install -m 0644 fit-image.its ${DEPLOYDIR}/${FITIMAGE_ITS_IMAGE} + install -m 0644 arch/${ARCH}/boot/fitImage ${DEPLOYDIR}/${FITIMAGE_ITB_IMAGE} + + if [ -n "${INITRAMFS_IMAGE}" ]; then + echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..." + install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${FITIMAGE_INITRAMFS_ITS_IMAGE} + install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${FITIMAGE_INITRAMFS_ITB_IMAGE} + fi + + cd ${DEPLOYDIR} + ln -sf ${FITIMAGE_ITS_IMAGE} ${FITIMAGE_ITS_SYMLINK} + ln -sf ${FITIMAGE_ITS_IMAGE} ${FITIMAGE_ITS_BINARY} + ln -sf ${FITIMAGE_ITB_IMAGE} ${FITIMAGE_ITB_SYMLINK} + ln -sf ${FITIMAGE_ITB_IMAGE} ${FITIMAGE_ITB_BINARY} + + if [ -n "${INITRAMFS_IMAGE}" ]; then + ln -sf ${FITIMAGE_INITRAMFS_ITS_IMAGE} ${FITIMAGE_INITRAMFS_ITS_SYMLINK} + ln -sf ${FITIMAGE_INITRAMFS_ITS_IMAGE} ${FITIMAGE_INITRAMFS_ITS_BINARY} + ln -sf ${FITIMAGE_INITRAMFS_ITB_IMAGE} ${FITIMAGE_INITRAMFS_ITB_SYMLINK} + ln -sf ${FITIMAGE_INITRAMFS_ITB_IMAGE} ${FITIMAGE_INITRAMFS_ITB_BINARY} + fi + fi +} diff --git a/meta-ti-bsp/classes/ti-secdev.bbclass b/meta-ti-bsp/classes/ti-secdev.bbclass new file mode 100644 index 00000000..b3d70e5c --- /dev/null +++ b/meta-ti-bsp/classes/ti-secdev.bbclass @@ -0,0 +1,21 @@ +# Helper class to prepare correct environment for signing with TI Security Development Tools + +# K3 SECDEV scripts use OpenSSL +DEPENDS:append:k3 = " openssl-native" +DEPENDS:append:k3r5 = " openssl-native" + +# Use package version of TI SECDEV for K3 if one is not provided through the environment +DEPENDS:append:k3 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" +DEPENDS:append:k3r5 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" +TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${datadir}/ti/ti-k3-secdev" +TI_SECURE_DEV_PKG:k3 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" +TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" + +# For non-K3 we require the SECDEV tools be provided through the environment with the following vars +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: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 +export TI_SECURE_DEV_PKG diff --git a/meta-ti-bsp/classes/uboot-sign-legacyhs.bbclass b/meta-ti-bsp/classes/uboot-sign-legacyhs.bbclass new file mode 100644 index 00000000..102232b9 --- /dev/null +++ b/meta-ti-bsp/classes/uboot-sign-legacyhs.bbclass @@ -0,0 +1,131 @@ +# This file is part of U-Boot verified boot support and is intended to be +# inherited from u-boot recipe and from kernel-fitimage.bbclass. +# +# The signature procedure requires the user to generate an RSA key and +# certificate in a directory and to define the following variable: +# +# UBOOT_SIGN_KEYDIR = "/keys/directory" +# UBOOT_SIGN_KEYNAME = "dev" # keys name in keydir (eg. "dev.crt", "dev.key") +# UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000" +# UBOOT_SIGN_ENABLE = "1" +# +# As verified boot depends on fitImage generation, following is also required: +# +# KERNEL_CLASSES ?= " kernel-fitimage " +# KERNEL_IMAGETYPE ?= "fitImage" +# +# The signature support is limited to the use of CONFIG_OF_SEPARATE in U-Boot. +# +# The tasks sequence is set as below, using DEPLOY_IMAGE_DIR as common place to +# treat the device tree blob: +# +# * u-boot:do_install:append +# Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for +# signing, and kernel will deploy UBOOT_DTB_BINARY after signs it. +# +# * virtual/kernel:do_assemble_fitimage +# Sign the image +# +# * u-boot:do_deploy[postfuncs] +# Deploy files like UBOOT_DTB_IMAGE, UBOOT_DTB_SYMLINK and others. +# +# For more details on signature process, please refer to U-Boot documentation. + +# Signature activation. +UBOOT_SIGN_ENABLE ?= "0" + +# Default value for deployment filenames. +UBOOT_DTB_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.dtb" +UBOOT_DTB_BINARY ?= "u-boot.dtb" +UBOOT_DTB_SYMLINK ?= "u-boot-${MACHINE}.dtb" +UBOOT_NODTB_IMAGE ?= "u-boot-nodtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_NODTB_BINARY ?= "u-boot-nodtb.${UBOOT_SUFFIX}" +UBOOT_NODTB_SYMLINK ?= "u-boot-nodtb-${MACHINE}.${UBOOT_SUFFIX}" + +# Functions in this bbclass is for u-boot only +UBOOT_PN = "${@d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'}" + +concat_dtb_helper() { + if [ -e "${UBOOT_DTB_BINARY}" ]; then + ln -sf ${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_BINARY} + ln -sf ${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_SYMLINK} + fi + + if [ -f "${UBOOT_NODTB_BINARY}" ]; then + install ${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE} + ln -sf ${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_SYMLINK} + ln -sf ${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_BINARY} + fi + + # Concatenate U-Boot w/o DTB & DTB with public key + # (cf. kernel-fitimage.bbclass for more details) + deployed_uboot_dtb_binary='${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}' + if [ "x${UBOOT_SUFFIX}" = "ximg" -o "x${UBOOT_SUFFIX}" = "xrom" ] && \ + [ -e "$deployed_uboot_dtb_binary" ]; then + oe_runmake EXT_DTB=$deployed_uboot_dtb_binary + install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then + cd ${DEPLOYDIR} + cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE} + else + bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." + fi +} + +concat_dtb() { + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then + mkdir -p ${DEPLOYDIR} + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + CONFIG_B_PATH="${config}" + cd ${B}/${config} + concat_dtb_helper + done + else + CONFIG_B_PATH="" + cd ${B} + concat_dtb_helper + fi + fi +} + +# Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for +# signing, and kernel will deploy UBOOT_DTB_BINARY after signs it. +install_helper() { + if [ -f "${UBOOT_DTB_BINARY}" ]; then + install -d ${D}${datadir} + # UBOOT_DTB_BINARY is a symlink to UBOOT_DTB_IMAGE, so we + # need both of them. + install ${UBOOT_DTB_BINARY} ${D}${datadir}/${UBOOT_DTB_IMAGE} + ln -sf ${UBOOT_DTB_IMAGE} ${D}${datadir}/${UBOOT_DTB_BINARY} + else + bbwarn "${UBOOT_DTB_BINARY} not found" + fi +} + +do_install:append() { + if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then + if [ -n "${UBOOT_CONFIG}" ]; then + for config in ${UBOOT_MACHINE}; do + cd ${B}/${config} + install_helper + done + else + cd ${B} + install_helper + fi + fi +} + +python () { + if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == d.getVar('UBOOT_PN') and d.getVar('UBOOT_DTB_BINARY'): + kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel') + + # Make "bitbake u-boot -cdeploy" deploys the signed u-boot.dtb + d.appendVarFlag('do_deploy', 'depends', ' %s:do_deploy' % kernel_pn) + + # kernerl's do_deploy is a litle special, so we can't use + # do_deploy:append, otherwise it would override + # kernel_do_deploy. + d.appendVarFlag('do_deploy', 'prefuncs', ' concat_dtb') +} diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf index e3542f50..ffa47ae6 100644 --- a/meta-ti-bsp/conf/layer.conf +++ b/meta-ti-bsp/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-bsp" BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-ti-bsp = "6" -LAYERSERIES_COMPAT_meta-ti-bsp = "kirkstone" +LAYERSERIES_COMPAT_meta-ti-bsp = "kirkstone langdale" LICENSE_PATH += "${LAYERDIR}/licenses" @@ -18,9 +18,17 @@ LAYERDEPENDS_meta-ti-bsp = " \ meta-arm \ " +BBFILES_DYNAMIC += " \ + clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \ +" + SIGGEN_EXCLUDERECIPES_ABISAFE += " \ - ti-sgx-ddk-km \ - ti-sgx-ddk-um \ + mesa-pvr \ " HOSTTOOLS_NONFATAL += "truncate xxd comm" + +TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti" +DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}" +SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk" +PSEUDO_IGNORE_PATHS:append:ti-soc = ",${TI_COMMON_DEPLOY}" diff --git a/meta-ti-bsp/conf/machine/am335x-evm.conf b/meta-ti-bsp/conf/machine/am335x-evm.conf index 9301406b..7518bc8d 100644 --- a/meta-ti-bsp/conf/machine/am335x-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-evm.conf @@ -23,7 +23,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: # UBI device number 0, total 1988 LEBs -MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900" +MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 12000" # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 # from dmesg: diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf index 7caa5bfd..ca102961 100644 --- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf @@ -15,4 +15,12 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am3x" +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/am437x-evm.conf b/meta-ti-bsp/conf/machine/am437x-evm.conf index 98602add..58b7996f 100644 --- a/meta-ti-bsp/conf/machine/am437x-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-evm.conf @@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0" # UBI: logical eraseblock size: 253952 bytes # from ubiattach stdout: # UBI device number 0, total 994 LEBs -MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4800" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 6000" # do ubiattach /dev/ubi_ctrl -m 11 -O 4096 # from dmesg: diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf index 68b808d2..632b4995 100644 --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf @@ -11,10 +11,18 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x" - OPTEEMACHINE = "ti-am43xx" OPTEEFLAVOR = "am43xx" -OPTEEOUTPUTMACHINE = "ti" EXTRA_IMAGEDEPENDS += "optee-os" + +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_PACK_TEE = "1" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf index 825bc31d..8bcf20ea 100644 --- a/meta-ti-bsp/conf/machine/am57xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf @@ -2,34 +2,38 @@ #@NAME: AM57xx EVM #@DESCRIPTION: Machine configuration for the TI AM57xx EVM -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS2" +KERNEL_DEVICETREE_PREFIX = " \ + am57 \ + ov10635 \ + ti/am57 \ + ti/lcd \ + ti/ov10635 \ + ti/omap/am57 \ +" + +KERNEL_DEVICETREE_DTBMERGE = " \ + am57xx-evm.dtb \ + am57xx-evm-reva3.dtb \ + ti/omap/am57xx-evm.dtb \ + ti/omap/am57xx-evm-reva3.dtb \ +" + KERNEL_DEVICETREE = " \ am57xx-beagle-x15.dtb \ am57xx-beagle-x15-revb1.dtb \ am57xx-beagle-x15-revc.dtb \ am5729-beagleboneai.dtb \ - am57xx-evm.dtb \ - ti/am57xx-evm-common.dtbo \ - am57xx-evm-reva3.dtb \ - ti/am57xx-evm-reva3.dtbo \ am571x-idk.dtb \ - ti/am571x-idk-touchscreen.dtbo \ am572x-idk.dtb \ am574x-idk.dtb \ - ti/am57xx-idk-osd-lcd-common.dtbo \ - ti/am572x-idk-touchscreen.dtbo \ - ti/lcd-osd101t2587.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ti/ov10635.dtbo \ " -KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" - UBOOT_MACHINE = "am57xx_evm_config" # UBI information. Note that this is board and kernel specific. Changes diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf index 5232cbd9..4f36a847 100644 --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf @@ -11,11 +11,19 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x" - OPTEEMACHINE = "ti-am57xx" OPTEEFLAVOR = "am57xx" -OPTEEOUTPUTMACHINE = "ti" OPTEEPAGER = "y" EXTRA_IMAGEDEPENDS += "optee-os" + +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_PACK_TEE = "1" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf new file mode 100644 index 00000000..2af3317e --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62A HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf new file mode 100644 index 00000000..238718d0 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -0,0 +1,18 @@ +#@TYPE: Machine +#@NAME: AM62AXX EVM +#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM + +require conf/machine/include/am62axx.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62a7 \ + ti/k3-am62x-sk \ + ti/k3-fpdlink \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62a7-sk.dtb \ +" + +UBOOT_MACHINE = "am62ax_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf new file mode 100644 index 00000000..36915381 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM62PX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core) + +require conf/machine/include/k3r5.inc +require conf/machine/include/ti-extras.inc + +SYSFW_SOC = "am62px" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62px_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf new file mode 100644 index 00000000..fab96bd8 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: AM62PX EVM +#@DESCRIPTION: Machine configuration for the TI AM62PX EVM + +require conf/machine/include/am62pxx.inc +require conf/machine/include/ti-extras.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62p5 \ + ti/k3-am62x-sk-csi2 \ + ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk-lpm \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62p5-sk.dtb \ +" + +UBOOT_MACHINE = "am62px_evm_a53_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +# For AM62P tisdk-display-cluster image, splash screen is handled by SBL. +# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree +UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index 724a8d4a..548369ca 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -3,9 +3,10 @@ #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) require conf/machine/include/k3r5.inc +require conf/machine/include/ti-extras.inc SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" +SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 33b3294e..fadbc6f4 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -3,10 +3,15 @@ #@DESCRIPTION: Machine configuration for the TI AM62XX EVM require conf/machine/include/am62xx.inc +require conf/machine/include/ti-extras.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk \ +" KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ - ti/k3-am625-sk-csi2-ov5640.dtb \ " UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf new file mode 100644 index 00000000..52b69a72 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM62XX LP GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core) + +require conf/machine/include/k3r5.inc +require conf/machine/include/ti-extras.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf new file mode 100644 index 00000000..51e99728 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM62XX LP EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM + +require conf/machine/include/am62xx.inc +require conf/machine/include/ti-extras.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62-lp \ + ti/k3-am625-sk \ + ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk-lpm \ + ti/k3-am62x-sk-mcan \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62-lp-sk.dtb \ +" + +UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf new file mode 100644 index 00000000..0daff2b9 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX SIP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf new file mode 100644 index 00000000..b5dd18f1 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX SIP EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM + +require conf/machine/include/am62xx.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am625-sk.dtb \ +" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf index afd36b72..e932928a 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf @@ -4,8 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am64x" +SYSFW_SOC = "am64x_sr2" SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" +SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf deleted file mode 100644 index d12c030f..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf deleted file mode 100644 index 44e81463..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf +++ /dev/null @@ -1,22 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf deleted file mode 100644 index e74dd3ab..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx SR2.0 EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core) - -# Booting SR2 requires different SYSFW, the rest is handled at runtime - -require conf/machine/am65xx-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" - -SYSFW_SOC = "am65x_sr2" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index bd17474e..8744ac3e 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -4,9 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am65x" +SYSFW_SOC = "am65x_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SYSFW_SYMLINK = "" UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm.conf b/meta-ti-bsp/conf/machine/am65xx-evm.conf index 8b6ef546..f6eb6f0c 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm.conf @@ -5,3 +5,5 @@ require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_evm_a53_defconfig" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf deleted file mode 100644 index ff1645e4..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx SR2.0 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core) - -# Booting SR2 requires different SYSFW, the rest is handled at runtime - -require conf/machine/am65xx-hs-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" - -SYSFW_SOC = "am65x_sr2" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index d6d4b1e3..337c8413 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf @@ -4,11 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am65x" +SYSFW_SOC = "am65x_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" -UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf index e4eebb6a..f8221f31 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf @@ -4,19 +4,4 @@ require conf/machine/include/am65xx.inc -UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "am65x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index c7503266..d368fe1a 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -2,9 +2,19 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc -KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" +PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" + +KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15" + +KERNEL_DEVICETREE = " \ +am57xx-beagle-x15.dtb \ +am57xx-beagle-x15-revb1.dtb \ +am57xx-beagle-x15-revc.dtb \ +am57xx-idk-lcd-osd101t2045.dtbo \ +am57xx-idk-lcd-osd101t2587.dtbo \ +" MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf new file mode 100644 index 00000000..f57ae065 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: BeagleBone AI-64 (R5F) +#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + +UBOOT_MACHINE = "j721e_evm_r5_defconfig" + + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf new file mode 100644 index 00000000..a19a3e29 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -0,0 +1,34 @@ +#@TYPE: Machine +#@NAME: BeagleBone AI-64 (A72) +#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) + +require conf/machine/include/j721e.inc + +UBOOT_MACHINE = "j721e_evm_a72_config" + + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config" + +PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" + +KERNEL_DEVICETREE = " \ +ti/k3-j721e-beagleboneai64.dtb \ +ti/k3-j721e-common-proc-board.dtb \ +ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ +ti/k3-j721e-evm-csi2-ov5640.dtbo \ +ti/k3-j721e-evm-fusion.dtbo \ +ti/k3-j721e-evm-gesi-exp-board.dtbo \ +ti/k3-j721e-evm-pcie0-ep.dtbo \ +ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ +ti/k3-j721e-evm-virt-mac-client.dtbo \ +ti/k3-j721e-sk.dtb \ +ti/k3-j721e-sk-csi2-ov5640.dtbo \ +ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \ +ti/k3-j721e-sk-fusion.dtbo \ +ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ +" + +MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 413a960d..7f78b297 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -4,13 +4,65 @@ require conf/machine/include/ti33x.inc -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" +PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" + +KERNEL_DEVICETREE_PREFIX = "am335x-bone" + +KERNEL_DEVICETREE = " \ +am335x-bone.dtb \ +am335x-boneblack.dtb \ +am335x-boneblack-pps.dtb \ +am335x-boneblack-uboot.dtb \ +am335x-boneblack-uboot-univ.dtb \ +am335x-boneblack-wireless.dtb \ +am335x-boneblue.dtb \ +am335x-bonegreen.dtb \ +am335x-bonegreen-gateway.dtb \ +am335x-bonegreen-wireless.dtb \ +am335x-bonegreen-wireless-uboot-univ.dtb \ +am335x-pocketbeagle.dtb \ +am335x-sancloud-bbe.dtb \ +am335x-sancloud-bbe-extended-wifi.dtb \ +am335x-sancloud-bbe-lite.dtb \ +" + +# Extra DT overlays/capes +KERNEL_DEVICETREE += " \ +AM335X-PRU-UIO-00A0.dtbo \ +BB-ADC-00A0.dtbo \ +BB-BBBW-WL1835-00A0.dtbo \ +BB-BBGG-WL1835-00A0.dtbo \ +BB-BBGW-WL1835-00A0.dtbo \ +BB-BONE-4D5R-01-00A1.dtbo \ +BB-BONE-eMMC1-01-00A0.dtbo \ +BB-BONE-LCD4-01-00A1.dtbo \ +BB-BONE-NH7C-01-A0.dtbo \ +BB-CAPE-DISP-CT4-00A0.dtbo \ +BB-HDMI-TDA998x-00A0.dtbo \ +BB-I2C1-MCP7940X-00A0.dtbo \ +BB-I2C1-RTC-DS3231.dtbo \ +BB-I2C1-RTC-PCF8563.dtbo \ +BB-I2C2-BME680.dtbo \ +BB-I2C2-MPU6050.dtbo \ +BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ +BB-NHDMI-TDA998x-00A0.dtbo \ +BBORG_COMMS-00A2.dtbo \ +BBORG_FAN-A000.dtbo \ +BBORG_RELAY-00A2.dtbo \ +BB-SPIDEV0-00A0.dtbo \ +BB-SPIDEV1-00A0.dtbo \ +BB-UART1-00A0.dtbo \ +BB-UART2-00A0.dtbo \ +BB-UART4-00A0.dtbo \ +BB-W1-P9.12-00A0.dtbo \ +BONE-ADC.dtbo \ +M-BB-BBG-00A0.dtbo \ +M-BB-BBGG-00A0.dtbo \ +PB-MIKROBUS-0.dtbo \ +PB-MIKROBUS-1.dtbo \ +" MACHINE_GUI_CLASS = "bigscreen" MACHINE_FEATURES += "screen" SERIAL_CONSOLES = "115200;ttyS0" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf new file mode 100644 index 00000000..601cbbf7 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (R5F) +#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) + +require conf/machine/include/k3r5.inc + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" +PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf new file mode 100644 index 00000000..9ea7ff75 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -0,0 +1,56 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (A53) +#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) + +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":am62xx" + +MACHINE_FEATURES += "screen gpu" + +SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" + +PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" +PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" + +KERNEL_DEVICETREE = " \ +ti/k3-am625-beagleplay.dtb \ +ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ +ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ +ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ +ti/k3-am625-sk.dtb \ +ti/k3-am625-sk-dmtimer-pwm.dtbo \ +ti/k3-am625-sk-ecap-capture.dtbo \ +ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ +ti/k3-am625-sk-mcspi-loopback.dtbo \ +ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \ +ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \ +ti/k3-am625-sk-pwm.dtbo \ +ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \ +ti/k3-am62x-sk-csi2-imx219.dtbo \ +ti/k3-am62x-sk-csi2-ov5640.dtbo \ +ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \ +ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \ +ti/k3-am62x-sk-eqep.dtbo \ +ti/k3-am62x-sk-hdmi-audio.dtbo \ +ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ +ti/k3-am62x-sk-mcan.dtbo \ +" + +MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf index 5fa1dfa5..30884ae1 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf @@ -8,20 +8,19 @@ MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS0" +KERNEL_DEVICETREE_PREFIX = " \ + dra7 \ + ti/dra7 \ + ti/lcd \ + ti/omap/dra7 \ +" + KERNEL_DEVICETREE = " \ dra7-evm.dtb \ - ti/dra7x-evm-osd-lcd-common.dtbo \ dra71-evm.dtb \ - dra71-evm-nand.dtb \ - ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \ dra72-evm.dtb \ dra72-evm-revc.dtb \ - ti/dra72-evm-touchscreen.dtbo \ - ti/dra74-evm-touchscreen.dtbo \ dra76-evm.dtb \ - ti/dra76-evm-tfp410.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ti/lcd-osd101t2587.dtbo \ " UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf index 49630081..8e57a154 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf @@ -11,11 +11,19 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7" - OPTEEMACHINE = "ti-dra7xx" OPTEEFLAVOR = "dra7xx" -OPTEEOUTPUTMACHINE = "ti" OPTEEPAGER = "y" EXTRA_IMAGEDEPENDS += "optee-os" + +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_PACK_TEE = "1" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc new file mode 100644 index 00000000..85290924 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am57xx.inc @@ -0,0 +1,7 @@ +require conf/machine/include/omap-a15.inc +SOC_FAMILY:append = ":dra7xx" +SOC_FAMILY:append = ":am57xx" + +MACHINE_FEATURES += "pci" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw" diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc new file mode 100644 index 00000000..93a41d8d --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -0,0 +1,20 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":am62axx" + +MACHINE_FEATURES += "screen touchscreen" + +TFA_K3_SYSTEM_SUSPEND = "1" + +# Default tiboot3.bin on AM62A is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP +IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" + +# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" + +TFA_BOARD = "lite" +OPTEEMACHINE = "k3-am62x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc new file mode 100644 index 00000000..38e35851 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -0,0 +1,22 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":am62pxx" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on AM62Px is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw" + +SERIAL_CONSOLES = "115200;ttyS2" + +# Bitmap image tarball for early splashscreen +IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index fff1312f..a0ec944f 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -1,25 +1,27 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen gpu" -SERIAL_CONSOLES = "115200;ttyS2" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" -# AM62 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on AM62x is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP +IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" + +# Bitmap image tarball for early splashscreen +IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" -OPTEEMACHINE = "k3-am65x" -OPTEEOUTPUTMACHINE = "k3" +OPTEEMACHINE = "k3-am62x" + +# Normally AM62 boards use ttyS2, but our Jailhouse inmate may use ttyS3, so try both +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index afb96a22..85652eef 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -1,24 +1,24 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am64xx" -MACHINE_FEATURES += "screen touchscreen" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" KERNEL_DEVICETREE = " \ ti/k3-am642-evm.dtb \ ti/k3-am642-sk.dtb \ - ti/k3-am642-evm-icssg1-dualemac.dtbo \ - ti/k3-am642-evm-nand.dtbo \ " -# AM64 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP +IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" -OPTEEOUTPUTMACHINE = "k3" + +OPTEEMACHINE = "k3-am64x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index d6bd9810..7c9d5fb1 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -3,36 +3,27 @@ SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" + KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ - ti/k3-am654-base-board-sr1.dtbo \ - ti/k3-am654-gp.dtbo \ - ti/k3-am654-idk.dtbo \ - ti/k3-am654-idk-sr1.dtbo \ - ti/k3-am654-sr1.dtbo \ - ti/k3-am654-pcie-usb2.dtbo \ - ti/k3-am654-pcie-usb3.dtbo \ - ti/k3-am654-evm-tc358876.dtbo \ - ti/k3-am654-evm-oldi-lcd1evm.dtbo \ - ti/k3-am654-evm-ov5640.dtbo \ " -BBMULTICONFIG += "k3r5-sr2" +IMAGE_BOOT_FILES += "sysfw.itb" + +# Default on AM65x is for GP +IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" +IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" -# Use default IMAGE_BOOT_FILES_LEGACY files -# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 -IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" -do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" +# Since default on AM65x is for GP, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" + +TFA_BOARD = "generic" OPTEEMACHINE = "k3-am65x" -OPTEEOUTPUTMACHINE = "k3" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x" diff --git a/meta-ti-bsp/conf/machine/include/j7.inc b/meta-ti-bsp/conf/machine/include/j7.inc deleted file mode 100644 index 4ea3a5d8..00000000 --- a/meta-ti-bsp/conf/machine/include/j7.inc +++ /dev/null @@ -1,7 +0,0 @@ -require conf/machine/include/k3.inc -SOC_FAMILY:append = ":j7" - -OPTEEMACHINE = "k3-j721e" -OPTEEOUTPUTMACHINE = "k3" - -# Use default IMAGE_BOOT_FILES_LEGACY files diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index ce88567c..caa79876 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -1,2 +1,23 @@ -require conf/machine/include/j7.inc +require conf/machine/include/k3.inc SOC_FAMILY:append = ":j7200" + +# Default tiboot3.bin on J7200 is for GP +IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" + +# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" + +TFA_BOARD = "generic" + +OPTEEMACHINE = "k3-j721e" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index fe260178..6040feb0 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -1,10 +1,35 @@ -require conf/machine/include/j7.inc +require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721e" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +IMAGE_BOOT_FILES += "sysfw.itb" + +# Default on J721e is for GP +IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" + +# Since default on J721e is for GP, add a version for SR1.1 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" + +# Since default on J721e is for GP, add a version for SR1.1 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" + +# Since default on J721e is for GP, add a version for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" + +# Since default on J721e is for GP, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" + +TFA_BOARD = "generic" + +OPTEEMACHINE = "k3-j721e" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 5cd74683..5289ec5a 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -1,10 +1,22 @@ -require conf/machine/include/j7.inc +require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721s2" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on J721S2 is for GP +IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" + +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" + +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" + +TFA_BOARD = "generic" + +OPTEEMACHINE = "k3-j784s4" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc new file mode 100644 index 00000000..3b051f1b --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -0,0 +1,22 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":j722s" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on J722S is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" + +# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw" + +SERIAL_CONSOLES = "115200;ttyS2" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc new file mode 100644 index 00000000..92062cdf --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -0,0 +1,22 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":j784s4" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on J784S4 is for GP +IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" + +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" + +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" + +TFA_BOARD = "j784s4" + +OPTEEMACHINE = "k3-j784s4" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 911b59bd..2415f0ba 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -15,39 +15,54 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES = "Image vmlinux.gz" +KERNEL_IMAGETYPES = "Image fitImage" +KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" +UBOOT_ENTRYPOINT = "0x81000000" +UBOOT_LOADADDRESS = "0x81000000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" +UBOOT_DTB_LOADADDRESS = "0x83000000" +UBOOT_DTBO_LOADADDRESS = "0x83080000" +UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin" +SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" +UBOOT_SIGN_ENABLE = "1" +UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb" +UBOOT_SIGN_KEYNAME ?= "custMpk" +UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys" +FIT_HASH_ALG ?= "sha512" +FIT_SIGN_ALG ?= "rsa4096" + EXTRA_IMAGEDEPENDS += "virtual/bootloader" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image" + TFA_PLATFORM = "k3" -TFA_BOARD = "generic" # 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 = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" - -IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" +IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi" -WKS_FILE ?= "sdimage-2part-efi.wks" +WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" + do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" +do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" + +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 3cc79061..63267a5e 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -8,17 +8,20 @@ DEFAULTTUNE = "armv7athf" require conf/machine/include/arm/armv7a/tune-cortexa8.inc # R5 runs early bootloader and loads SYSFW -# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README -# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -SPL_BINARY = "" +SPL_SUFFIX = "bin" +SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" +SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}" UBOOT_SUFFIX = "bin" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +UBOOT_BINARY = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}" PACKAGECONFIG:pn-u-boot-ti-staging = "" PACKAGECONFIG:pn-u-boot-ti-mainline = "" diff --git a/meta-ti-bsp/conf/machine/include/mesa-pvr.inc b/meta-ti-bsp/conf/machine/include/mesa-pvr.inc new file mode 100644 index 00000000..d5581315 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/mesa-pvr.inc @@ -0,0 +1,8 @@ +PREFERRED_PROVIDER_virtual/mesa ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/egl ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgbm ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libglx ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-pvr" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index f548f3fd..6187f2ea 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -10,11 +10,11 @@ MACHINE_KERNEL_PR = "r7" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" + +# Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPES = "zImage uImage" @@ -24,7 +24,7 @@ UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}" +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}" # Generate an extlinux.conf file UBOOT_EXTLINUX = "1" @@ -40,14 +40,18 @@ 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 = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu 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}" -do_image_wic[depends] += "u-boot:do_deploy" +do_image_wic[depends] += "virtual/bootloader:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/omapl1.inc b/meta-ti-bsp/conf/machine/include/omapl1.inc deleted file mode 100644 index d0262c3f..00000000 --- a/meta-ti-bsp/conf/machine/include/omapl1.inc +++ /dev/null @@ -1,2 +0,0 @@ -require conf/machine/include/ti-soc.inc -SOC_FAMILY:append = ":omapl1" diff --git a/meta-ti-bsp/conf/machine/include/omapl138.inc b/meta-ti-bsp/conf/machine/include/omapl138.inc index c6eb0cd9..7f8262a5 100644 --- a/meta-ti-bsp/conf/machine/include/omapl138.inc +++ b/meta-ti-bsp/conf/machine/include/omapl138.inc @@ -1,2 +1,16 @@ -require conf/machine/include/omapl1.inc +require conf/machine/include/ti-soc.inc SOC_FAMILY:append = ":omapl138" + +require conf/machine/include/arm/armv5/tune-arm926ejs.inc + +KERNEL_IMAGETYPE = "zImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" + +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_FEATURES = "serial usbhost usbgadget alsa" diff --git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc new file mode 100644 index 00000000..db9d0826 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc @@ -0,0 +1,5 @@ +# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse' + +TI_EXTRAS ??= "" +MACHINEOVERRIDES =. "${@ '${TI_EXTRAS}:' if d.getVar('TI_EXTRAS').startswith('tie-') else ''}" + diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index 2792d2a0..a1fd3cbf 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -1,5 +1,9 @@ # This is a generic TI SOC family. It is a superset of all other SOCs # and platforms defined in meta-ti to allow BSP-level overrides. SOC_FAMILY = "ti-soc" + +# TI platforms all use devicetrees with overlays +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" KERNEL_DTB_OVERLAY_SUPPORT ?= "1" + require conf/machine/include/soc-family.inc diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index cfacc30d..d6a70895 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -11,25 +11,33 @@ MACHINE_KERNEL_PR = "r22" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" + +# Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = " \ + am335x \ + ti/omap/am335x \ +" + KERNEL_DEVICETREE = " \ - am335x-evm.dtb am335x-evmsk.dtb \ + am335x-evm.dtb \ + am335x-evmsk.dtb \ am335x-icev2.dtb \ - am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ + am335x-pocketbeagle.dtb \ + am335x-bone.dtb \ + am335x-boneblue.dtb \ + am335x-bonegreen.dtb \ + am335x-bonegreen-wireless.dtb \ + am335x-boneblack.dtb \ + am335x-boneblack-wireless.dtb \ am335x-sancloud-bbe.dtb \ " -KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" - UBOOT_ARCH = "arm" UBOOT_MACHINE = "am335x_evm_config" @@ -39,6 +47,7 @@ UBOOT_LOADADDRESS = "0x80008000" # Generate an extlinux.conf file UBOOT_EXTLINUX = "1" UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon" UBOOT_EXTLINUX_BOOT_FILES = " \ extlinux.conf;extlinux/extlinux.conf \ ${KERNEL_IMAGETYPE} \ @@ -54,8 +63,12 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "virtual/bootloader" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw" + # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 0da5f761..05a28b77 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -11,18 +11,26 @@ MACHINE_KERNEL_PR = "r3" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" + +# Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = " \ + am437x \ + am43x \ + ti/omap/am437x \ + ti/omap/am43x \ +" + KERNEL_DEVICETREE = " \ - am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \ - am437x-sk-evm.dtb am437x-idk-evm.dtb \ - am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \ + am437x-gp-evm.dtb \ + am437x-sk-evm.dtb \ + am437x-idk-evm.dtb \ + am43x-epos-evm.dtb \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" @@ -49,12 +57,16 @@ UBOOT_SUFFIX = "img" # and u-boot. UBI_VOLNAME = "rootfs" -EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu" 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}" -do_image_wic[depends] += "u-boot:do_deploy" +do_image_wic[depends] += "virtual/bootloader:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index 175d30f8..dff1da69 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -4,17 +4,10 @@ require conf/machine/include/j7200.inc -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" KERNEL_DEVICETREE = " \ ti/k3-j7200-common-proc-board.dtb \ " UBOOT_MACHINE = "j7200_evm_a72_config" - -# J7200 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf index 488f19ec..1922d5c8 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf @@ -4,10 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j7200" +SYSFW_SOC = "j7200_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j7200_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf index a5bd637e..54fd2b4a 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf @@ -4,19 +4,4 @@ require conf/machine/j7200-evm.conf -UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j7200_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index fe28e6f5..5e1f6dca 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -4,12 +4,14 @@ require conf/machine/include/j721e.inc -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721e \ + ti/k3-fpdlink \ + ti/k3-j7200-evm-mcspi-loopback \ +" KERNEL_DEVICETREE = " \ ti/k3-j721e-common-proc-board.dtb \ - ti/k3-j721e-common-proc-board-infotainment.dtbo \ ti/k3-j721e-sk.dtb \ " diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf deleted file mode 100644 index 6e809f46..00000000 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: J721e SR1.1 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J721e SR1.1 HS EVM (R5F core) - -# Booting SR1.1 requires different SYSFW, the rest is handled at runtime - -require conf/machine/j721e-hs-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr1-1" - -SYSFW_SOC = "j721e_sr1_1" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 80f3b969..7904c660 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -4,10 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j721e" +SYSFW_SOC = "j721e_sr1_1" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index 433863dd..441ca169 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf @@ -4,27 +4,4 @@ require conf/machine/j721e-evm.conf -UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -BBMULTICONFIG += "k3r5-sr1-1" - -# Use default IMAGE_BOOT_FILES_LEGACY files -# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0 -IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" -do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j721e_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index a2c15f74..c4e8af90 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -4,19 +4,19 @@ require conf/machine/include/j721s2.inc -SERIAL_CONSOLES = "115200;ttyS10" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721s2 \ + ti/k3-fpdlink \ + ti/k3-j7200-evm-mcspi-loopback \ + ti/k3-am68-sk \ + ti/k3-v3link \ +" + KERNEL_DEVICETREE = " \ ti/k3-j721s2-common-proc-board.dtb \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" - -# J721S2 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf new file mode 100644 index 00000000..58cd92c4 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721s2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j721s2_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf new file mode 100644 index 00000000..4cf32a28 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM + +require conf/machine/j721s2-evm.conf diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf new file mode 100644 index 00000000..2c884ffd --- /dev/null +++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J722S EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J722S EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j722s" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "j722s_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j722s-evm.conf b/meta-ti-bsp/conf/machine/j722s-evm.conf new file mode 100644 index 00000000..74bcdfce --- /dev/null +++ b/meta-ti-bsp/conf/machine/j722s-evm.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: J722S EVM +#@DESCRIPTION: Machine configuration for the TI J722S EVM + +require conf/machine/include/j722s.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j722s \ + ti/k3-fpdlink \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = "" + +UBOOT_MACHINE = "j722s_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf new file mode 100644 index 00000000..04feebc6 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf new file mode 100644 index 00000000..e451bf47 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM + +require conf/machine/include/j784s4.inc + +TFA_K3_USART = "0x8" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j784s4 \ + ti/k3-fpdlink \ + ti/k3-j7200-evm-mcspi-loopback \ + ti/k3-am69-sk \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-j784s4-evm.dtb \ +" + +UBOOT_MACHINE = "j784s4_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf new file mode 100644 index 00000000..80a228a0 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf new file mode 100644 index 00000000..8fa1c1fd --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: J784S4 HS EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM + +require conf/machine/j784s4-evm.conf diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index ba4d5645..fdbaffae 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -2,7 +2,6 @@ #@NAME: OMAP-L138 LCDK #@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board -require conf/machine/include/davinci.inc require conf/machine/include/omapl138.inc UBOOT_MACHINE = "omapl138_lcdk_config" @@ -16,4 +15,12 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb" +KERNEL_DEVICETREE_PREFIX = " \ + da850 \ + ti/davinci/da850 \ +" + +KERNEL_DEVICETREE = " \ + da850-evm.dtb \ + da850-lcdk.dtb \ +" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-1.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-1.conf deleted file mode 100644 index 428f2212..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-1.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-sr1-1" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf deleted file mode 100644 index e933b9cc..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-sr2" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5.conf b/meta-ti-bsp/conf/multiconfig/k3r5.conf index deb07210..936bce2f 100644 --- a/meta-ti-bsp/conf/multiconfig/k3r5.conf +++ b/meta-ti-bsp/conf/multiconfig/k3r5.conf @@ -1,5 +1,10 @@ MAINMACHINE := "${MACHINE}" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}" +DEPLOY_DIR_IMAGE:k3r5 = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}" MACHINE:append = "-k3r5" +TCLIBC = "baremetal" +TI_TMPDIR_APPEND ?= "-k3r5" +TMPDIR:append = "${TI_TMPDIR_APPEND}" + +SDKPKGSUFFIX = "k3r5-nativesdk" diff --git a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend b/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend new file mode 100644 index 00000000..7e5c36fd --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend @@ -0,0 +1,14 @@ +# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required +# for llvmpipe when using pvr-mesa since we aren't caught by that glob. + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +LDFLAGS:append:toolchain-clang = " -latomic -lm" +DEPENDS:append:toolchain-clang = " libatomic-ops" + +EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false" +EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false" + +export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config" + +PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils" diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb index f6797e2b..d88bca6e 100644 --- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -8,18 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0" PV = "${CADENCE_MHDP_FW_VERSION}" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j721e|j721s2|j784s4" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" TARGET = "mhdp8546.bin" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/cadence install -m 0644 ${S}/cadence/${TARGET} ${D}${nonarch_base_libdir}/firmware/cadence/${TARGET} } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" diff --git a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb index 00486677..ecdae123 100644 --- a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb +++ b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb @@ -9,12 +9,12 @@ PR = "r0" SRCREV = "fb484c5e54f2e31cf0a338d2927a06a2870bcc2c" BRANCH ?= "ti-v4.1.y" -SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" do_compile() { - make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}" + make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}" } do_install() { diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb b/meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb deleted file mode 100644 index ea2cc5f4..00000000 --- a/meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Kernel module for contiguous memory allocation from userspace" - -include cmem.inc - -# This package builds a kernel module, use kernel PR as base and append a local -MACHINE_KERNEL_PR:append = "a" -PR = "${MACHINE_KERNEL_PR}" - -inherit module - -EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" EXEC_DIR="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra"' -MAKE_TARGETS = "module" - -KERNEL_MODULE_AUTOLOAD += "cmemk" - -do_install:prepend() { - cp ${B}/src/cmem/module/Module.symvers ${B}/ || true -} diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc index 99717f87..683e1763 100644 --- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc +++ b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc @@ -9,7 +9,7 @@ SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393" PV = "4.20.00.01+git${SRCPV}" -SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/ipc/ludev.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" COMPATIBLE_HOST ?= "null" diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb b/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb index f69c22fb..2042b08a 100644 --- a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb +++ b/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb @@ -2,8 +2,6 @@ DESCRIPTION = "The cmem component supports contiguous memory allocation from use include cmem.inc -RDEPENDS:${PN} = "cmem-mod" - PR = "r0" PACKAGES =+ "${PN}-test" diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb index 50058b97..d1b99979 100644 --- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb @@ -2,7 +2,6 @@ SUMMARY = "Chips&Media codec firmware files" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -inherit deploy inherit update-alternatives LICENSE = "BSD-3-Clause" @@ -11,34 +10,22 @@ LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0" PV = "${CNM_WAVE521_FW_VERSION}" PR = "${INC_PR}.1" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "j721s2-evm" +COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" TARGET_WAVE521C = "wave521c_codec_fw.bin" -SOURCE_WAVE521C = "wave521c_codec_fw.bin" -SOURCE_WAVE521C:j721s2-evm = "wave521c_j721s2_codec_fw.bin" +SOURCE_WAVE521C = "wave521c_k3_codec_fw.bin" ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/${TARGET_WAVE521C}" ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}" ALTERNATIVE_PRIORITY = "10" # Set up names for the firmwares -ALTERNATIVE_${PN}:j7 = "\ - wave521c_codec_fw.bin" +ALTERNATIVE:${PN} = "wave521c_codec_fw.bin" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/cnm install -m 0644 ${S}/cnm/${SOURCE_WAVE521C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C} } - -# make sure that lib/firmware, and all its contents are part of the package -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" diff --git a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb index 371086c1..6e2996ce 100755 --- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db" PV = "6.2+git${SRCPV}" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit deploy inherit update-alternatives -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5" -SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb index f7771caf..a56810d4 100644 --- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb @@ -15,7 +15,7 @@ BRANCH = "ti-${PV}-k5.10" SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107" -SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git/src" diff --git a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb index 00a6e51b..e58f2d58 100644 --- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb @@ -8,13 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENCE.Spectrum-GT9271;md5=2a6de6be7af1fe46370c684da PV = "${GOODIX_FW_VERSION}" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - COMPATIBLE_MACHINE = "dra7xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" ORIGIN = "DRA71x-RevA-GT9271_SpecDig_Config.bin" TARGET = "goodix_9271_cfg.bin" @@ -22,5 +19,3 @@ do_install() { install -d ${D}${nonarch_base_libdir}/firmware install -m 0644 ${S}/ti-evm/${ORIGIN} ${D}${nonarch_base_libdir}/firmware/${TARGET} } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch deleted file mode 100644 index f021cc39..00000000 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 80d32fee3d768abbd77cce77ea9a7574651460a9 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denis@denix.org> -Date: Wed, 7 Jul 2021 13:11:56 -0400 -Subject: [PATCH] compiler: support OpenEmbedded "nodistro" internal aarch64 - toolchain - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko <denis@denix.org> ---- - build/linux/config/compiler.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk -index 53a0bef..d788579 100644 ---- a/build/linux/config/compiler.mk -+++ b/build/linux/config/compiler.mk -@@ -65,7 +65,7 @@ define calculate-compiler-preferred-target - ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),) - $(1)_compiler_preferred_target := i386-linux-gnu - endif -- ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) -+ ifneq ($$(filter aarch64-oe-linux aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) - $(1)_compiler_preferred_target := aarch64-linux-gnu - endif - ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),) --- -2.7.4 - diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch deleted file mode 100644 index 8d909279..00000000 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cc95fb4b1635bd1018d74b668430cda67731148f Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@konsulko.com> -Date: Sat, 30 Apr 2022 18:37:46 +0000 -Subject: [PATCH] rgxinit.c: cast boolean value to IMG_BOOL - -Fixes this error with GCC 11: - -| .../services/server/devices/rogue/rgxinit.c:1345:36: error: implicit conversion from 'enum <anonymous>' to 'IMG_BOOL' {aka 'enum tag_img_bool'} [-Werror=enum-conversion] -| 1345 | bEnableAPM = false; -| | ^ - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> ---- - services/server/devices/rogue/rgxinit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/services/server/devices/rogue/rgxinit.c b/services/server/devices/rogue/rgxinit.c -index ca7a1b9..fc94b73 100644 ---- a/services/server/devices/rogue/rgxinit.c -+++ b/services/server/devices/rogue/rgxinit.c -@@ -1342,7 +1342,7 @@ PVRSRV_ERROR RGXInitDevPart2(PVRSRV_DEVICE_NODE *psDeviceNode, - if (bEnableAPM && (!PVRSRV_VZ_MODE_IS(NATIVE))) - { - PVR_DPF((PVR_DBG_WARNING, "%s: Active Power Management disabled in virtualization mode", __func__)); -- bEnableAPM = false; -+ bEnableAPM = (IMG_BOOL)false; - } - - #if defined(RGX_NUM_OS_SUPPORTED) && (RGX_NUM_OS_SUPPORTED > 1) && defined(SUPPORT_AUTOVZ) --- -2.25.1 - diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb index 2f4a7354..a4b5390f 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb @@ -3,43 +3,40 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" LICENSE = "MIT | GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" -inherit module features_check +inherit module -REQUIRED_MACHINE_FEATURES = "gpu" +PROVIDES = "virtual/gpudriver" -MACHINE_KERNEL_PR:append = "a" +MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j721e|j721s2|am62xx" -DEPENDS = "virtual/kernel" +COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" -PROVIDES = "virtual/gpudriver" +DEPENDS = "virtual/kernel" -BRANCH = "linuxws/dunfell/k5.10/${PV}" +BRANCH = "linuxws/kirkstone/k6.1/${PV}" -SRC_URI = " \ - git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ - file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ - file://0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch \ -" +SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" -SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5" +SRCREV = "c89c1efa4a1ee5da64fd525f45e9e33728cf6181" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" +TARGET_PRODUCT:j784s4 = "j784s4_linux" TARGET_PRODUCT:am62xx = "am62_linux" -TARGET_BVNC:j721e = "22.104.208.318" -TARGET_BVNC:j721s2 = "36.53.104.796" -TARGET_BVNC:am62xx = "33.15.11.3" +TARGET_PRODUCT:am62pxx = "am62p_linux" +TARGET_PRODUCT:j722s = "j722s_linux" PVR_BUILD = "release" -PVR_WS = "wayland" +PVR_WS = "lws-generic" -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${TARGET_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' do_install() { make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } + +RRECOMMENDS:${PN} += "ti-img-rogue-umlibs" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index 2ec2ffef..ca28ae76 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs" HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux" LICENSE = "MIT | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12" +LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e" -inherit module features_check +inherit module -REQUIRED_MACHINE_FEATURES = "gpu" +PROVIDES = "virtual/gpudriver" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" MACHINE_KERNEL_PR:append = "x" PR = "${MACHINE_KERNEL_PR}" @@ -16,31 +16,30 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" -PROVIDES = "virtual/gpudriver" - -BRANCH = "ti-img-sgx/${PV}/k5.10" +BRANCH = "${PV}/mesa/k6.1" -SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" -SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063" +SRCREV = "2cb2c9609b7740cb2c348e669a96f26e1cc858da" -TARGET_PRODUCT:omap-a15 = "jacinto6evm" -TARGET_PRODUCT:ti33x = "ti335x" -TARGET_PRODUCT:ti43x = "ti437x" -TARGET_PRODUCT:k3 = "ti654x" +TARGET_PRODUCT:omap-a15 = "ti572x_linux" +TARGET_PRODUCT:ti33x = "ti335x_linux" +TARGET_PRODUCT:ti43x = "ti437x_linux" +TARGET_PRODUCT:am65xx = "ti654x_linux" +PVR_BUILD = "release" +PVR_WS = "lws-generic" -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=nulldrmws' - -do_compile:prepend() { - cd ${S}/eurasia_km/eurasiacon/build/linux2/omap_linux -} +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} \ +WINDOW_SYSTEM=${PVR_WS} PVR_BUILD_DIR=${TARGET_PRODUCT}' do_install() { - make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install + make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } -do_install:k3() { - make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install +do_install:am65xx() { + make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } + +RRECOMMENDS:${PN} += "ti-sgx-ddk-um" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb index 4eb48959..2c0736ed 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb @@ -5,14 +5,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PV = "${PRUETH_FW_AM65X_SR2_VERSION}" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "am65xx-evm|am64xx-evm" +COMPATIBLE_MACHINE = "am65xx-evm|am64xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = " \ am65x-sr2-pru0-prueth-fw.elf \ am65x-sr2-pru1-prueth-fw.elf \ @@ -28,7 +24,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb index c656ceab..8b15ab7f 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb @@ -5,14 +5,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PV = "${PRUETH_FW_AM65X_VERSION}" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - COMPATIBLE_MACHINE = "am65xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = " \ am65x-pru0-prueth-fw.elf \ am65x-pru1-prueth-fw.elf \ @@ -26,7 +22,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb index 9ccce938..463f3faa 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb @@ -4,19 +4,14 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = "" TARGET:ti33x = "am335x-pru0-prueth-fw.elf am335x-pru1-prueth-fw.elf" TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf" -TARGET:am57xx-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" -TARGET:am57xx-hs-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" +TARGET:am57xx = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss @@ -24,8 +19,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb new file mode 100644 index 00000000..ea39d73d --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "PRU HSR firmware for AM65xx SR2.0" + +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc + +PV = "${PRUETH_FW_AM65X_SR2_VERSION}" +PR = "${INC_PR}.0" + +COMPATIBLE_MACHINE = "am65xx-evm|am64xx" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +TARGET = " \ + am65x-sr2-pru0-pruhsr-fw.elf \ + am65x-sr2-pru1-pruhsr-fw.elf \ + am65x-sr2-rtu0-pruhsr-fw.elf \ + am65x-sr2-rtu1-pruhsr-fw.elf \ + am65x-sr2-txpru0-pruhsr-fw.elf \ + am65x-sr2-txpru1-pruhsr-fw.elf \ +" + +do_install() { + install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss + for f in ${TARGET}; do + install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f + done +} diff --git a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb index 4ffd13aa..fe99cb3e 100644 --- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb @@ -5,19 +5,14 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PE = "1" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = "" TARGET:ti33x = "am335x-pru0-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf" TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf" -TARGET:am57xx-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" -TARGET:am57xx-hs-evm = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" +TARGET:am57xx = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss @@ -25,7 +20,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb index 23c422dd..842621f6 100644 --- a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +++ b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb @@ -5,20 +5,14 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PE = "1" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = "" TARGET:ti33x = "am335x-pru0-pruprp-fw.elf am335x-pru1-pruprp-fw.elf" TARGET:ti43x = "am437x-pru0-pruprp-fw.elf am437x-pru1-pruprp-fw.elf" -TARGET:am57xx-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" -TARGET:am57xx-hs-evm = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" - +TARGET:am57xx = "am57xx-pru0-pruprp-fw.elf am57xx-pru1-pruprp-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss @@ -26,7 +20,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb index 97adf6fc..63c2d311 100644 --- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb +++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb @@ -5,14 +5,10 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PV = "${PRUETH_FW_AM65X_SR2_VERSION}" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "am65xx-evm" +COMPATIBLE_MACHINE = "am65xx-evm|am64xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = " \ am65x-sr2-pru0-prusw-fw.elf \ am65x-sr2-pru1-prusw-fw.elf \ @@ -28,7 +24,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb index 8d784768..755f93b9 100644 --- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb @@ -4,19 +4,14 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" - TARGET = "" TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf" TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf" -TARGET:am57xx-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" -TARGET:am57xx-hs-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" +TARGET:am57xx = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss @@ -24,8 +19,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - - -FILES:${PN} = "${nonarch_base_libdir}/firmware" - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb new file mode 100644 index 00000000..1ad236ce --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb @@ -0,0 +1,112 @@ +SUMMARY = "TI DM prebuilt binary firmware images" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" + +COMPATIBLE_MACHINE = "k3" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit deploy +inherit update-alternatives + +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc + +PV = "${TI_DM_FW_VERSION}" +PR = "${INC_PR}.0" + +# Secure Build +inherit ti-secdev + +PLAT_SFX = "" +PLAT_SFX:j721e = "j721e" +PLAT_SFX:j7200 = "j7200" +PLAT_SFX:j721s2 = "j721s2" +PLAT_SFX:j784s4 = "j784s4" +PLAT_SFX:j722s = "j722s" +PLAT_SFX:am65xx = "am65xx" +PLAT_SFX:am64xx = "am64xx" +PLAT_SFX:am62xx = "am62xx" +PLAT_SFX:am62axx = "am62axx" +PLAT_SFX:am62pxx = "am62pxx" + +DM_FW_DIR = "ti-dm/${PLAT_SFX}" + +INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}" + +DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" + +DM_FW_LIST = "" +DM_FW_LIST:j721e = "${DM_FIRMWARE}" +DM_FW_LIST:j7200 = "${DM_FIRMWARE}" +DM_FW_LIST:j721s2 = "${DM_FIRMWARE}" +DM_FW_LIST:j784s4 = "${DM_FIRMWARE}" +DM_FW_LIST:j722s = "${DM_FIRMWARE}" +DM_FW_LIST:am65xx = "" +DM_FW_LIST:am64xx = "" +DM_FW_LIST:am62xx = "${DM_FIRMWARE}" +DM_FW_LIST:am62axx = "${DM_FIRMWARE}" +DM_FW_LIST:am62pxx = "${DM_FIRMWARE}" + +do_install() { + # Sign the firmware + # DM Firmware + for FW_NAME in ${DM_FW_LIST} + do + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${DM_FW_DIR}/${FW_NAME} ${S}/${DM_FW_DIR}/${FW_NAME}.signed + done + + # DM Firmware + install -d ${D}${INSTALL_DM_FW_DIR} + for FW_NAME in ${DM_FW_LIST} + do + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME} ${D}${INSTALL_DM_FW_DIR}/ + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_DM_FW_DIR}/ + done +} + +do_deploy() { + # DM Firmware is needed for rebuilding U-Boot + install -d ${DEPLOYDIR}/${DM_FW_DIR} + for FW_NAME in ${DM_FW_LIST} + do + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME} ${DEPLOYDIR}/${DM_FW_DIR} + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/${DM_FW_DIR} + done +} + +# Set up names for the firmwares +ALTERNATIVE:${PN}:am62xx = "am62-main-r5f0_0-fw" +ALTERNATIVE:${PN}:am62pxx = "am62p-main-r5f0_0-fw" +ALTERNATIVE:${PN}:am62axx = "am62a-main-r5f0_0-fw" +ALTERNATIVE:${PN}:j721e = "j7-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j7200 = "j7200-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j721s2 = "j721s2-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j784s4 = "j784s4-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j722s = "j722s-wkup-r5f0_0-fw" + +# Set up link names for the firmwares +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am62p-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62p-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am62a-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j722s-wkup-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-wkup-r5f0_0-fw" + +# Create the firmware alternatives +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[am62p-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[am62a-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j722s-wkup-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" + +ALTERNATIVE_PRIORITY = "10" + +addtask deploy after do_install diff --git a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb new file mode 100644 index 00000000..6bcc824b --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb @@ -0,0 +1,104 @@ +SUMMARY = "TI Ethernet prebuilt binary firmware images" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" + +COMPATIBLE_MACHINE = "k3" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit update-alternatives + +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc + +PV = "${CORESDK_RTOS_VERSION}" +PR = "${INC_PR}.0" + +# Secure Build +inherit ti-secdev + +PLAT_SFX = "" +PLAT_SFX:j721e = "j721e" +PLAT_SFX:j7200 = "j7200" +PLAT_SFX:j721s2 = "j721s2" +PLAT_SFX:j784s4 = "j784s4" +PLAT_SFX:j722s = "j722s" +PLAT_SFX:am65xx = "am65xx" +PLAT_SFX:am64xx = "am64xx" +PLAT_SFX:am62xx = "am62xx" +PLAT_SFX:am62pxx = "am62pxx" +PLAT_SFX:am62axx = "am62axx" + +ETH_FW_DIR = "ti-eth/${PLAT_SFX}" + +INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}" + +ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" + +ETH_FW_LIST = "" +ETH_FW_LIST:j721e = "${ETH_FW}" +ETH_FW_LIST:j7200 = "${ETH_FW}" +ETH_FW_LIST:j721s2 = "" +ETH_FW_LIST:j784s4 = "${ETH_FW}" +ETH_FW_LIST:j722s = "" +ETH_FW_LIST:am65xx = "" +ETH_FW_LIST:am64xx = "" +ETH_FW_LIST:am62xx = "" +ETH_FW_LIST:am62pxx = "" +ETH_FW_LIST:am62axx = "" + +do_install() { + # ETH firmware + for FW_NAME in ${ETH_FW_LIST} + do + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed + done + + # ETH firmware + install -d ${D}${INSTALL_ETH_FW_DIR} + for FW_NAME in ${ETH_FW_LIST} + do + install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME} ${D}${INSTALL_ETH_FW_DIR} + install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR} + done +} + +# Set up names for the firmwares +ALTERNATIVE:${PN}:j721e = "\ + j7-main-r5f0_0-fw \ + j7-main-r5f0_0-fw-sec \ + " + +ALTERNATIVE:${PN}:j7200 = "\ + j7200-main-r5f0_0-fw \ + j7200-main-r5f0_0-fw-sec \ + " + +ALTERNATIVE:${PN}:j784s4 = "\ + j784s4-main-r5f0_0-fw \ + j784s4-main-r5f0_0-fw-sec \ + " + +# Set up link names for the firmwares +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw-sec" + +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw-sec" + +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec" + +# Create the firmware alternatives +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" + +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" + +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" + +ALTERNATIVE_PRIORITY = "5" diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb index 718fdbe1..29af4863 100644 --- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb +++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libdrm ffmpeg" inherit autotools pkgconfig -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j721e" PR = "r1" SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2" @@ -15,6 +15,6 @@ EXTRA_OEMAKE = "CC="${CC}"" TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/viddec-test-app.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb index 4dc81c54..b674c764 100644 --- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb +++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libdrm" inherit autotools pkgconfig -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j721e" PR = "r0" SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a" @@ -15,6 +15,6 @@ EXTRA_OEMAKE = "CC="${CC}"" TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/videnc-test-app.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/videnc-test-app.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb index 7727e9af..d295a1c1 100644 --- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb @@ -7,18 +7,13 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PV = "${IMG_DEC_FW_VERSION}" PR = "${INC_PR}.0" -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j721e" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}/git" TARGET = "pvdec_full_bin.fw" do_install() { install -d ${D}${nonarch_base_libdir}/firmware install -m 0644 ${S}/ti-img/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET} } - -FILES:${PN} = "${nonarch_base_libdir}/firmware" diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 47e76347..6f7e8813 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -1,37 +1,46 @@ -SUMMARY = "TI SCI firmware (SYSFW)" +SUMMARY = "Common include for TI Linux firmware" LICENSE = "TI-TFL" LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" PV = "2022.01" -INC_PR = "r3" +INC_PR = "r4" # Firmware versions CORESDK_RTOS_VERSION = "08.02.00.04" -SERDES_FW_VERSION = "3.3.0.2c" -NETCP_SA_FW_VERSION = "1.0.0" -NETCP_PA_FW_VERSION = "3.0.2.3" -QMSS_PDSP_FW_VERSION = "1.0.0.9" PRUETH_FW_AM65X_VERSION = "08.00.00.20" -PRUETH_FW_AM65X_SR2_VERSION = "02.02.09.07" +PRUETH_FW_AM65X_SR2_VERSION = "02.02.13.00" GOODIX_FW_VERSION = "1.0.0.0" -CADENCE_MHDP_FW_VERSION = "1.2.17" +CADENCE_MHDP_FW_VERSION = "2.1.0" IMG_DEC_FW_VERSION = "1.0" -CNM_WAVE521_FW_VERSION = "1.0.00" -TIFS_LPM_STUB_FW_VERSION = "08.03.02" +CNM_WAVE521_FW_VERSION = "1.0.3" +TI_DM_FW_VERSION = "09.02.04" +TI_SYSFW_VERSION = "09.02.07" -TI_LINUX_FW_SRCREV ?= "917625c2721eef8677df9e47d919005b0d4f93aa" +TI_LINUX_FW_SRCREV ?= "58e3c376102aa8f42a0b1208afc91d75200b2d7b" SRCREV = "${TI_LINUX_FW_SRCREV}" BRANCH ?= "ti-linux-firmware" -K3_IMAGE_GEN_SRCREV ?= "62872c7e285fa9b9af76a258a24d603f851769c3" -SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}" -SRCREV_FORMAT = "imggen" - -SRC_URI = " \ - git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \ - git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \ -" +SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" + +CLEANBROKEN = "1" + +# Make sure that lib/firmware, and all its contents are part of the package +FILES:${PN} = "${nonarch_base_libdir}/firmware" + +# This is used to prevent the build system from stripping the firmwares +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +# This is used to prevent the build system from splitting out the firmware debug info into a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# Disable arch checking as firmware is likely to be a different arch from the Yocto build +INSANE_SKIP:${PN} += "arch" + +# Firmware in Linux Firmware has no configure nor build steps +do_compile[noexec] = "1" +do_configure[noexec] = "1" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb deleted file mode 100644 index bab4acf0..00000000 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb +++ /dev/null @@ -1,45 +0,0 @@ -# ti-sci-fw builds and packages multiple config variants via multiconfig -# Let's take a page from gcc-source as a common recipe for all gcc stages, -# but also to provide a single package for MAINMACHINE of all multiconfigs - -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -SUMMARY += "- sources" - -COMPATIBLE_MACHINE = "k3" - -EXCLUDE_FROM_WORLD = "1" -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "" - -PACKAGES = "${PN}" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -SRCIPK_SRC_DIR = "${WORKDIR}/imggen" -SRCIPK_INSTALL_DIR = "board-support/k3-image-gen-${PV}" -FILES:${PN} = "${SRCIPK_INSTALL_DIR}" - -do_install() { - # Copy sources for packaging - mkdir -p ${D}/${SRCIPK_INSTALL_DIR} - if [ -e ${SRCIPK_SRC_DIR} ]; then - if [ "${SRCIPK_SRC_DIR}" = "${WORKDIR}" ]; then - excludes='--exclude ./temp --exclude ${D}' - fi - tar -C ${SRCIPK_SRC_DIR} -cO $excludes . | tar -C ${D}/${SRCIPK_INSTALL_DIR} -xpf - - fi - - # Fix up patches/ directory to contain actual patches instead of symlinks - if [ -e ${D}/${SRCIPK_INSTALL_DIR}/patches ] - then - mv ${D}/${SRCIPK_INSTALL_DIR}/patches ${D}/${SRCIPK_INSTALL_DIR}/patches-links - cp -rL ${D}/${SRCIPK_INSTALL_DIR}/patches-links ${D}/${SRCIPK_INSTALL_DIR}/patches - rm -rf ${D}/${SRCIPK_INSTALL_DIR}/patches-links - fi -} - -# Do not perform any QA checks on source package -INSANE_SKIP:${PN} += "${ALL_QA}" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 530b25b8..12292c88 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,191 +1,29 @@ -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -DEPENDS = "openssl-native u-boot-mkimage-native dtc-native" -DEPENDS:append:j7200-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:j7200-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:j721s2-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:am64xx-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:am64xx-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS:append:am62xx-evm-k3r5 = " virtual/bootloader" +SUMMARY = "TI SYSFW/TIFS Firmware" -CLEANBROKEN = "1" -PR = "${INC_PR}.2" +inherit deploy -# Loaded by R5F core -COMPATIBLE_MACHINE = "k3r5" -COMPATIBLE_MACHINE:aarch64 = "null" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PACKAGE_ARCH = "${MACHINE_ARCH}" -TI_SECURE_DEV_PKG ?= "" -export TI_SECURE_DEV_PKG - -SYSFW_SOC ?= "unknown" -SYSFW_CONFIG ?= "unknown" - -SYSFW_PREFIX = "ti-sci-firmware" -SYSFW_PREFIX:j721e-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721e-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" -SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:am62xx-evm-k3r5 = "ti-fs-firmware" - -SYSFW_SUFFIX ?= "unknown" - -SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}" -SYSFW_BASE:append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}" - -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin" - -SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_SYMLINK ?= "sysfw.itb" - -CFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -do_configure[noexec] = "1" - -EXTRA_OEMAKE = "\ - CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \ - SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \ -" -EXTRA_OEMAKE_HS = " \ - HS=1 SW_REV=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \ -" -EXTRA_OEMAKE:append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}" - -EXTRA_OEMAKE:append:j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:append:am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" - -do_compile() { - cd ${WORKDIR}/imggen/ - oe_runmake -} +PV = "${TI_SYSFW_VERSION}" +PR = "${INC_PR}.0" do_install() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} - fi -} - -FILES:${PN} = "/boot" - -inherit deploy - -do_deploy () { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} - rm -f ${DEPLOYDIR}/${SYSFW_IMAGE} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - rm -f ${DEPLOYDIR}/${SYSFW_SYMLINK} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} - fi - - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j7200-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j7200-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j7200-hs-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j7200-hs-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j721s2-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j721s2-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:am64xx-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:am64xx-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:am64xx-hs-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:am64xx-hs-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ + install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw } -do_install:am62xx-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} +do_deploy(){ } -do_deploy:am62xx-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ +do_deploy:k3r5() { + install -d ${DEPLOYDIR}/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${DEPLOYDIR}/ti-sysfw } addtask deploy before do_build after do_compile diff --git a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb deleted file mode 100644 index 90af55f1..00000000 --- a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "TI Foundational security Low Power Management Stub" - -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -PV = "${TIFS_LPM_STUB_FW_VERSION}" -PR = "${INC_PR}.0" - -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "am62xx-evm" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -TARGET = "ti-fs-stub-firmware-am62x-gp-signed.bin" - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw/ - install -m 0644 ${S}/ti-sysfw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-sysfw/${TARGET} -} - -FILES:${PN} = "${nonarch_base_libdir}/firmware" diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc new file mode 100644 index 00000000..fb161726 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc @@ -0,0 +1,10 @@ +PV:k3 = "2.10+git${SRCPV}" +SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" +SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" +COMPATIBLE_MACHINE:k3 = "k3" +TFA_BUILD_TARGET:k3 = "all" +TFA_INSTALL_TARGET:k3 = "bl31" +TFA_SPD:k3 = "opteed" + +EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" +EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 45d56451..00d08a51 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,44 +1,4 @@ -PV:k3 = "2.6" -LIC_FILES_CHKSUM:k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" -BRANCH:k3 = "ti-atf" -SRC_URI:k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" -SRCREV_tfa:k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce" -COMPATIBLE_MACHINE:k3 = "k3" -TFA_BUILD_TARGET:k3 = "all" -TFA_INSTALL_TARGET:k3 = "bl31" -TFA_SPD:k3 = "opteed" +TFA_TI = "" +TFA_TI:k3 = "trusted-firmware-a-ti.inc" -EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" -EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" - -do_compile:append:am65xx-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${BUILD_DIR}; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) -} - -do_compile:append:am64xx-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${BUILD_DIR}; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) -} - -do_compile:append:j721e-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${BUILD_DIR}; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) -} - -do_compile:append:j7200-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${BUILD_DIR}; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) -} +require ${TFA_TI} diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc new file mode 100644 index 00000000..d32c6529 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc @@ -0,0 +1,12 @@ + +# This will have priority over generic uboot path + +COMPATIBLE_MACHINE = "am62xx|am62pxx" + +BRANCH = "ti-u-boot-2023.04" +BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse" + +SRCREV = "b0d868ee086eb5c96a3d32f72a7cb9670abf5b90" +SRCREV:tie-jailhouse = "765cab112d16fcf68a3266738073663dae67a55d" + +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb new file mode 100644 index 00000000..13286564 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb @@ -0,0 +1,17 @@ +require u-boot-ti.inc + +SUMMARY = "BeagleBoard.org U-Boot" + +COMPATIBLE_MACHINE = "beagle.*" + +PV = "2023.04" + +UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" +UBOOT_GIT_PROTOCOL = "https" +BRANCH = "v2023.04-ti-09.01.00.008" +SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb" + +BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay" +BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay" +SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" +SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc new file mode 100644 index 00000000..c7ce5047 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc @@ -0,0 +1,7 @@ +do_configure:append () { + if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ] + then + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS} + oe_runmake -C ${S} O=${B} olddefconfig + fi +} diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb index 76aaa4b2..f497054c 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb @@ -1,10 +1,8 @@ require u-boot-ti.inc -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" - PR = "r0" -PV = "2021.10" +PV = "2024.01" # For the un-initiated: # The actual URL you'd use with a git clone for example would be: @@ -15,4 +13,4 @@ PV = "2021.10" # b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git" UBOOT_GIT_PROTOCOL = "https" -SRCREV = "d80bb749fab53da72c4a0e09b8c2d2aaa3103c91" +SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb deleted file mode 100644 index e1bdae46..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb +++ /dev/null @@ -1,7 +0,0 @@ -require u-boot-ti.inc - -PR = "r36" - -BRANCH = "ti-u-boot-2020.01" - -SRCREV = "2781231a33c3d779e32445f4fe55164c45d6d7c1" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb deleted file mode 100644 index e3214c37..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb +++ /dev/null @@ -1,9 +0,0 @@ -require u-boot-ti.inc - -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" - -PR = "r25" - -BRANCH = "ti-u-boot-2021.01" - -SRCREV = "70c33dd821811a05c595f29ecac5abae23534768" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb new file mode 100644 index 00000000..f2da156b --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb @@ -0,0 +1,9 @@ +require u-boot-ti.inc + +include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} + +PR = "r0" + +BRANCH = "ti-u-boot-2023.04" + +SRCREV = "f9b966c674731a1a29a20a8e143c61d4e046f13c" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index dddf6284..2a35c3c8 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -1,23 +1,27 @@ -# UBOOT_LOCALVERSION can be set to add a tag to the end of the -# U-boot version string. such as the commit id -UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}" +do_compile:prepend () { + scm_version=$(printf '%s%s' -ti-g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12)) + + echo ${scm_version} > ${B}/.scmversion + echo ${scm_version} > ${S}/.scmversion +} UBOOT_SUFFIX ?= "img" SPL_BINARY ?= "MLO" require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc +require u-boot-mergeconfig.inc FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:" SUMMARY = "u-boot bootloader for TI devices" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" BRANCH ?= "master" -UBOOT_GIT_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git" -UBOOT_GIT_PROTOCOL = "git" +UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git" +UBOOT_GIT_PROTOCOL = "https" SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}" PV:append = "+git${SRCPV}" @@ -25,19 +29,46 @@ PV:append = "+git${SRCPV}" # u-boot needs devtree compiler to parse dts files DEPENDS += "dtc-native bc-native lzop-native flex-native bison-native python3-setuptools-native" +# u-boot needs these for binman +DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-native" + +# SYSFW/TIFS Firmware +DEPENDS:append:k3 = " ti-sci-fw" +DEPENDS:append:k3r5 = " ti-sci-fw" + DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" -PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" +PLAT_SFX = "" +PLAT_SFX:j721e = "j721e" +PLAT_SFX:j7200 = "j7200" +PLAT_SFX:j721s2 = "j721s2" +PLAT_SFX:j784s4 = "j784s4" +PLAT_SFX:j722s = "j722s" +PLAT_SFX:am65xx = "am65xx" +PLAT_SFX:am64xx = "am64xx" +PLAT_SFX:am62xx = "am62xx" +PLAT_SFX:am62axx = "am62axx" +PLAT_SFX:am62pxx = "am62pxx" + +PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" -PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-ipc/${DM_FIRMWARE},,ti-rtos-firmware" +PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" PACKAGECONFIG:append:aarch64 = " atf optee" -PACKAGECONFIG:append:j7 = " dm" +PACKAGECONFIG:append:j721e = " dm" +PACKAGECONFIG:append:j7200 = " dm" +PACKAGECONFIG:append:j721s2 = " dm" +PACKAGECONFIG:append:j784s4 = " dm" +PACKAGECONFIG:append:j722s = " dm" PACKAGECONFIG:append:am62xx = " dm" +PACKAGECONFIG:append:am62axx = " dm" +PACKAGECONFIG:append:am62pxx = " dm" COMPATIBLE_MACHINE = "(ti-soc)" -EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" +BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware" + +EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}" PROVIDES += "u-boot" PKG:${PN} = "u-boot" @@ -47,37 +78,20 @@ PKG:${PN}-dbg = "u-boot-dbg" S = "${WORKDIR}/git" # Support for secure devices - detailed info is in doc/README.ti-secure -TI_SECURE_DEV_PKG ?= "" -export TI_SECURE_DEV_PKG +inherit ti-secdev SYSROOT_DIRS += "/boot" # SPL (Second Program Loader) to be loaded over UART SPL_UART_BINARY = "u-boot-spl.bin" SPL_UART_BINARY:k3r5 = "" -SPL_UART_BINARY:lego-ev3 = "" -SPL_UART_BINARY:j7200-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY:j7200-hs-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY:j721s2-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY:am64xx-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY:am64xx-hs-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY:am62xx-evm-k3r5 = "u-boot-spl.bin" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" -# SPI NOR Flash binaries -UBOOT_SPI_SPL_BINARY = "u-boot-spl.bin" -UBOOT_SPI_BINARY = "u-boot.img" -UBOOT_SPI_GPH_BINARY = "u-boot-spi.gph" - -# SPI NOR Flash deployed images -UBOOT_SPI_SPL_IMAGE = "u-boot-spl-${MACHINE}-${PV}-${PR}.bin" -UBOOT_SPI_SPL_SYMLINK = "u-boot-spl-${MACHINE}.bin" -UBOOT_SPI_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" -UBOOT_SPI_SYMLINK = "u-boot-${MACHINE}.img" -UBOOT_SPI_GPH_IMAGE = "u-boot-spi-${MACHINE}-${PV}-${PR}.gph" -UBOOT_SPI_GPH_SYMLINK = "u-boot-spi-${MACHINE}.gph" +SPL_HS_MLO_BINARY = "u-boot-spl_HS_MLO" +SPL_HS_MLO_IMAGE = "u-boot-spl_HS_MLO-${MACHINE}-${PV}-${PR}" +SPL_HS_MLO_SYMLINK = "u-boot-spl_HS_MLO-${MACHINE}" # HS XLD UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER" @@ -99,6 +113,30 @@ UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND" UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}" UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" +do_compile:append:k3r5 () { + if [ -n "${UBOOT_CONFIG}" ]; + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ]; + then + if ! [ -L ${B}/${config}/${UBOOT_BINARY} ] && ! [ -f ${B}/${config}/${UBOOT_BINARY} ]; then + ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARY} + fi + fi + done + unset j + done + unset i + else + if ! [ -f ${B}/${UBOOT_BINARY} ]; then + ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY} + fi + fi +} + do_install:append () { if [ -n "${UBOOT_CONFIG}" ] then @@ -113,6 +151,11 @@ do_install:append () { ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type} ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY} fi + if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then + install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type} + ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type} + ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY} + fi if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type} @@ -143,6 +186,10 @@ do_install:append () { install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE} ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY} fi + if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then + install ${B}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE} + ln -sf ${SPL_HS_MLO_IMAGE} ${D}/boot/${SPL_HS_MLO_BINARY} + fi if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE} ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY} @@ -162,6 +209,20 @@ do_install:append () { fi } +do_deploy:append:k3r5 () { + for f in ${B}/tiboot3-*.bin; do + if [ -f "$f" ]; then + install -m 644 $f ${DEPLOYDIR}/ + fi + done + + for f in ${B}/sysfw*.itb; do + if [ -f "$f" ]; then + install -m 644 $f ${DEPLOYDIR}/ + fi + done +} + do_deploy:append () { if [ -n "${UBOOT_CONFIG}" ] then @@ -173,15 +234,23 @@ do_deploy:append () { then cd ${DEPLOYDIR} if [ "x${SPL_UART_BINARY}" != "x" ]; then - install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type} - rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type} + rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK} + fi + if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then + install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type} + rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK} + ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type} + ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK} + ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type} + ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type} rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} @@ -189,7 +258,7 @@ do_deploy:append () { ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type} rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} @@ -197,7 +266,7 @@ do_deploy:append () { ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type} rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} @@ -205,7 +274,7 @@ do_deploy:append () { ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type} rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} @@ -220,31 +289,37 @@ do_deploy:append () { else cd ${DEPLOYDIR} if [ "x${SPL_UART_BINARY}" != "x" ]; then - install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} - rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} - ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} - ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE} + rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK} + fi + if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then + install ${B}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE} + rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK} + ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_SYMLINK} + ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_BINARY} fi if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then - install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} + install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE} rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} fi if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then - install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} + install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE} rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} fi if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then - install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE} + install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE} rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} fi if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then - install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE} + install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE} rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} @@ -259,37 +334,24 @@ do_deploy:append () { rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true } -# j7200 uses combined image for tiboot3.bin that includes u-boot-spl.bin and sysfw -# along with board PM/RM configs generated by k3-image-gen and comes from ti-sci-fw -# hence move the legacy u-boot's tiboot3.bin and u-boot-spl.bin out of the way -do_deploy:append:j7200-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy:append:j7200-hs-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy:append:j721s2-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true +do_install:append:am62xx() { + install -d ${D}/boot + install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot } -do_deploy:append:am64xx-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true +do_deploy:append:am62xx() { + install -d ${DEPLOYDIR} + install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR} } -do_deploy:append:am64xx-hs-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true +do_install:append:am62pxx() { + install -d ${D}/boot + install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot } -do_deploy:append:am62xx-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true +do_deploy:append:am62pxx() { + install -d ${DEPLOYDIR} + install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR} } TOOLCHAIN = "gcc" diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb deleted file mode 100644 index dc17a1e9..00000000 --- a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv-test_git.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Test code for user space IO (UIO) driver" - -include uio-module-drv.inc - -PR = "r1" - -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEVICE_NAME:omap-a15 = "am57xx" -DEVICE_NAME:ti33x = "am33xx" -DEVICE_NAME:ti43x = "am43xx" -RDEPENDS:${PN} = "uio-module-drv" - -do_compile() { - oe_runmake -C ${S} test "DEVICE=${DEVICE_NAME}" -} - -do_install() { - install -d ${D}${bindir}/ - install -c -m 755 ${S}/test/uio_mem_test ${D}${bindir}/. - install -c -m 755 ${S}/test/uio_int_test ${D}${bindir}/. -} - -do_install:append:omap-a15 () { - install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/. -} - -do_install:append:ti33x () { - install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/. -} - -do_install:append:ti43x () { - install -c -m 755 ${S}/test/prussdrv_test/test/pruss_uio_test ${D}${bindir}/. -} diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc deleted file mode 100644 index 5b9ac50e..00000000 --- a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc +++ /dev/null @@ -1,19 +0,0 @@ -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016" - -BRANCH = "master" -# This corresponds to version 02.03.01.00 -UIO_MODULE_DRV_SRCREV = "78c535afe8f8cc0b715500a63eab0bc3606c0579" - -PV = "2.3.1.0+git${SRCPV}" - -UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git" -UIO_MODULE_DRV_GIT_PROTOCOL = "git" -SRC_URI = "${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${UIO_MODULE_DRV_SRCREV}" - -S = "${WORKDIR}/git" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST:ti-soc = "(.*)" diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv_git.bb b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv_git.bb deleted file mode 100644 index df5faa9a..00000000 --- a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "User space IO (UIO) driver for on-chip modules" - -include uio-module-drv.inc - -FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:" - -# This package builds a kernel module, use kernel PR as base and append a local -MACHINE_KERNEL_PR:append = "d" -PR = "${MACHINE_KERNEL_PR}" - -module_auto_load_uio-module-drv = "uio-module-drv" - -inherit module - -do_install:append () { - install -d ${D}${includedir} - cp *.h ${D}${includedir} -} - -KERNEL_MODULE_AUTOLOAD += "uio_module_drv" diff --git a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb index 673634da..2452d111 100644 --- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb +++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c" COMPATIBLE_MACHINE = "dra7xx" PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS += "virtual/kernel" - 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.sha256sum] = "a0b254ffd0c7f481cb3989e632088f5e4a233c73a1c676faa3061721ea60dc90" diff --git a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb index 5ca6b62e..7f4e8b77 100644 --- a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb +++ b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb @@ -14,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRCREV = "e3d8db1aa935775f9d196ad7428e0cd9864a36ca" BRANCH ?= "master" -SRC_URI = "git://git.ti.com/vpe_tests/vpe_tests.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb index 3f542da4..76088eaf 100644 --- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb +++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb @@ -1,24 +1,17 @@ SUMMARY = "Diagnostic tool for TI K3 processors" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://common/k3conf.c;beginline=1;endline=34;md5=7154c0ffcd418064ffa528e34e70ca9d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a56bddef00b39fb0f45488fdc4ce108f" -PV = "0.2+git${SRCPV}" +inherit cmake + +PV = "0.3+git${SRCPV}" COMPATIBLE_MACHINE = "k3" BRANCH ?= "master" -SRCREV = "966a5695b73bc53039ca60d196b77de0640088d4" +SRCREV = "85a7433202aafafbccea8a7b2491f4df8b1ecd80" -SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" - -do_compile () { - oe_runmake CC="${CC}" CROSS_COMPILE=${TARGET_PREFIX} all -} - -do_install () { - install -d ${D}${bindir} - install ${S}/k3conf ${D}${bindir} -} diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend new file mode 100644 index 00000000..459d8d09 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc new file mode 100644 index 00000000..b41f1a01 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc @@ -0,0 +1,5 @@ +# This is required since cairo expects the opengl distro feature to refer to +# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. + +PACKAGECONFIG:remove = "opengl" +PACKAGECONFIG:append = " glesv2" diff --git a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb index ab72c109..807f421c 100644 --- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb @@ -13,7 +13,7 @@ CLEANBROKEN = "1" BRANCH = "ti-${PV}" -SRC_URI = "git://git.ti.com/graphics/ti-gc320-libs.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-libs.git;protocol=https;branch=${BRANCH}" SRCREV = "c0afab259de59909cfe74c01f3f7fbaa147f94b5" RRECOMMENDS:${PN} = "ti-gc320-driver" diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb deleted file mode 100644 index 115344b1..00000000 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" -HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" -LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "gpu" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j721e|j721s2|am62xx" - -PR = "r1" - -BRANCH = "linuxws/dunfell/k5.10/${PV}" - -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" -SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb" - -TARGET_PRODUCT:j721e = "j721e_linux" -TARGET_PRODUCT:j721s2 = "j721s2_linux" -TARGET_PRODUCT:am62xx = "am62_linux" -PVR_BUILD ?= "release" -PVR_WS = "wayland" - -INITSCRIPT_NAME = "rc.pvr" -INITSCRIPT_PARAMS = "defaults 8" - -inherit update-rc.d - -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" - -DEPENDS += "libdrm wayland expat" -RDEPENDS:${PN} += "bash" -RDEPENDS:${PN} += "wayland expat" - -RPROVIDES:${PN} = "libegl libgles1 libgles2 libgbm" -RPROVIDES:${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" -RPROVIDES:${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" - -RREPLACES:${PN} = "libegl libgles1 liblges2 libgbm" -RREPLACES:${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" -RREPLACES:${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" - -RCONFLICTS:${PN} = "libegl libgles1 libgles2 libgbm" -RCONFLICTS:${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" -RCONFLICTS:${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" - -RRECOMMENDS:${PN} += "ti-img-rogue-driver" - -S = "${WORKDIR}/git" - -do_install () { - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} - chown -R root:root ${D} -} - -FILES:${PN} += " ${nonarch_base_libdir}/firmware/" -FILES:${PN} += " ${datadir}/" - -PACKAGES =+ "${PN}-plugins" -FILES:${PN}-plugins = "${libdir}/libGLESv2.so ${libdir}/libGLESv1_CM.so ${libdir}/libEGL.so ${libdir}/dri/pvr_dri.so" -RDEPENDS:${PN} += "${PN}-plugins" - -ALLOW_EMPTY:${PN}-plugins = "1" - -INSANE_SKIP:${PN} += "ldflags arch already-stripped" -INSANE_SKIP:${PN}-plugins = "dev-so" - -CLEANBROKEN = "1" diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb deleted file mode 100644 index d0edf1fe..00000000 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "Userspace libraries for PowerVR SGX chipset on TI SoCs" -HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" -LICENSE = "TI-TSPA" -LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8" - -inherit features_check - -REQUIRED_MACHINE_FEATURES = "gpu" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" - -PR = "r37" - -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:ti33x = "ti335x" -TARGET_PRODUCT:ti43x = "ti437x" -TARGET_PRODUCT:am65xx = "ti654x" - -INITSCRIPT_NAME = "rc.pvr" -INITSCRIPT_PARAMS = "defaults 8" - -inherit update-rc.d - -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" - -DEPENDS += "libdrm udev wayland wayland-protocols libffi expat" -DEPENDS:append:libc-musl = " gcompat" -RDEPENDS:${PN} += "libdrm libdrm-omap udev wayland wayland-protocols libffi expat" - -RPROVIDES:${PN} = "libegl libgles1 libgles2 libgbm" -RPROVIDES:${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" -RPROVIDES:${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" - -RREPLACES:${PN} = "libegl libgles1 libgles2 libgbm" -RREPLACES:${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" -RREPLACES:${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" - -RCONFLICTS:${PN} = "libegl libgles1 libgles2 libgbm" -RCONFLICTS:${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" -RCONFLICTS:${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" - -# The actual SONAME is libGLESv2.so.2, so need to explicitly specify RPROVIDES for .so.1 here -RPROVIDES:${PN} += "libGLESv2.so.1" - -RRECOMMENDS:${PN} += "ti-sgx-ddk-km" - -S = "${WORKDIR}/git" - -do_install () { - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} - ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so.1 - - chown -R root:root ${D} -} - -FILES:${PN} = "${bindir}/*" -FILES:${PN} += " ${libdir}/*" -FILES:${PN} += "${includedir}/*" -FILES:${PN} += "${sysconfdir}/*" - -INSANE_SKIP:${PN} += "dev-so ldflags useless-rpaths" -INSANE_SKIP:${PN} += "already-stripped dev-deps" - -CLEANBROKEN = "1" diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch new file mode 100644 index 00000000..905fad04 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch @@ -0,0 +1,128 @@ +From 1a894699354f5f984f31e5d3418b651edf486df9 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <reatmon@ti.com> +Date: Fri, 22 Sep 2023 22:32:41 -0500 +Subject: [PATCH] fix: gallivm: limit usage of LLVMContextSetOpaquePointers() + to LLVM 15 + +LLVMContextSetOpaquePointers() was a temporary workaround offered to +allow transitioning to opaque pointers. Mesa is ready for this now with +recent versions of LLVM (16+). Therefore we limit the workaround of +using LLVMContextSetOpaquePointers() to LLVM 15 now, that this C +interface was removed in LLVM 17. + +Reference: https://github.com/llvm/llvm-project/commit/1270879376025457e266572c7cccc51eb5de9276 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21124] +Signed-off-by: Ryan Eatmon <reatmon@ti.com> +--- + src/gallium/auxiliary/draw/draw_llvm.c | 2 +- + src/gallium/drivers/llvmpipe/lp_context.c | 2 +- + src/gallium/drivers/llvmpipe/lp_test_arit.c | 2 +- + src/gallium/drivers/llvmpipe/lp_test_blend.c | 2 +- + src/gallium/drivers/llvmpipe/lp_test_conv.c | 2 +- + src/gallium/drivers/llvmpipe/lp_test_format.c | 4 ++-- + src/gallium/drivers/llvmpipe/lp_test_printf.c | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c +index 50c157bc3cc..8b3a1522725 100644 +--- a/src/gallium/auxiliary/draw/draw_llvm.c ++++ b/src/gallium/auxiliary/draw/draw_llvm.c +@@ -784,7 +784,7 @@ draw_llvm_create(struct draw_context *draw, LLVMContextRef context) + if (!llvm->context) { + llvm->context = LLVMContextCreate(); + +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(llvm->context, false); + #endif + +diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c +index 8309335aebc..0ef4317fc76 100644 +--- a/src/gallium/drivers/llvmpipe/lp_context.c ++++ b/src/gallium/drivers/llvmpipe/lp_context.c +@@ -263,7 +263,7 @@ llvmpipe_create_context(struct pipe_screen *screen, void *priv, + if (!llvmpipe->context) + goto fail; + +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(llvmpipe->context, false); + #endif + +diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c +index 4118928d52e..565b1c47753 100644 +--- a/src/gallium/drivers/llvmpipe/lp_test_arit.c ++++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c +@@ -434,7 +434,7 @@ test_unary(unsigned verbose, FILE *fp, const struct unary_test_t *test, unsigned + } + + context = LLVMContextCreate(); +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(context, false); + #endif + gallivm = gallivm_create("test_module", context, NULL); +diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c +index 37c3f731eaf..3d2899a78d4 100644 +--- a/src/gallium/drivers/llvmpipe/lp_test_blend.c ++++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c +@@ -452,7 +452,7 @@ test_one(unsigned verbose, + dump_blend_type(stdout, blend, type); + + context = LLVMContextCreate(); +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(context, false); + #endif + gallivm = gallivm_create("test_module", context, NULL); +diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c +index c7ea9efc12d..83236f0c0ba 100644 +--- a/src/gallium/drivers/llvmpipe/lp_test_conv.c ++++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c +@@ -223,7 +223,7 @@ test_one(unsigned verbose, + } + + context = LLVMContextCreate(); +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(context, false); + #endif + gallivm = gallivm_create("test_module", context, NULL); +diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c +index 0a2a1e449e8..89f7d5dec1a 100644 +--- a/src/gallium/drivers/llvmpipe/lp_test_format.c ++++ b/src/gallium/drivers/llvmpipe/lp_test_format.c +@@ -150,7 +150,7 @@ test_format_float(unsigned verbose, FILE *fp, + unsigned i, j, k, l; + + context = LLVMContextCreate(); +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(context, false); + #endif + gallivm = gallivm_create("test_module_float", context, NULL); +@@ -254,7 +254,7 @@ test_format_unorm8(unsigned verbose, FILE *fp, + unsigned i, j, k, l; + + context = LLVMContextCreate(); +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(context, false); + #endif + gallivm = gallivm_create("test_module_unorm8", context, NULL); +diff --git a/src/gallium/drivers/llvmpipe/lp_test_printf.c b/src/gallium/drivers/llvmpipe/lp_test_printf.c +index b3de9cb9e8b..850c0abfe22 100644 +--- a/src/gallium/drivers/llvmpipe/lp_test_printf.c ++++ b/src/gallium/drivers/llvmpipe/lp_test_printf.c +@@ -96,7 +96,7 @@ test_printf(unsigned verbose, FILE *fp, + boolean success = TRUE; + + context = LLVMContextCreate(); +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR == 15 + LLVMContextSetOpaquePointers(context, false); + #endif + gallivm = gallivm_create("test_module", context, NULL); +-- +2.17.1 diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch new file mode 100644 index 00000000..f0775176 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch @@ -0,0 +1,43 @@ +From 8a5de0b6cf1090d7f29f3974ec79c32776cf2745 Mon Sep 17 00:00:00 2001 +From: Jami Kettunen <jami.kettunen@protonmail.com> +Date: Tue, 31 Aug 2021 00:15:58 +0300 +Subject: [PATCH] freedreno/pm4: Use unsigned instead of uint to fix musl build + +Upstream-Status: Backport + +Fixes the following error I noticed when building against aarch64 with +musl libc: + + In file included from ../src/freedreno/decode/crashdec.h:38, + from ../src/freedreno/decode/crashdec.c:40: + ../src/freedreno/common/freedreno_pm4.h:104:15: error: unknown type name 'uint' + 104 | static inline uint + | ^~~~ + ../src/freedreno/common/freedreno_pm4.h:105:25: error: unknown type name 'uint'; did you mean 'int'? + 105 | pm4_calc_odd_parity_bit(uint val) + | ^~~~ + | int + +Signed-off-by: Jami Kettunen <jami.kettunen@protonmail.com> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19665> +--- + src/freedreno/common/freedreno_pm4.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/freedreno/common/freedreno_pm4.h b/src/freedreno/common/freedreno_pm4.h +index 8f958953d693..091247e709a0 100644 +--- a/src/freedreno/common/freedreno_pm4.h ++++ b/src/freedreno/common/freedreno_pm4.h +@@ -105,8 +105,8 @@ pm4_pkt7_hdr(uint8_t opcode, uint16_t cnt) + #define cp_type3_opcode(pkt) (((pkt) >> 8) & 0xFF) + #define type3_pkt_size(pkt) ((((pkt) >> 16) & 0x3FFF) + 1) + +-static inline uint +-pm4_calc_odd_parity_bit(uint val) ++static inline unsigned ++pm4_calc_odd_parity_bit(unsigned val) + { + return (0x9669 >> (0xf & ((val) ^ ((val) >> 4) ^ ((val) >> 8) ^ + ((val) >> 12) ^ ((val) >> 16) ^ ((val) >> 20) ^ +-- +2.39.2 diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch new file mode 100644 index 00000000..bdfe7bb8 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch @@ -0,0 +1,58 @@ +From 2dfe0f899aeb415a5491b8c67e208673d2a2914f Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <reatmon@ti.com> +Date: Fri, 22 Sep 2023 21:50:08 -0500 +Subject: [PATCH] gallium: Fix build with llvm 17 + +These headers are not available for C files in llvm 17+ +and they seem to be not needed to compile after all with llvm 17 +so add conditions to exclude them for llvm >= 17 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21262] +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22980] +Signed-off-by: Ryan Eatmon <reatmon@ti.com> +--- + src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++---- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++ + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c +index 584ea738668..fe8bb2b11af 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c +@@ -42,14 +42,14 @@ + + #include <llvm/Config/llvm-config.h> + #include <llvm-c/Analysis.h> +-#include <llvm-c/Transforms/Scalar.h> +-#if LLVM_VERSION_MAJOR >= 7 +-#include <llvm-c/Transforms/Utils.h> +-#endif + #include <llvm-c/BitWriter.h> + #if GALLIVM_USE_NEW_PASS == 1 + #include <llvm-c/Transforms/PassBuilder.h> + #elif GALLIVM_HAVE_CORO == 1 ++#include <llvm-c/Transforms/Scalar.h> ++#if LLVM_VERSION_MAJOR >= 7 ++#include <llvm-c/Transforms/Utils.h> ++#endif + #if LLVM_VERSION_MAJOR <= 8 && (defined(PIPE_ARCH_AARCH64) || defined (PIPE_ARCH_ARM) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_MIPS64)) + #include <llvm-c/Transforms/IPO.h> + #endif +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 2279e5acb28..0caeaf94263 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -56,7 +56,11 @@ + #include <llvm-c/ExecutionEngine.h> + #include <llvm/Target/TargetOptions.h> + #include <llvm/ExecutionEngine/ExecutionEngine.h> ++#if LLVM_VERSION_MAJOR >= 17 ++#include <llvm/TargetParser/Triple.h> ++#else + #include <llvm/ADT/Triple.h> ++#endif + #include <llvm/Analysis/TargetLibraryInfo.h> + #include <llvm/ExecutionEngine/SectionMemoryManager.h> + #include <llvm/Support/CommandLine.h> +-- +2.17.1 diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch new file mode 100644 index 00000000..289ff032 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch @@ -0,0 +1,64 @@ +From 25946100e21cf2095bea334e8d7096798561d0b7 Mon Sep 17 00:00:00 2001 +From: Vincent Davis Jr <vince@underview.tech> +Date: Wed, 28 Dec 2022 16:28:01 -0600 +Subject: [PATCH] gbm/backend: fix gbm compile without dri + +Upstream-Status: Backport + +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447 +https://gitlab.freedesktop.org/mesa/mesa/-/commit/842ca284650f066e58706741a7d22d67b5088e60 + +At mesa version 22.2.3 patch wasn't introduced until after. + +Commit introduces a fix that allows for gbm to be built with an empty +backend. There are situation especially in a Yocto/OE cross compilation +environment where you want to build with an empty backend. The particular +situation is as such: + +The mesa-gl recipe is the preferred provider for virtual/libgbm, virtual/libgl, +virtual/mesa, etc... But the x11 DISTRO_FEATURE in't included this leads to build +errors such as: + +| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function `find_backend': +| backend.c:(.text.find_backend+0xa4): undefined reference to `gbm_dri_backend' +| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4): + undefined reference to `gbm_dri_backend' +| collect2: error: ld returned 1 exit status + +Issue should be replicable by setting -Ddri3=disabled and -Dgbm=enabled + +Add fix to bypasses compilation issue by excluding gbm dri backend. If +HAVE_DRI || HAVE_DRIX not specified. + +Acked-by: David Heidelberg <david.heidelberg@collabora.com> +Signed-off-by: Vincent Davis Jr <vince@underview.tech> +--- + src/gbm/main/backend.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c +index 974d0a76a4e..feee0703495 100644 +--- a/src/gbm/main/backend.c ++++ b/src/gbm/main/backend.c +@@ -42,7 +42,9 @@ + #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + #define VER_MIN(a, b) ((a) < (b) ? (a) : (b)) + ++#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3) + extern const struct gbm_backend gbm_dri_backend; ++#endif + + struct gbm_backend_desc { + const char *name; +@@ -51,7 +53,9 @@ struct gbm_backend_desc { + }; + + static const struct gbm_backend_desc builtin_backends[] = { ++#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3) + { "dri", &gbm_dri_backend }, ++#endif + }; + + #define BACKEND_LIB_SUFFIX "_gbm" +-- +2.34.1 diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch new file mode 100644 index 00000000..35bd0ea1 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch @@ -0,0 +1,25 @@ +From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Jan 2020 15:23:47 -0800 +Subject: [PATCH] meson misdetects 64bit atomics on mips/clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/util/u_atomic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c +index 5a5eab4..e499516 100644 +--- a/src/util/u_atomic.c ++++ b/src/util/u_atomic.c +@@ -21,7 +21,7 @@ + * IN THE SOFTWARE. + */ + +-#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) ++#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) + + #include <stdint.h> + #include <pthread.h> diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch new file mode 100644 index 00000000..f0c1de46 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -0,0 +1,43 @@ +From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair@alistair23.me> +Date: Thu, 14 Nov 2019 13:04:49 -0800 +Subject: [PATCH] meson.build: check for all linux host_os combinations + +Make sure that we are also looking for our host_os combinations like +linux-musl etc. when assuming support for DRM/KMS. + +Also delete a duplicate line. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Alistair Francis <alistair@alistair23.me> + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 172c64a..9b5294c 100644 +--- a/meson.build ++++ b/meson.build +@@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 + # Only build shared_glapi if at least one OpenGL API is enabled + with_shared_glapi = with_shared_glapi and with_any_opengl + +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) ++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') + + with_freedreno_kgsl = get_option('freedreno-kgsl') + if with_freedreno_kgsl +@@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray') + endif + + # TODO: this is very incomplete +-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system()) ++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') + pre_args += '-D_GNU_SOURCE' + elif host_machine.system() == 'sunos' + pre_args += '-D__EXTENSIONS__' diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch b/meta-ti-bsp/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch new file mode 100644 index 00000000..6eea5ed8 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch @@ -0,0 +1,47 @@ +From f17e836ef9b1bbc6056790596420b699e48128c2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Dec 2021 19:57:42 -0800 +Subject: [PATCH] util/format: Check for NEON before using it + +This fixes build on rpi0-w and any other machine which does not have +neon unit and is not used as FPU unit + +Fixes errors e.g. + +In file included from ../mesa-21.3.0/src/util/format/u_format_unpack_neon.c:35: +/mnt/b/yoe/master/build/tmp/work/arm1176jzfshf-vfp-yoe-linux-gnueabi/mesa/2_21.3.0-r0/recipe-sysroot-native/usr/lib/clang/13.0.1/include/arm_neon.h:32:2: error: "NEON support not enabled" + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/util/format/u_format.c | 2 +- + src/util/format/u_format_unpack_neon.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c +index c071250..0880984 100644 +--- a/src/util/format/u_format.c ++++ b/src/util/format/u_format.c +@@ -1184,7 +1184,7 @@ static void + util_format_unpack_table_init(void) + { + for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) { +-#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) ++#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) + const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format); + if (unpack) { + util_format_unpack_table[format] = unpack; +diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c +index a4a5cb1..1e4f794 100644 +--- a/src/util/format/u_format_unpack_neon.c ++++ b/src/util/format/u_format_unpack_neon.c +@@ -23,7 +23,7 @@ + + #include <u_format.h> + +-#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) ++#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) + + /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics + * unless you tell it "no really". diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb new file mode 100644 index 00000000..5abd0793 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb @@ -0,0 +1,59 @@ +# PowerVR Graphics require several patches that have not made their way +# upstream yet. This allows us to build the shims we need without completely +# clobbering mesa. + +require recipes-graphics/mesa/mesa.inc + +SUMMARY += " (with PowerVR support for TI platforms)" + +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" + +BRANCH = "powervr/kirkstone/${PV}" + +SRC_URI = " \ + git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \ + file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ + file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ + file://0001-util-format-Check-for-NEON-before-using-it.patch \ + file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ + file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ + file://0001-gallium-Fix-build-with-llvm-17.patch \ + file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ +" + +S = "${WORKDIR}/git" + +PACKAGECONFIG:append = " \ + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ +" + +SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083" + +PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" +PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," +PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," + +PACKAGECONFIG:remove = "video-codecs" +PACKAGECONFIG[video-codecs] = "" +PACKAGECONFIG:remove = "elf-tls" +PACKAGECONFIG[elf-tls] = "" +PACKAGECONFIG:remove = "xvmc" +PACKAGECONFIG[xvmc] = "" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" +GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', ',sgx', '', d)}" + +VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" + +do_install:append () { + # remove pvr custom pkgconfig + rm -rf ${D}${datadir}/pkgconfig +} + +FILES:${PN}-dev += "${datadir}/mesa/wayland-drm.xml" +FILES:mesa-vulkan-drivers += "${libdir}/libpvr_mesa_wsi.so" + +RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb new file mode 100644 index 00000000..c84f9d3c --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb @@ -0,0 +1,143 @@ +DESCRIPTION = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" +HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" + +inherit bin_package + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" + +PR = "r2" + +BRANCH = "linuxws/kirkstone/k6.1/${PV}" +SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" +SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" +S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" + +TARGET_PRODUCT:j721e = "j721e_linux" +TARGET_PRODUCT:j721s2 = "j721s2_linux" +TARGET_PRODUCT:j784s4 = "j784s4_linux" +TARGET_PRODUCT:am62xx = "am62_linux" +TARGET_PRODUCT:am62pxx = "am62p_linux" +TARGET_PRODUCT:j722s = "j722s_linux" +PVR_BUILD = "release" +PVR_WS = "lws-generic" + +RDEPENDS:${PN} = " \ + libdrm \ + ti-img-rogue-driver \ + ${PN}-firmware \ +" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan wayland', 'vulkan', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'opengl opencl', d)} \ +" + +PACKAGECONFIG[opengl] = ",,,,${GLES_PACKAGES}" +PACKAGECONFIG[vulkan] = ",,,,${VULKAN_PACKAGES}" +PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" + +def get_file_list(package_list_var, d): + file_list = [] + package_list = d.getVar(package_list_var) + prefix = f"{d.getVar('S')}/" + if package_list: + for package in package_list.split(): + package_file_string = d.getVar(f"FILES:{package}") + if package_file_string: + for package_file in package_file_string.split(): + file_list.append(f"{prefix}{package_file}") + return " ".join(file_list) + +do_install:prepend() { + if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then + for file in ${@get_file_list('GLES_PACKAGES', d)}; do + rm -rf ${file} + done + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', 'false', 'true', d)}; then + for file in ${@get_file_list('VULKAN_PACKAGES', d)}; do + rm -rf ${file} + done + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'false', 'true', d)}; then + for file in ${@get_file_list('OPENCL_PACKAGES', d)}; do + rm -rf ${file} + done + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then + if [ -e ${S}/lib/firmware ]; then + mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + fi + fi + + # clean up any empty directories + find "${S}" -empty -type d -delete +} + +GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" +VULKAN_PACKAGES = "libvk-rogue" +OPENCL_PACKAGES = "libopencl-rogue libopencl-rogue-tools" + +PACKAGES = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'opengl', d.getVar('GLES_PACKAGES'), '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', d.getVar('VULKAN_PACKAGES'), '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'opencl', d.getVar('OPENCL_PACKAGES'), '', d)} \ + ${PN}-tools \ + ${PN}-firmware \ + ${PN} \ +" + +# Inject variables so that packages don't get Debian-renamed (which would +# remove the -rogue suffix), but don't RPROVIDEs/RCONFLICTs on the generic +# libgl name to prevent colliding with swrast libs +python __anonymous() { + suffix = "" + if "-native" in d.getVar("PN"): + suffix = "-native" + for p in (("vulkan", "libvk",), + ("gles", "libgles1", "libglesv1-cm1"), + ("gles", "libgles2", "libglesv2-2"), + ("gles", "libgles3",), + ("opencl", "libopencl",)): + mlprefix = d.getVar("MLPREFIX") + fullp = mlprefix + p[1] + "-rogue" + suffix + mlprefix = d.getVar("MLPREFIX") + pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") + d.setVar("INSANE_SKIP:" + fullp, "dev-so") + d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix) +} + +# gles specific shared objects +FILES:libgles1-rogue = "${libdir}/libGLESv1*.so*" +FILES:libgles2-rogue = "${libdir}/libGLESv2*.so*" +RDEPENDS:libgles1-rogue += "mesa-megadriver" +RDEPENDS:libgles2-rogue += "mesa-megadriver" + +# vulkan specific shared objects and configs +FILES:libvk-rogue = "${libdir}/libVK_IMG.so* ${datadir}/vulkan" +RDEPENDS:libvk-rogue += "vulkan-loader wayland libdrm" + +# opencl specific shared objects and configs +FILES:libopencl-rogue = "${libdir}/libPVROCL.so* ${sysconfdir}/OpenCL" +RDEPENDS:libopencl-rogue += "opencl-icd-loader" +RRECOMMENDS:libopencl-rogue += "libopencl-rogue-tools" +FILES:libopencl-rogue-tools += "${bindir}/ocl*" +DEBIAN_NOAUTONAME:libopencl-rogue-tools = "1" + +# optional tools and tests +FILES:${PN}-tools = "${bindir}/" +RDEPENDS:${PN}-tools = "python3-core ${PN}" + +# required firmware +FILES:${PN}-firmware = "${base_libdir}/firmware/*" +INSANE_SKIP:${PN}-firmware += "arch" + +RRECOMMENDS:${PN} += " \ + ${PN}-tools \ +" + +INSANE_SKIP:${PN} += "already-stripped dev-so" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb new file mode 100644 index 00000000..d2565318 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "Userspace libraries for PowerVR SGX chipset on TI SoCs" +HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" +LICENSE = "TI-TSPA" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" + +PR = "r38" + +BRANCH = "${PV}/mesa/glibc-2.35" + +SRC_URI = " \ + git://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git;protocol=https;branch=${BRANCH} \ +" +SRCREV = "70364424dd496833fad5b243c9e6cc8b077f04ac" + +INITSCRIPT_NAME = "rc.pvr" +INITSCRIPT_PARAMS = "defaults 8" + +PACKAGECONFIG ??= "udev" +PACKAGECONFIG[udev] = "UDEV=true,,,udev" + +def use_sysvinit(d): + return d.getVar('VIRTUAL-RUNTIME_init_manager') == 'sysvinit' + +inherit ${@oe.utils.ifelse(use_sysvinit(d), 'update-rc.d', '')} + +TARGET_PRODUCT:ti33x = "ti335x_linux" +TARGET_PRODUCT:ti43x = "ti437x_linux" +TARGET_PRODUCT:omap-a15 = "ti572x_linux" +TARGET_PRODUCT:am65xx = "ti654x_linux" + +RDEPENDS:${PN} += "libdrm" + +RRECOMMENDS:${PN} += "ti-sgx-ddk-km" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ${PACKAGECONFIG_CONFARGS}" + +do_install() { + oe_runmake install +} + +FILES:${PN} = "${bindir}/*" +FILES:${PN} += " ${libdir}/*" +FILES:${PN} += "${includedir}/*" +FILES:${PN} += "${sysconfdir}/*" +FILES:${PN} += "${datadir}/*" +FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d" +FILES:${PN} += "${nonarch_base_libdir}/systemd/system" + +# No debug or dev packages for this recipe +PACKAGES = "${PN}" + +INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:${PN} += "already-stripped dev-so" diff --git a/meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc b/meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc deleted file mode 100644 index d259e58c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/bundle-devicetree.inc +++ /dev/null @@ -1,26 +0,0 @@ -# Upstream kernel-devicetree.bbclass only supports bundling the DTB with -# zImage. The factory u-boot on lego-ev3 EEPROM only supports uImage, so we -# append the DTB to the final uImage here. - -do_deploy:append() { - if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then - install -d ${DEPLOYDIR} - for dtbf in ${KERNEL_DEVICETREE}; do - dtb=`normalize_dtb "$dtbf"` - dtb_ext=${dtb##*.} - dtb_base_name=`basename $dtb .$dtb_ext` - for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do - if [ "$type" = "uImage" ]; then - cat ${D}/${KERNEL_IMAGEDEST}/$type \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ - > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin - ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ - ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin - cat ${D}/${KERNEL_IMAGEDEST}/$type \ - ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ - > ${DEPLOYDIR}/$type - fi - done - done - fi -} diff --git a/meta-ti-bsp/recipes-kernel/linux/cmem.inc b/meta-ti-bsp/recipes-kernel/linux/cmem.inc deleted file mode 100644 index fd913f6c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/cmem.inc +++ /dev/null @@ -1,96 +0,0 @@ -# Add concept of machine variants to split DTBs into subsets -# -# Use these for temporary overrides -CMEM_MACHINE = "${MACHINE}" -CMEM_MACHINE:am57xx-evm = "am571x am572x am572idk am5729-beagleboneai am574x" -CMEM_MACHINE:am57xx-hs-evm = "am571x am572x am572idk am5729-beagleboneai am574x" -CMEM_MACHINE:dra7xx-evm = "dra71x dra72x dra74x dra76x" -CMEM_MACHINE:dra7xx-hs-evm = "dra71x dra72x dra74x dra76x" - -# Set cmem.dtsi per machine or machine variant -CMEM_DTSI = "cmem.dtsi" -CMEM_DTSI_am571x = "cmem-am571x.dtsi" -CMEM_DTSI_am572idk = "cmem-am572idk.dtsi" -CMEM_DTSI_am5729-beagleboneai = "cmem-am5729-beagleboneai.dtsi" -CMEM_DTSI_am574x = "cmem-am574x.dtsi" -CMEM_DTSI_dra71x = "cmem-dra71x.dtsi" -CMEM_DTSI_dra72x = "cmem-dra72x.dtsi" -CMEM_DTSI_dra76x = "cmem-dra76x.dtsi" - -# Split device trees between variants -CMEM_DEVICETREE = "${KERNEL_DEVICETREE}" -CMEM_DEVICETREE_am571x = "am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revc.dtb" -CMEM_DEVICETREE_am572idk = "am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_am5729-beagleboneai = "am5729-beagleboneai.dtb" -CMEM_DEVICETREE_am574x = "am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_dra71x = "dra71-evm.dtb" -CMEM_DEVICETREE_dra72x = "dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ - dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_dra76x = "dra76-evm.dtb dra76-evm-tfp410.dtb" - -# Flag to enable CMEM injection -RESERVE_CMEM ?= "0" - -# Variables which influence setup_cmem -CMEM_VARS = "RESERVE_CMEM CMEM_MACHINE" -CMEM_VARS += "CMEM_DTSI ${@' '.join(map(lambda s: 'CMEM_DTSI_' + s, (d.getVar('CMEM_MACHINE') or '').split()))}" -CMEM_VARS += "CMEM_DEVICETREE ${@' '.join(map(lambda s: 'CMEM_DEVICETREE_' + s, (d.getVar('CMEM_MACHINE') or '').split()))}" - -# Add correct cmem.dtsi to SRC_URI for each variant for a given machine -python do_unpack() { - old_overrides = d.getVar('OVERRIDES', False) - - # Initialize with empty string to simplify logic to append to SRC_URI - cmem_dtsi = set(['']) - - for cmem_machine in (d.getVar('CMEM_MACHINE') or '').split(): - # Create copy of data for additional override - localdata = bb.data.createCopy(d) - localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides)) - bb.data.update_data(localdata) - - cmem_dtsi.add(localdata.getVar('CMEM_DTSI')) - - d.appendVar('SRC_URI', ' file://'.join(cmem_dtsi)) - bb.build.exec_func('base_do_unpack', d) -} - -python do_setup_cmem() { - import shutil - - old_overrides = d.getVar('OVERRIDES', False) - - if d.getVar('RESERVE_CMEM') is '1': - for cmem_machine in (d.getVar('CMEM_MACHINE') or '').split(): - # Create copy of data for additional override - localdata = bb.data.createCopy(d) - localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides)) - bb.data.update_data(localdata) - - # Get source directory and dtsi filename - src_dir = localdata.getVar('WORKDIR') - src_dtsi = localdata.getVar('CMEM_DTSI') - - # Get destination directory and destination dtsi filename which adds - # the MACHINE prefix. - dst_dir = os.path.join(localdata.getVar('S'), localdata.expand('arch/${ARCH}/boot/dts')) - dst_dtsi = localdata.expand('${MACHINE}-${CMEM_DTSI}') - - # Copy cmem.dtsi into source tree - if localdata.getVar('ARCH') is 'arm64': - shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,'ti',dst_dtsi)) - else: - shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,dst_dtsi)) - - # Inject dtsi into each dts in list - for dtb in (localdata.getVar('CMEM_DEVICETREE') or '').split(): - dts = dtb[:-4] + '.dts' - - with open(os.path.join(dst_dir,dts), 'a') as dts_file: - dts_file.write('\n#include "%s"\n' % dst_dtsi) -} - -do_patch[postfuncs] += "do_setup_cmem" -do_patch[vardeps] += "${CMEM_VARS}" diff --git a/meta-ti-bsp/recipes-kernel/linux/ffa-debugfs/ffa-debugfs-mod_%.bbappend b/meta-ti-bsp/recipes-kernel/linux/ffa-debugfs/ffa-debugfs-mod_%.bbappend deleted file mode 100644 index 67fcf6ec..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/ffa-debugfs/ffa-debugfs-mod_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Added my meta-arm, this needs ceetain backports in 5.10 -# Disable until kernel upgrades to newer than 5.10 where it -# is already upstreamed -# Revisit when kernel is upgraded to 5.15 or newer e.g. -COMPATIBLE_HOST:ti-soc = "null" diff --git a/meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi deleted file mode 100644 index 23119861..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This is a placeholder for CMEM reserved memory declarations. This - * is simply an example and does not actually reserve any memory for - * CMEM. - * - * The commented sections below provide an example for how to provide - * a reserved memory region for CMEM to use as a buffer pool. - */ -/ { -/* - reserved-memory { - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0a000000>; - no-map; - status = "okay"; - }; - }; -*/ - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "disabled"; -/* - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0a000000>; - }; -*/ - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi deleted file mode 100644 index 8ca11c78..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi +++ /dev/null @@ -1,272 +0,0 @@ -&pruss_soc_bus1 { - uio_pruss1_mdio: uio_mdio@4b232400 { - status = "okay"; - - compatible = "ti,davinci_mdio"; - reg = <0x4b232400 0x90>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&dpll_gmac_h13x2_ck>; - clock-names = "fck"; - bus_freq = <1000000>; - - reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; - reset-delay-us = <2>; /* PHY datasheet states 1uS min */ - uio_pruss1_eth0_phy: uio_ethernet-phy@0 { - reg = <0>; - }; - - uio_pruss1_eth1_phy: uio_ethernet-phy@1 { - reg = <1>; - }; - }; - - uio_pruss1_mem: uio_pruss1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b200000 0x2000>, - <0x4b202000 0x2000>, - <0x4b210000 0x8000>, - <0x4b220000 0x5404>, - <0x4b226000 0x474>, - <0x4b22e000 0xc04>, - <0x4b232000 0x154>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - status = "okay"; - }; - uio_pruss1_mem2: uio_pruss1_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x4b228000 0xd4>, - <0x4b230000 0x174>, - <0x4b232400 0x234>, - <0x40300000 0x40000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - uio_pruss1_evt0: uio_pruss1_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt1: uio_pruss1_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt2: uio_pruss1_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt3: uio_pruss1_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt4: uio_pruss1_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt5: uio_pruss1_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt6: uio_pruss1_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt7: uio_pruss1_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss1_0_mem: uio_pruss1_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b234000 0x3000>, - <0x4b222000 0xb4>, - <0x4b222400 0x3f4>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - - uio_pruss1_1_mem: uio_pruss1_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b238000 0x3000>, - <0x4b224000 0xb4>, - <0x4b224400 0x3f4>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; -}; - -&pruss_soc_bus2 { - uio_pruss2_mdio: uio_mdio@4b2b2400 { - compatible = "ti,davinci_mdio"; - reg = <0x4b2b2400 0x90>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&dpll_gmac_h13x2_ck>; - clock-names = "fck"; - bus_freq = <1000000>; - status = "okay"; - - reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; - reset-delay-us = <2>; /* PHY datasheet states 1uS min */ - - uio_pruss2_eth0_phy: ethernet-phy@0 { - reg = <0>; - }; - - uio_pruss2_eth1_phy: ethernet-phy@1 { - reg = <1>; - }; - }; - - uio_pruss2_mem: uio_pruss2_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b280000 0x2000>, - <0x4b282000 0x2000>, - <0x4b290000 0x8000>, - <0x4b2a0000 0x5404>, - <0x4b2a6000 0x474>, - <0x4b2ae000 0xc04>, - <0x4b2b2000 0x154>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - status = "okay"; - }; - uio_pruss2_mem2: uio_pruss2_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x4b2a8000 0xd4>, - <0x4b2b0000 0x174>, - <0x4b2b2400 0x234>, - <0x40340000 0x40000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - uio_pruss2_evt0: uio_pruss2_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt1: uio_pruss2_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt2: uio_pruss2_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt3: uio_pruss2_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt4: uio_pruss2_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt5: uio_pruss2_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt6: uio_pruss2_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt7: uio_pruss2_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss2_0_mem: uio_pruss2_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b2b4000 0x3000>, - <0x4b2a2000 0xb4>, - <0x4b2a2400 0x3f4>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - uio_pruss2_1_mem: uio_pruss2_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b2b8000 0x3000>, - <0x4b2a4000 0xb4>, - <0x4b2a4400 0x3f4>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - }; - -&pruss2_emac0 { - status = "disabled"; -}; - -&pruss2_emac1 { - status = "disabled"; -}; - -&pruss1 { - status = "disabled"; -}; - -&pru1_0 { - status = "disabled"; -}; - -&pru1_1 { - status = "disabled"; -}; - -&pruss1_intc { - status = "disabled"; -}; - -&pruss1_mdio { - status = "disabled"; -}; - -&pruss2 { - status = "disabled"; -}; - -&pru2_0 { - status = "disabled"; -}; - -&pru2_1 { - status = "disabled"; -}; - -&pruss2_intc { - status = "disabled"; -}; - -&pruss2_mdio { - status = "disabled"; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi deleted file mode 100644 index 4cc57118..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi +++ /dev/null @@ -1,252 +0,0 @@ -&pruss_soc_bus1 { - uio_pruss1_mem: uio_pruss1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b200000 0x2000>, - <0x4b202000 0x2000>, - <0x4b210000 0x8000>, - <0x4b220000 0x2000>, - <0x4b226000 0x2000>, - <0x4b22e000 0x31c>, - <0x4b232000 0x58>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - status = "okay"; - }; - uio_pruss1_mem2: uio_pruss1_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x4b228000 0x38>, - <0x4b230000 0x60>, - <0x4b232400 0x90>, - <0x40340000 0x40000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - uio_pruss1_evt0: uio_pruss1_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt1: uio_pruss1_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt2: uio_pruss1_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt3: uio_pruss1_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt4: uio_pruss1_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt5: uio_pruss1_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt6: uio_pruss1_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt7: uio_pruss1_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss1_0_mem: uio_pruss1_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b234000 0x3000>, - <0x4b222000 0x400>, - <0x4b222400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - - uio_pruss1_1_mem: uio_pruss1_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b238000 0x3000>, - <0x4b224000 0x400>, - <0x4b224400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; -}; - -&pruss1 { - status = "disabled"; -}; - -&pru1_0 { - status = "disabled"; -}; - -&pru1_1 { - status = "disabled"; -}; - -&pruss1_intc { - status = "disabled"; -}; - -&pruss_soc_bus2 { - uio_pruss2_mdio: uio_mdio@4b2b2400 { - compatible = "ti,davinci_mdio"; - reg = <0x4b2b2400 0x90>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&dpll_gmac_h13x2_ck>; - clock-names = "fck"; - bus_freq = <1000000>; - status = "disabled"; - }; - - uio_pruss2_mem: uio_pruss2_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b280000 0x2000>, - <0x4b282000 0x2000>, - <0x4b290000 0x8000>, - <0x4b2a0000 0x2000>, - <0x4b2a6000 0x2000>, - <0x4b2ae000 0x31c>, - <0x4b2b2000 0x58>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - status = "okay"; - }; - uio_pruss2_mem2: uio_pruss2_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x4b2a8000 0x38>, - <0x4b2b0000 0x60>, - <0x4b2b2400 0x90>, - <0x40300000 0x40000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - uio_pruss2_evt0: uio_pruss2_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt1: uio_pruss2_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt2: uio_pruss2_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt3: uio_pruss2_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt4: uio_pruss2_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt5: uio_pruss2_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt6: uio_pruss2_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt7: uio_pruss2_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss2_0_mem: uio_pruss2_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b2b4000 0x3000>, - <0x4b2a2000 0x400>, - <0x4b2a2400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - uio_pruss2_1_mem: uio_pruss2_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4b2b8000 0x3000>, - <0x4b2a4000 0x400>, - <0x4b2a4400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; -}; - -&uio_pruss2_mdio { - reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>, - <&gpio5 9 GPIO_ACTIVE_LOW>; - reset-delay-us = <2>; /* PHY datasheet states 1uS min */ -}; - -&uio_pruss2_mdio { - status = "okay"; - uio_pruss2_eth0_phy: uio_pruss2_eth0_phy@0 { - reg = <0>; - }; - - uio_pruss2_eth1_phy: uio_pruss2_eth1_phy@1 { - reg = <1>; - }; -}; - -&pruss2_emac0 { - status = "disabled"; -}; - -&pruss2_emac1 { - status = "disabled"; -}; - -&pruss2 { - status = "disabled"; -}; - -&pru2_0 { - status = "disabled"; -}; - -&pru2_1 { - status = "disabled"; -}; - -&pruss2_intc { - status = "disabled"; -}; - -&pruss2_mdio { - status = "disabled"; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi deleted file mode 100644 index ebd61296..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi deleted file mode 100644 index e0511d08..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x18000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x18000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi deleted file mode 100644 index 6c39e22c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x20000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x20000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi deleted file mode 100644 index 8fb3e871..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x18000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x18000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi deleted file mode 100644 index ebd61296..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi deleted file mode 100644 index ebd61296..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi deleted file mode 100644 index 9d207db5..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x18000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x18000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi deleted file mode 100644 index c7781c48..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi deleted file mode 100644 index 93a40ab5..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi +++ /dev/null @@ -1,192 +0,0 @@ -&pruss_soc_bus { - uio_pruss_mdio: uio_mdio@4a332400 { - compatible = "ti,davinci_mdio"; - reg = <0x4a332400 0x90>; - clocks = <&dpll_core_m4_ck>; - clock-names = "fck"; - bus_freq = <1000000>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - uio_pruss_mem: uio_pruss_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4a300000 0x2000>, - <0x4a302000 0x2000>, - <0x4a310000 0x3000>, - <0x4a320000 0x2000>, - <0x4a326000 0x2000>, - <0x4a32e000 0x31c>, - <0x4a332000 0x58>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - - status = "okay"; - }; - uio_pruss_mem2: uio_pruss_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x4a328000 0xd4>, - <0x4a330000 0x174>, - <0x4a332400 0x90>, - <0x40302000 0x0e000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - - uio_pruss_evt0: uio_pruss_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <20>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt1: uio_pruss_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <21>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt2: uio_pruss_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <22>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt3: uio_pruss_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <23>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt4: uio_pruss_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <24>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt5: uio_pruss_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <25>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt6: uio_pruss_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <26>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss_evt7: uio_pruss_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <27>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss_0_mem: uio_pruss_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4a334000 0x2000>, - <0x4a322000 0x400>, - <0x4a322400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - - uio_pruss_1_mem: uio_pruss_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x4a338000 0x2000>, - <0x4a324000 0x400>, - <0x4a324400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; -}; - -&am33xx_pinmux { - uio_pruss_mdio_eth_default: uio_pruss_mdio_eht_default { - pinctrl-single,pins = < - AM33XX_IOPAD(0x88c, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_clk.pr1_mdio_mdclk */ - AM33XX_IOPAD(0x888, (PIN_INPUT | MUX_MODE5)) /* gpmc_csn3.pr1_mdio_data */ - AM33XX_IOPAD(0x89c, (PIN_INPUT_PULLUP | MUX_MODE7)) /* gpmc_ben0_cle.gpio2_5 */ - /* disable CPSW MDIO */ - AM33XX_IOPAD(0x948, (PIN_INPUT_PULLUP | MUX_MODE7)) /* mdio_data.gpio0_0 */ - AM33XX_IOPAD(0x94c, (PIN_INPUT_PULLUP | MUX_MODE7)) /* mdio_clk.gpio0_1 */ - AM33XX_IOPAD(0x8a0, (PIN_INPUT | MUX_MODE2)) /* dss_data0.pr1_mii_mt0_clk */ - AM33XX_IOPAD(0x8b4, (PIN_OUTPUT | MUX_MODE2)) /* dss_data5.pr1_mii0_txd0 */ - AM33XX_IOPAD(0x8b0, (PIN_OUTPUT | MUX_MODE2)) /* dss_data4.pr1_mii0_txd1 */ - AM33XX_IOPAD(0x8ac, (PIN_OUTPUT | MUX_MODE2)) /* dss_data3.pr1_mii0_txd2 */ - AM33XX_IOPAD(0x8a8, (PIN_OUTPUT | MUX_MODE2)) /* dss_data2.pr1_mii0_txd3 */ - AM33XX_IOPAD(0x8cc, (PIN_INPUT | MUX_MODE5)) /* dss_data11.pr1_mii0_rxd0 */ - AM33XX_IOPAD(0x8c8, (PIN_INPUT | MUX_MODE5)) /* dss_data10.pr1_mii0_rxd1 */ - AM33XX_IOPAD(0x8c4, (PIN_INPUT | MUX_MODE5)) /* dss_data9.pr1_mii0_rxd2 */ - AM33XX_IOPAD(0x8c0, (PIN_INPUT | MUX_MODE5)) /* dss_data8.pr1_mii0_rxd3 */ - AM33XX_IOPAD(0x8a4, (PIN_OUTPUT | MUX_MODE2)) /* dss_data1.pr1_mii0_txen */ - AM33XX_IOPAD(0x8d8, (PIN_INPUT | MUX_MODE5)) /* dss_data14.pr1_mii_mr0_clk */ - AM33XX_IOPAD(0x8dc, (PIN_INPUT | MUX_MODE5)) /* dss_data15.pr1_mii0_rxdv */ - AM33XX_IOPAD(0x8d4, (PIN_INPUT | MUX_MODE5)) /* dss_data13.pr1_mii0_rxer */ - AM33XX_IOPAD(0x8d0, (PIN_INPUT | MUX_MODE5)) /* dss_data12.pr1_mii0_rxlink */ - AM33XX_IOPAD(0x8e8, (PIN_INPUT | MUX_MODE2)) /* dss_pclk.pr1_mii0_crs */ - - AM33XX_IOPAD(0x840, (PIN_INPUT | MUX_MODE5)) /* gpmc_a0.pr1_mii_mt1_clk */ - AM33XX_IOPAD(0x850, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a4.pr1_mii1_txd0 */ - AM33XX_IOPAD(0x84c, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a3.pr1_mii1_txd1 */ - AM33XX_IOPAD(0x848, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a2.pr1_mii1_txd2 */ - AM33XX_IOPAD(0x844, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a1.pr1_mii1_txd3 */ - AM33XX_IOPAD(0x860, (PIN_INPUT | MUX_MODE5)) /* gpmc_a8.pr1_mii1_rxd0 */ - AM33XX_IOPAD(0x85c, (PIN_INPUT | MUX_MODE5)) /* gpmc_a7.pr1_mii1_rxd1 */ - AM33XX_IOPAD(0x858, (PIN_INPUT | MUX_MODE5)) /* gpmc_a6.pr1_mii1_rxd2 */ - AM33XX_IOPAD(0x854, (PIN_INPUT | MUX_MODE5)) /* gpmc_a5.pr1_mii1_rxd3 */ - AM33XX_IOPAD(0x874, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_wpn.pr1_mii1_txen */ - AM33XX_IOPAD(0x864, (PIN_INPUT | MUX_MODE5)) /* gpmc_a9.pr1_mii_mr1_clk */ - AM33XX_IOPAD(0x868, (PIN_INPUT | MUX_MODE5)) /* gpmc_a10.pr1_mii1_rxdv */ - AM33XX_IOPAD(0x86c, (PIN_INPUT | MUX_MODE5)) /* gpmc_a11.pr1_mii1_rxer */ - AM33XX_IOPAD(0x878, (PIN_INPUT | MUX_MODE5)) /* gpmc_ben1.pr1_mii1_rxlink */ - AM33XX_IOPAD(0x8ec, (PIN_INPUT | MUX_MODE2)) /* lcd_ac_bias_en.pr1_mii1_crs */ - AM33XX_IOPAD(0x870, (PIN_INPUT | MUX_MODE5)) /* gpmc_wait0.pr1_mii1_col */ - >; - }; -}; - -&uio_pruss_mdio { - pinctrl-0 = <&uio_pruss_mdio_eth_default>; - pinctrl-names = "default"; - reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; - reset-delay-us = <2>; /* PHY datasheet states 1uS min */ - status = "okay"; - - uio_pruss_eth0_phy: ethernet-phy@1 { - reg = <1>; - }; - - uio_pruss_eth1_phy: ethernet-phy@3 { - reg = <3>; - }; -}; - -&pruss { - status = "disabled"; -}; - -&pru0 { - status = "disabled"; -}; - -&pru1 { - status = "disabled"; -}; - -&pruss_intc { - status = "disabled"; -}; - -&pruss_mdio { - status = "disabled"; -}; - -&pruss_emac0 { - status = "disabled"; -}; - -&pruss_emac1 { - status = "disabled"; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi deleted file mode 100644 index 80993c4b..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi +++ /dev/null @@ -1,292 +0,0 @@ -&pruss_soc_bus { - uio_pruss2_mdio: uio_mdio@54432400 { - compatible = "ti,davinci_mdio"; - reg = <0x54432400 0x90>; - clocks = <&dpll_core_m4_ck>; - clock-names = "fck"; - bus_freq = <1000000>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - uio_pruss2_mem: uio_pruss2_mem { - compatible = "ti,uio-module-drv"; - mem = <0x54400000 0x2000>, - <0x54402000 0x2000>, - <0x54410000 0x8000>, - <0x54420000 0x2000>, - <0x54426000 0x2000>, - <0x5442e000 0x31c>, - <0x54432000 0x58>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - status = "okay"; - }; - uio_pruss2_mem2: uio_pruss2_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x54428000 0x38>, - <0x54430000 0x60>, - <0x54432400 0x90>, - <0x40320000 0x20000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - uio_pruss2_evt0: uio_pruss2_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt1: uio_pruss2_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt2: uio_pruss2_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt3: uio_pruss2_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt4: uio_pruss2_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt5: uio_pruss2_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt6: uio_pruss2_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss2_evt7: uio_pruss2_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss2_0_mem: uio_pruss2_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x54434000 0x3000>, - <0x54422000 0x400>, - <0x54422400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - - uio_pruss2_1_mem: uio_pruss2_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x54438000 0x3000>, - <0x54424000 0x400>, - <0x54424400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - - uio_pruss1_mem: uio_pruss1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x54440000 0x1000>, - <0x54442000 0x1000>, - <0x54450000 0x8000>, - <0x54460000 0x2000>, - <0x54466000 0x2000>, - <0x5446e000 0x31c>, - <0x54472000 0x58>; - mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", - "iep", "mii_rt"; - status = "okay"; - }; - uio_pruss1_mem2: uio_pruss1_mem2 { - compatible = "ti,uio-module-drv"; - mem = <0x54468000 0x38>, - <0x54470000 0x60>, - <0x54472400 0x90>, - <0x40302000 0x1e000>; - mem-names = "uart", "ecap", "mdio", "ocmc"; - status = "okay"; - }; - uio_pruss1_evt0: uio_pruss1_evt0 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt1: uio_pruss1_evt1 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt2: uio_pruss1_evt2 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt3: uio_pruss1_evt3 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt4: uio_pruss1_evt4 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt5: uio_pruss1_evt5 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt6: uio_pruss1_evt6 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - uio_pruss1_evt7: uio_pruss1_evt7 { - compatible = "ti,uio-module-drv"; - interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>; - interrupt-mode = <1>; - status = "okay"; - }; - - uio_pruss1_0_mem: uio_pruss1_0_mem { - compatible = "ti,uio-module-drv"; - mem = <0x54474000 0x1000>, - <0x54462000 0x400>, - <0x54462400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; - uio_pruss1_1_mem: uio_pruss1_1_mem { - compatible = "ti,uio-module-drv"; - mem = <0x54478000 0x1000>, - <0x54464000 0x400>, - <0x54464400 0x100>; - mem-names = "iram", "control", "debug"; - status = "okay"; - }; -}; - -&am43xx_pinmux { - uio_pruss2_mdio_eth_default: uio_pruss2_mdio_eth_default { - pinctrl-single,pins = < - AM4372_IOPAD(0x88c, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_clk.pr1_mdio_mdclk */ - AM4372_IOPAD(0xa70, (PIN_INPUT | MUX_MODE8)) /* xdma_event_intr0.pr1_mdio_data */ - AM4372_IOPAD(0xa00, (PIN_INPUT_PULLUP | MUX_MODE7)) /* cam1_data6.gpio4_20 */ - AM4372_IOPAD(0x8a0, (PIN_INPUT | MUX_MODE2)) /* dss_data0.pr1_mii_mt0_clk */ - AM4372_IOPAD(0x8b4, (PIN_OUTPUT | MUX_MODE2)) /* dss_data5.pr1_mii0_txd0 */ - AM4372_IOPAD(0x8b0, (PIN_OUTPUT | MUX_MODE2)) /* dss_data4.pr1_mii0_txd1 */ - AM4372_IOPAD(0x8ac, (PIN_OUTPUT | MUX_MODE2)) /* dss_data3.pr1_mii0_txd2 */ - AM4372_IOPAD(0x8a8, (PIN_OUTPUT | MUX_MODE2)) /* dss_data2.pr1_mii0_txd3 */ - AM4372_IOPAD(0x8cc, (PIN_INPUT | MUX_MODE5)) /* dss_data11.pr1_mii0_rxd0 */ - AM4372_IOPAD(0x8c8, (PIN_INPUT | MUX_MODE5)) /* dss_data10.pr1_mii0_rxd1 */ - AM4372_IOPAD(0x8c4, (PIN_INPUT | MUX_MODE5)) /* dss_data9.pr1_mii0_rxd2 */ - AM4372_IOPAD(0x8c0, (PIN_INPUT | MUX_MODE5)) /* dss_data8.pr1_mii0_rxd3 */ - AM4372_IOPAD(0x8a4, (PIN_OUTPUT | MUX_MODE2)) /* dss_data1.pr1_mii0_txen */ - AM4372_IOPAD(0x8d8, (PIN_INPUT | MUX_MODE5)) /* dss_data14.pr1_mii_mr0_clk */ - AM4372_IOPAD(0x8dc, (PIN_INPUT | MUX_MODE5)) /* dss_data15.pr1_mii0_rxdv */ - AM4372_IOPAD(0x8d4, (PIN_INPUT | MUX_MODE5)) /* dss_data13.pr1_mii0_rxer */ - AM4372_IOPAD(0x8d0, (PIN_INPUT | MUX_MODE5)) /* dss_data12.pr1_mii0_rxlink */ - AM4372_IOPAD(0xa40, (PIN_INPUT | MUX_MODE5)) /* gpio5_10.pr1_mii0_crs */ - AM4372_IOPAD(0xa38, (PIN_INPUT | MUX_MODE5)) /* gpio5_8.pr1_mii0_col */ - AM4372_IOPAD(0x858, (PIN_INPUT | MUX_MODE5)) /* gpmc_a6.pr1_mii_mt1_clk */ - AM4372_IOPAD(0x854, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a5.pr1_mii1_txd0 */ - AM4372_IOPAD(0x850, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a4.pr1_mii1_txd1 */ - AM4372_IOPAD(0x84c, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a3.pr1_mii1_txd2 */ - AM4372_IOPAD(0x848, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a2.pr1_mii1_txd3 */ - AM4372_IOPAD(0x86c, (PIN_INPUT | MUX_MODE5)) /* gpmc_a11.pr1_mii1_rxd0 */ - AM4372_IOPAD(0x868, (PIN_INPUT | MUX_MODE5)) /* gpmc_a10.pr1_mii1_rxd1 */ - AM4372_IOPAD(0x864, (PIN_INPUT | MUX_MODE5)) /* gpmc_a9.pr1_mii1_rxd2 */ - AM4372_IOPAD(0x860, (PIN_INPUT | MUX_MODE5)) /* gpmc_a8.pr1_mii1_rxd3 */ - AM4372_IOPAD(0x840, (PIN_OUTPUT | MUX_MODE5)) /* gpmc_a0.pr1_mii1_txen */ - AM4372_IOPAD(0x85c, (PIN_INPUT | MUX_MODE5)) /* gpmc_a7.pr1_mii_mr1_clk */ - AM4372_IOPAD(0x844, (PIN_INPUT | MUX_MODE5)) /* gpmc_a1.pr1_mii1_rxdv */ - AM4372_IOPAD(0x874, (PIN_INPUT | MUX_MODE5)) /* gpmc_wpn.pr1_mii1_rxer */ - AM4372_IOPAD(0xa4c, (PIN_INPUT | MUX_MODE5)) /* gpio5_13.pr1_mii1_rxlink */ - AM4372_IOPAD(0xa44, (PIN_INPUT | MUX_MODE5)) /* gpio5_11.pr1_mii1_crs */ - AM4372_IOPAD(0x878, (PIN_INPUT | MUX_MODE5)) /* gpmc_be1n.pr1_mii1_col */ - >; - }; -}; - -&uio_pruss2_mdio { - pinctrl-0 = <&uio_pruss2_mdio_eth_default>; - pinctrl-names = "default"; - status = "okay"; - - reset-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; - reset-delay-us = <2>; /* PHY datasheet states 1uS min */ - - uio_pruss2_eth0_phy: uio_ethernet-phy@0 { - reg = <0>; - }; - - uio_pruss2_eth1_phy: uio_ethernet-phy@1 { - reg = <1>; - }; -}; - -&pruss1 { - status = "disabled"; -}; - -&pru1_0 { - status = "disabled"; -}; - -&pru1_1 { - status = "disabled"; -}; - -&pruss1_intc { - status = "disabled"; -}; - -&pruss1_mdio { - status = "disabled"; -}; - -&pruss0 { - status = "disabled"; -}; - -&pru0_0 { - status = "disabled"; -}; - -&pru0_1 { - status = "disabled"; -}; - -&pruss0_intc { - status = "disabled"; -}; - -&pruss1_emac0 { - status = "disabled"; -}; - -&pruss1_emac1 { - status = "disabled"; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc deleted file mode 100644 index bb2c1a00..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ /dev/null @@ -1,34 +0,0 @@ -# Pull in the devicetree files into the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" - -# Add run-time dependency for PM firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " amx3-cm3" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " amx3-cm3" - -# Add run-time dependency for VPE VPDMA firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw" - -# Add run-time dependency for Goodix firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" - -# Add run-time dependency for PRU Ethernet firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx-hs-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx-evm = " prueth-fw-am65x-sr2 prusw-fw-am65x-sr2" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx-evm = " prueth-fw-am65x-sr2" - -# Add run-time dependency for Cadence MHDP firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " cadence-mhdp-fw" - -# Add run-time dependency for Video Decoding firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw" - -# Add run-time dependency for Chips&Media Wave521 firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2-evm = " cnm-wave-fw" - -# Add run-time dependency for TIFS Low Power Module stub -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx-evm = " tifs-lpm-stub" - diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig new file mode 100644 index 00000000..a5de2e24 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig @@ -0,0 +1 @@ +use-kernel-config=bb.org_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb new file mode 100644 index 00000000..d6c4b993 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb @@ -0,0 +1,35 @@ +SECTION = "kernel" +SUMMARY = "BeagleBoard.org Linux kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +COMPATIBLE_MACHINE = "beagle.*" + +inherit kernel + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/ti-kernel.inc + +# BB.org hasn't switched to "vendored" DTB layout by default yet +KERNEL_DTBVENDORED = "0" + +DEPENDS += "gmp-native libmpc-native" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" + +S = "${WORKDIR}/git" + +# 6.1.69 version for 32-bit +SRCREV:armv7a = "a1f26a19581970f76220c68c438981796ce5b767" +PV:armv7a = "6.1.69+git${SRCPV}" +BRANCH:armv7a = "v6.1.69-ti-r22" + +# 6.1.69 version for 64-bit +SRCREV:aarch64 = "bc76b5d278271f66a6faeb2d09cb09fc6c57dd3c" +PV:aarch64 = "6.1.69+git${SRCPV}" +BRANCH:aarch64 = "v6.1.69-ti-arm64-r24" + +SRC_URI = " \ + git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \ + file://defconfig \ +" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig deleted file mode 100644 index d083d182..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig deleted file mode 100644 index dcb53bab..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig deleted file mode 100644 index b9bc6137..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig deleted file mode 100644 index b3467853..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig deleted file mode 100644 index 88f80fa9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig deleted file mode 100644 index 4b9daaf9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index af823b98..a7b5ca74 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -1,13 +1,10 @@ SECTION = "kernel" -SUMMARY = "Mainline Linux kernel for TI devices (with ti-upstream-tools)" +SUMMARY = "Mainline Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh" -require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc DEPENDS += "gmp-native libmpc-native" @@ -17,55 +14,25 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ S = "${WORKDIR}/git" -BRANCH = "master" -TOOLS_BRANCH = "master" - -# 5.15 Mainline version -SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813" -PV = "5.15+git${SRCPV}" +# 6.2 Mainline version +SRCREV = "c9c3395d5e3dcc6daee66c6908354d47bf98cb0c" +PV = "6.2+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_PROTOCOL = "https" +KERNEL_GIT_BRANCH = "master" SRC_URI += " \ - ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ - git://git.ti.com/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ - file://defconfig \ + ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \ " -SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" -SRCREV_FORMAT = "linux" - -KERNEL_DEVICETREE = "" - -kernel_do_compile:append() { - oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} - oe_runmake -C ${WORKDIR}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} -} - -do_install:append() { - for dtbf in `find arch/${ARCH}/boot/dts/ \( -name '*.dtb' -or -name '*.dtbo' \)`; do - dtb="$dtbf" - dtb_ext=${dtb##*.} - dtb_base_name=`basename $dtb .$dtb_ext` - dtb_path=`get_real_dtb_path_in_kernel "$dtb"` - install -m 0644 $dtbf ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext - done -} - -do_deploy:append() { - for dtbf in `find arch/${ARCH}/boot/dts/ \( -name '*.dtb' -or -name '*.dtbo' \) -printf '%P\n'`; do - dtb="$dtbf" - dtb_ext=${dtb##*.} - dtb_base_name=`basename $dtb .$dtb_ext` - dtb_dir=`dirname $dtb` - install -d ${DEPLOYDIR} - install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext - done -} +DEFCONFIG_NAME = "multi_v7_defconfig" +DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" +DEFCONFIG_NAME:k3 = "defconfig" +KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" do_shared_workdir:prepend() { cd ${B} diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb new file mode 100644 index 00000000..b3f5f9eb --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb @@ -0,0 +1,26 @@ +SECTION = "kernel" +SUMMARY = "Linux-next kernel for TI devices" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +inherit kernel + +require recipes-kernel/linux/ti-kernel.inc +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} + +DEPENDS += "gmp-native libmpc-native" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" + +S = "${WORKDIR}/git" + +# 6.6.0-rc3+ version +SRCREV = "6465e260f48790807eef06b583b38ca9789b6072" +PV = "6.6.0-rc3+git${SRCPV}" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" + +DEFCONFIG_NAME = "multi_v7_defconfig" +DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" +DEFCONFIG_NAME:k3 = "defconfig" +KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/defconfig deleted file mode 100644 index d083d182..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/dra7xx/defconfig deleted file mode 100644 index dcb53bab..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/k3/defconfig deleted file mode 100644 index b9bc6137..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/omapl138/defconfig deleted file mode 100644 index b3467853..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti33x/defconfig deleted file mode 100644 index 88f80fa9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti43x/defconfig deleted file mode 100644 index 4b9daaf9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.10/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/defconfig deleted file mode 100644 index d083d182..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig deleted file mode 100644 index dcb53bab..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig deleted file mode 100644 index b9bc6137..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig deleted file mode 100644 index b3467853..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig deleted file mode 100644 index 88f80fa9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig deleted file mode 100644 index 4b9daaf9..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig new file mode 100644 index 00000000..e6a967e1 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig new file mode 100644 index 00000000..e6a967e1 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/defconfig deleted file mode 100644 index f0b8bab0..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/dra7xx/defconfig deleted file mode 100644 index 47e3d04a..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/k3/defconfig deleted file mode 100644 index cc10bfda..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti33x/defconfig deleted file mode 100644 index 0a4fbac2..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti43x/defconfig deleted file mode 100644 index 99594c81..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.10/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig deleted file mode 100644 index f0b8bab0..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig deleted file mode 100644 index 47e3d04a..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig deleted file mode 100644 index cc10bfda..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig deleted file mode 100644 index 0a4fbac2..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig deleted file mode 100644 index 99594c81..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_rt_release diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig new file mode 100644 index 00000000..43089dc8 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig new file mode 100644 index 00000000..47d78664 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig new file mode 100644 index 00000000..2c829c0b --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=davinci_all_defconfig +config-fragment=kernel/configs/ti_rt.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig new file mode 100644 index 00000000..5de2b229 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig new file mode 100644 index 00000000..5de2b229 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb deleted file mode 100644 index 61327720..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -require linux-ti-staging_5.10.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:" - -BRANCH = "ti-rt-linux-5.10.y" - -SRCREV = "44a4e68ecf519fd2e35417371fbac546c416d2d9" -PV = "5.10.109+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb deleted file mode 100644 index 8a0c0eaf..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require linux-ti-staging_5.4.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.4:" - -BRANCH = "ti-rt-linux-5.4.y" - -SRCREV = "519667b0d81d74a6e55105dcd6072ae550352599" -PV = "5.4.106+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb new file mode 100644 index 00000000..6068b7b3 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb @@ -0,0 +1,15 @@ +require linux-ti-staging_6.1.bb + +KERNEL_LOCALVERSION:append = "-rt" + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" + +BRANCH = "ti-rt-linux-6.1.y" + +SRCREV = "01dbe4e64bacaa4c891c1997f2724c320698d61f" + +include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} + +PV = "6.1.82+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/defconfig deleted file mode 100644 index 5d051bd1..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/dra7xx/defconfig deleted file mode 100644 index 2b3635c3..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/k3/defconfig deleted file mode 100644 index 56cf9302..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/omapl138/defconfig deleted file mode 100644 index 95b61168..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti33x/defconfig deleted file mode 100644 index 9ab6733c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti43x/defconfig deleted file mode 100644 index 825c31cd..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.10/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig deleted file mode 100644 index 5d051bd1..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omap2_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig deleted file mode 100644 index 2b3635c3..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_dra7x_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig deleted file mode 100644 index 56cf9302..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_arm64_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig deleted file mode 100644 index 95b61168..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_omapl138_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig deleted file mode 100644 index 9ab6733c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am3x_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig deleted file mode 100644 index 825c31cd..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-tisdk-config=ti_sdk_am4x_debug diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_5.10.bb deleted file mode 100644 index e57d82eb..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_5.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -require linux-ti-staging_5.10.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_5.4.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb index 7a9a148b..9c170e65 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_5.4.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb @@ -1,5 +1,5 @@ -require linux-ti-staging_5.4.bb +require linux-ti-staging_6.1.bb # Look in the generic major.minor directory for files # This will have priority over generic non-rt path -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.4:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.4.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.4.bb deleted file mode 100644 index 9b2d1be1..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.4.bb +++ /dev/null @@ -1,43 +0,0 @@ -SECTION = "kernel" -SUMMARY = "Linux kernel for TI devices" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - -inherit kernel - -DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" -require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/cmem.inc -require recipes-kernel/linux/ti-uio.inc -require recipes-kernel/linux/bundle-devicetree.inc -require recipes-kernel/linux/kernel-rdepends.inc - -# Look in the generic major.minor directory for files -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.4:" - -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" - -S = "${WORKDIR}/git" - -BRANCH = "ti-linux-5.4.y" - -SRCREV = "023faefa70274929bff92dc41167b007f7523792" -PV = "5.4.106+git${SRCPV}" - -# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR:append = "a" -PR = "${MACHINE_KERNEL_PR}" - -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" -SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ - file://defconfig" - -FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb" - -# Special configuration for remoteproc/rpmsg IPC modules -module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" -module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" -module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus" -KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc" -KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index a0581cb4..89787668 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -3,51 +3,40 @@ SUMMARY = "Linux kernel for TI devices" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +inherit ti-secdev inherit kernel -DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/cmem.inc -require recipes-kernel/linux/ti-uio.inc -require recipes-kernel/linux/bundle-devicetree.inc -require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} +include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} DEPENDS += "gmp-native libmpc-native" # Look in the generic major.minor directory for files -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" S = "${WORKDIR}/git" -BRANCH = "ti-linux-5.10.y" +BRANCH ?= "ti-linux-6.1.y" -SRCREV = "9cff62efaca103acf18b8478362ec56e11d7f526" -PV = "5.10.109+git${SRCPV}" +SRCREV ?= "e44f83d2aa4366b3097307c5915d03696cf3e1b8" +PV = "6.1.82+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL = "https" SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ file://defconfig" -FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb" - # Special configuration for remoteproc/rpmsg IPC modules module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus" KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc" -KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch" - -# Disable SA2UL for AM64x HS and J7200 HS -module_conf_sa2ul:am64xx-hs-evm = "blacklist sa2ul" -KERNEL_MODULE_PROBECONF:append:am64xx-hs-evm = " sa2ul" -module_conf_sa2ul:j7200-hs-evm = "blacklist sa2ul" -KERNEL_MODULE_PROBECONF:append:j7200-hs-evm = " sa2ul" diff --git a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc index 1e97acc0..8da90c79 100644 --- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc +++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc @@ -1,6 +1,4 @@ -# KERNEL_LOCALVERSION can be set to add a tag to the end of the -# kernel version string. such as the commit id -KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}" +KERNEL_LOCALVERSION = "-ti" # Check the defconfig file and see if it points to an in kernel # defconfig that should be used, or if it is a complete config file @@ -13,8 +11,10 @@ do_configure() { # tree config cp ${WORKDIR}/defconfig ${B}/.config - echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion - echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion + scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12)) + + echo ${scm_version} > ${B}/.scmversion + echo ${scm_version} > ${S}/.scmversion # Zero, when using "tisdk" configs, pass control to defconfig_builder config=`cat ${B}/.config | grep use-tisdk-config | cut -d= -f2` diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc new file mode 100644 index 00000000..530a1783 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc @@ -0,0 +1,11 @@ + +# Use different commit, repo and branch for TI extras build +# This will have priority over generic rt path + +COMPATIBLE_MACHINE = "am62xx|am62pxx" + +BRANCH = "ti-rt-linux-6.1.y" +BRANCH:tie-jailhouse = "ti-rt-linux-6.1.y-jailhouse" + +SRCREV = "685e77152461bd6b791500f717bec62d17c1b36d" +SRCREV:tie-jailhouse = "a74088b40b4d27478a2af5c20cdc0b4ec8ed9470" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc new file mode 100644 index 00000000..0b22aca9 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc @@ -0,0 +1,14 @@ + +# Use different commit, repo and branch for TI extras build +# This will have priority over generic rt path + +COMPATIBLE_MACHINE = "am62xx|am62pxx" + +BRANCH = "ti-linux-6.1.y" +BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse" + +SRCREV = "ec058c3ddc5377c629e988a95ef84826b14a3307" +SRCREV:tie-jailhouse = "d035e0cc72399f1c087a63c4210d29e79a7a66e4" + +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" + diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc new file mode 100644 index 00000000..04c91004 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc @@ -0,0 +1,42 @@ + +def get_dtbs_from_kernel(dts_dir, dts_prefix): + import os + import glob + matches = [] + + for prefix in dts_prefix.split(): + filenames = glob.glob(dts_dir + prefix + '*.dts') + filenames += glob.glob(dts_dir + prefix + '*.dtso') + for filename in filenames: + # Before v6.2 kernels DTB Overlays shared the same name as DTB files + # so we need to search the file to find the type + with open(filename) as f: + file_postfix = '.dtbo' if '/plugin/;' in f.read() else '.dtb' + filename = os.path.split(filename)[1] + filename = os.path.splitext(filename)[0] + file_postfix + filename = os.path.join(os.path.split(prefix)[0], filename) + matches.append(filename) + return ' '.join(matches) + +def get_merge_dtbs_from_kernel(dts_dir, dts_pattern): + import os + matches = [] + if dts_dir == "": + return ' ' + for pattern in dts_pattern.split(): + pattern_dir = os.path.split(pattern)[0] + pattern_target = os.path.split(pattern)[1].replace(".","-") + "s" + makefile = dts_dir + "/" + pattern_dir + "/Makefile" + if os.path.exists(makefile): + with open(makefile) as f: + if pattern_target in f.read(): + matches.append(pattern) + return ' '.join(matches) + +KERNEL_DEVICETREE_DTBMERGE ?= "" + +KERNEL_DEVICETREE = " \ + ${@get_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_PREFIX}')} \ + ${@get_merge_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_DTBMERGE}')} \ +" + diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc index a7eb476e..6edcd6d8 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc @@ -7,3 +7,9 @@ def get_extra_dtc_args(d): return "" EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}" + +# Tell the kernel class to install the DTBs in the same directory structure as +# the kernel. +KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" +KERNEL_DTBVENDORED = "1" + diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-uio.inc b/meta-ti-bsp/recipes-kernel/linux/ti-uio.inc deleted file mode 100644 index eea7866a..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/ti-uio.inc +++ /dev/null @@ -1,71 +0,0 @@ -SRC_URI:append:dra7xx = " file://am57xx-pru-uio.dtsi \ - file://am571x-pru-uio.dtsi \ -" -SRC_URI:append:ti33x = " file://am335x-pru-uio.dtsi" -SRC_URI:append:ti43x = " file://am437x-pru-uio.dtsi" - -DTSI_LIST = "" - -do_setup_uio() { - if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ] - then - for dtsi in ${DTSI_LIST} - do - cp ${WORKDIR}/${dtsi} ${S}/arch/arm/boot/dts/ - for dtb in ${KERNEL_DEVICETREE} - do - dts=`echo $dtb | sed -e 's|dtb$|dts|'` - echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts - done - done - fi -} - -do_setup_uio:append:dra7xx() { - - if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ] - then - dtsi="am57xx-pru-uio.dtsi" - cp ${WORKDIR}/${dtsi} ${S}/arch/arm/boot/dts/ - - dts="am572x-idk-pru-excl-uio.dts" - cp ${S}/arch/arm/boot/dts/am572x-idk.dts ${S}/arch/arm/boot/dts/$dts - echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts - - dts="am574x-idk-pru-excl-uio.dts" - cp ${S}/arch/arm/boot/dts/am574x-idk.dts ${S}/arch/arm/boot/dts/$dts - echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts - - dts="am571x-idk-pru-excl-uio.dts" - dtsi="am571x-pru-uio.dtsi" - cp ${S}/arch/arm/boot/dts/am571x-idk.dts ${S}/arch/arm/boot/dts/$dts - cp ${WORKDIR}/${dtsi} ${S}/arch/arm/boot/dts/ - echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts - fi -} - -do_setup_uio:append:ti33x() { - - if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ] - then - dts="am335x-icev2-pru-excl-uio.dts" - dtsi="am335x-pru-uio.dtsi" - cp ${S}/arch/arm/boot/dts/am335x-icev2-prueth.dts ${S}/arch/arm/boot/dts/$dts - cp ${WORKDIR}/${dtsi} ${S}/arch/arm/boot/dts/ - echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts - fi -} - -do_setup_uio:append:ti43x() { - - if [ "${ENABLE_TI_UIO_DEVICES}" == "1" ] - then - dts="am437x-idk-pru-excl-uio.dts" - dtsi="am437x-pru-uio.dtsi" - cp ${S}/arch/arm/boot/dts/am437x-idk-evm.dts ${S}/arch/arm/boot/dts/$dts - cp ${WORKDIR}/${dtsi} ${S}/arch/arm/boot/dts/ - echo "#include \"${dtsi}\"" >> ${S}/arch/arm/boot/dts/$dts - fi -} - -do_patch[postfuncs] += "do_setup_uio" diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-overrides.inc new file mode 100644 index 00000000..90fc70aa --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-overrides.inc @@ -0,0 +1,4 @@ +inherit pkgconfig +DEPENDS += "util-linux" + +EXTRA_OEMAKE += "PKG_CONFIG=pkg-config" diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc new file mode 100644 index 00000000..0f1da594 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc @@ -0,0 +1,2 @@ +PV = "4.1.0+git${SRCPV}" +SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2" diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend new file mode 100644 index 00000000..0cee127f --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-client_3.16%.bbappend @@ -0,0 +1,9 @@ +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc new file mode 100644 index 00000000..7a733f53 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc @@ -0,0 +1,3 @@ +PV = "4.0.0+git${SRCPV}" +SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035" +SRC_URI:remove = "file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch" diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend new file mode 100644 index 00000000..f193e78b --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend @@ -0,0 +1,4 @@ +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${OPTEE_TI_VERSION} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend new file mode 100644 index 00000000..17856dc3 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -0,0 +1,4 @@ +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "optee-os-ti-version.inc" + +require ${OPTEE_TI_VERSION} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc index 6097580f..a6c17359 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc @@ -1,14 +1,16 @@ +# Use TI SECDEV for signing +inherit ti-secdev + EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" -do_compile:prepend:ti-soc() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} -} +EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1" +EXTRA_OEMAKE:append:am62pxx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" +EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1" +EXTRA_OEMAKE:append:j722s = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" do_compile:append:k3() { - ( cd ${B}/core/; \ - cp tee-pager_v2.bin ${B}/bl32.bin; \ - cp tee.elf ${B}/bl32.elf; \ - ) + cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin + cp ${B}/core/tee.elf ${B}/bl32.elf } # Signing procedure for legacy HS devices @@ -30,15 +32,6 @@ optee_sign_legacyhs() { fi } -# Signing procedure for K3 HS devices -optee_sign_k3hs() { - ( cd ${B}/core/; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \ - mv tee-pager.bin.signed ${B}/bl32.bin; \ - cp tee.elf ${B}/bl32.elf; \ - ) -} - do_compile:append:ti43x() { optee_sign_legacyhs } @@ -47,26 +40,14 @@ do_compile:append:dra7xx() { optee_sign_legacyhs } -do_compile:append:am65xx-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:am64xx-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:j721e-hs-evm() { - optee_sign_k3hs -} - -do_compile:append:j7200-hs-evm() { - optee_sign_k3hs -} - -do_install:append:ti-soc() { +do_install:append() { install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true + + # Install embedded TAs + mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/ + install -D -p -m0444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/ } optee_deploy_legacyhs() { @@ -89,5 +70,7 @@ do_deploy:append:k3() { ln -sf optee/bl32.elf ${DEPLOYDIR}/ } +FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" + # This is needed for bl32.elf INSANE_SKIP:${PN}:append:k3 = " textrel" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc new file mode 100644 index 00000000..34f4c809 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc @@ -0,0 +1,2 @@ +PV = "4.1.0+git${SRCPV}" +SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend new file mode 100644 index 00000000..0cee127f --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os_3.16%.bbappend @@ -0,0 +1,9 @@ +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc new file mode 100644 index 00000000..6bbb0bfa --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc @@ -0,0 +1,2 @@ +EXTRA_OEMAKE:append = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}" +DEPENDS:append = " openssl" diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc new file mode 100644 index 00000000..0091ad56 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc @@ -0,0 +1,2 @@ +PV = "4.1.0+git${SRCPV}" +SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2" diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend new file mode 100644 index 00000000..0cee127f --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend @@ -0,0 +1,9 @@ +OPTEE_TI_VERSION = "" +OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc" + +require ${OPTEE_TI_VERSION} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc index 4962a3ec..ec1e71be 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc @@ -9,4 +9,4 @@ PLATFORM = "UNKNOWN" PLATFORM:dra7xx = "DRA7XX" PLATFORM:omapl138 = "OMAPL138" -ALT_PLATFORM:am57xx-evm = "AM572X AM571X" +ALT_PLATFORM:am57xx = "AM572X AM571X" diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc index 3f6b7bce..44be2466 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc @@ -4,8 +4,8 @@ HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" -TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git" -TI_IPC_GIT_PROTOCOL = "git" +TI_IPC_GIT_URI = "git://git.ti.com/git/ipc/ipcdev.git" +TI_IPC_GIT_PROTOCOL = "https" TI_IPC_GIT_BRANCH = "master" #Corresponds to 3.51.00.00A diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch new file mode 100644 index 00000000..ef12af88 --- /dev/null +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch @@ -0,0 +1,35 @@ +From 66ca0e732c2e287814d4fc5082b818554ee42398 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <reatmon@ti.com> +Date: Fri, 28 Apr 2023 14:30:59 -0500 +Subject: [PATCH] MmRpc: Stop looking for rpmsg_rpc.h in the kernel + +Stop looking for the rpmsg_rpc.h in the kernel. While we are doing the +LTS migration for kirkstone, this file is not going to be in the kernel +for a bit. This patch works in conjunction with a recipe change that +downloads the header and adds a -I to the CFLAGS to pick it up. This +will be removed once the 6.1 kernel has been updated. + +Signed-off-by: Ryan Eatmon <reatmon@ti.com> + +Upstream-Status: Inappropriate [other] + +--- + packages/ti/ipc/mm/MmRpc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packages/ti/ipc/mm/MmRpc.c b/packages/ti/ipc/mm/MmRpc.c +index 2df7420..10f496b 100644 +--- a/packages/ti/ipc/mm/MmRpc.c ++++ b/packages/ti/ipc/mm/MmRpc.c +@@ -64,7 +64,7 @@ + #define linux_include(kd,m) <kd/include/uapi/linux/m.h> + #endif + +-#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc) ++#include "linux/rpmsg_rpc.h" + + #ifdef _linux_ + #define linux _linux +-- +2.17.1 + diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb index 01b857c2..e2db6efd 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb @@ -8,12 +8,18 @@ PR = "${INC_PR}.2" DEPENDS += "virtual/kernel" +SRC_URI:append = " https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/plain/include/uapi/linux/rpmsg_rpc.h?h=ti-linux-5.10.y;name=rpmsg_rpc;subdir=linux;downloadfilename=rpmsg_rpc.h" +SRC_URI[rpmsg_rpc.sha256sum] = "cd237f40a37520a1f2df19fbfeefd00c0a5ad68efeaba9ba0fba60ca16ea09be" + SRC_URI += "file://tiipclad-daemon.sh \ file://omap_remoteproc.conf \ file://tiipclad-daemon.service \ file://0001-Add-kernel-build-dir.patch \ + file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ " +CFLAGS += "-I${WORKDIR}" + DAEMON = "UNKNOWN" DAEMON:dra7xx = "lad_dra7xx" DAEMON:omapl138 = "lad_omapl138" diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc index 10349b58..cd00a682 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc @@ -3,14 +3,14 @@ SUMMARY = "TI RPMsg Char Utility Library" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/src/rpmsg_char.c;beginline=1;endline=31;md5=71987db43a2159cff5ea00505c6fce58" -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" -SRC_URI = "git://git.ti.com/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" +SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" -# Initial 0.4.1 release -SRCREV = "355d2b0bcde5eb5c895a270d1835102d2bc39fbd" +# 0.6.6 release +SRCREV = "55a6f4032246631a309f8608af5e822024664b59" -PV = "0.4.1+git${SRCPV}" +PV = "0.6.6+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb new file mode 100644 index 00000000..e3267a23 --- /dev/null +++ b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Security development tools for High-Security(HS) TI K3 processors." +HOMEPAGE = "https://git.ti.com/cgit/security-development-tools/core-secdev-k3" +SECTION = "devel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://manifest/k3-secdev-0.2-manifest.html;md5=f632a78870cc64550078d7b3cbac0892" + +# set a default install location +TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${datadir}/ti/ti-k3-secdev" + +# Native host tool only +COMPATIBLE_MACHINE = "null" +COMPATIBLE_MACHINE:class-native = "(.*)" +COMPATIBLE_MACHINE:class-nativesdk = "(.*)" + +GIT_URI = "git://git.ti.com/git/security-development-tools/core-secdev-k3.git" +GIT_PROTOCOL = "https" +GIT_BRANCH = "master" +GIT_SRCREV = "ed6951fd3877c6cac7f1237311f7278ac21634f3" + +SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}" +SRCREV = "${GIT_SRCREV}" + +S = "${WORKDIR}/git" + +do_install() { + CP_ARGS="-Prf --preserve=mode,links,timestamps --no-preserve=ownership" + install -d ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} + cp ${CP_ARGS} ${S}/* ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} +} + +FILES:${PN} += "${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" + +INSANE_SKIP:${PN} = "arch ldflags file-rdeps" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 93429570..7bf5030a 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -1,7 +1,7 @@ -SUMMARY = "TI RTOS prebuilt binary firmware images" +SUMMARY = "TI Echo Test prebuilt binary firmware images" LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-ti/licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" +LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" COMPATIBLE_MACHINE = "k3" @@ -9,349 +9,386 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" -inherit deploy inherit update-alternatives PLAT_SFX = "" -PLAT_SFX:j7 = "j721e" -PLAT_SFX:j7200-evm = "j7200" -PLAT_SFX:j7200-hs-evm = "j7200" -PLAT_SFX:j721s2-evm = "j721s2" +PLAT_SFX:j721e = "j721e" +PLAT_SFX:j7200 = "j7200" +PLAT_SFX:j721s2 = "j721s2" +PLAT_SFX:j784s4 = "j784s4" +PLAT_SFX:j722s = "j722s" PLAT_SFX:am65xx = "am65xx" PLAT_SFX:am64xx = "am64xx" PLAT_SFX:am62xx = "am62xx" +PLAT_SFX:am62axx = "am62axx" +PLAT_SFX:am62pxx = "am62pxx" FILESEXTRAPATHS:prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -CORESDK_RTOS_VERSION ?= "08.00.00.26" PV = "${CORESDK_RTOS_VERSION}" - -CLEANBROKEN = "1" -PR = "${INC_PR}.0" - -# Secure Build -DEPENDS += "openssl-native" - -TI_SECURE_DEV_PKG ?= "" - -RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}" -RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}" -RTOS_IPC_FW_DIR = "${S}/ti-ipc/${PLAT_SFX}" - -# For back-ward compatability keeping legacy firmware folder name -# TODO: fix this in next version -LEGACY_ETH_FW_DIR = "${D}${nonarch_base_libdir}/firmware/ethfw/" -LEGACY_IPC_FW_DIR = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/" -LEGACY_DM_FW_DIR = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/" - -DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" - -# J7 HS support -do_install:prepend:j721e-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${RTOS_DM_FW_DIR}; \ - mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ - ) -} - -# J7 HS support -do_install:prepend:j7200-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${RTOS_DM_FW_DIR}; \ - mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ - ) -} +PR = "${INC_PR}.1" + +# Secure Build +inherit ti-secdev + +IPC_FW_DIR = "ti-ipc/${PLAT_SFX}" + +INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}" + +MCU_1_0_FW = "ipc_echo_test_mcu1_0_release_strip.xer5f" +MCU_1_1_FW = "ipc_echo_test_mcu1_1_release_strip.xer5f" +MCU_2_0_FW = "ipc_echo_test_mcu2_0_release_strip.xer5f" +MCU_2_1_FW = "ipc_echo_test_mcu2_1_release_strip.xer5f" +MCU_3_0_FW = "ipc_echo_test_mcu3_0_release_strip.xer5f" +MCU_3_1_FW = "ipc_echo_test_mcu3_1_release_strip.xer5f" +MCU_4_0_FW = "ipc_echo_test_mcu4_0_release_strip.xer5f" +MCU_4_1_FW = "ipc_echo_test_mcu4_1_release_strip.xer5f" +C66_1_FW = "ipc_echo_test_c66xdsp_1_release_strip.xe66" +C66_2_FW = "ipc_echo_test_c66xdsp_2_release_strip.xe66" +C7X_1_FW = "ipc_echo_test_c7x_1_release_strip.xe71" +C7X_2_FW = "ipc_echo_test_c7x_2_release_strip.xe71" +C7X_3_FW = "ipc_echo_test_c7x_3_release_strip.xe71" +C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71" + +IPC_FW_LIST = "" +IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}" +IPC_FW_LIST:am64xx = "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW}" +IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}" +IPC_FW_LIST:am62pxx = " ${MCU_2_0_FW}" +IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}" +IPC_FW_LIST:j721e = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}" +IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}" +IPC_FW_LIST:j721s2 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}" +IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${MCU_4_0_FW} ${MCU_4_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}" +IPC_FW_LIST:j722s = " ${MCU_2_0_FW} ${MCU_3_0_FW} ${C7X_1_FW} ${C7X_2_FW}" # Update the am64xx ipc binaries to be consistent with other platforms do_install:prepend:am64xx() { - ( cd ${RTOS_IPC_FW_DIR}; \ - mv am64-main-r5f0_0-fw ipc_echo_baremetal_test_mcu1_0_release_strip.xer5f; \ - mv am64-main-r5f0_1-fw ipc_echo_baremetal_test_mcu1_1_release_strip.xer5f; \ - mv am64-main-r5f1_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ - mv am64-main-r5f1_1-fw ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f; \ - mv am64-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f; \ + ( cd ${S}/${IPC_FW_DIR}; \ + ln -sf am64-main-r5f0_0-fw ${MCU_1_0_FW}; \ + ln -sf am64-main-r5f0_1-fw ${MCU_1_1_FW}; \ + ln -sf am64-main-r5f1_0-fw ${MCU_2_0_FW}; \ + ln -sf am64-main-r5f1_1-fw ${MCU_2_1_FW}; \ + ln -sf am64-mcu-m4f0_0-fw ${MCU_3_0_FW}; \ ) } # Update the am62xx ipc binaries to be consistent with other platforms do_install:prepend:am62xx() { - ( cd ${RTOS_IPC_FW_DIR}; \ - mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ + ( cd ${S}/${IPC_FW_DIR}; \ + ln -sf am62-mcu-m4f0_0-fw ${MCU_2_0_FW}; \ ) } -#Install all R5 & DSP ipc echo test binaries in lib/firmware/pdk-ipc, with softlinks up a level -do_install() { - : -} - -do_install:j7() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c66xdsp_1_release_strip.xe66 ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c66xdsp_2_release_strip.xe66 ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR} - # DM Firmware - install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} - # ETH firmware - install -d ${LEGACY_ETH_FW_DIR} - install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} -} - -do_install:j7200-evm() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - # DM Firmware - install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} - # ETH firmware - install -d ${LEGACY_ETH_FW_DIR} - install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} -} - -do_install:j7200-hs-evm() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - # DM Firmware - install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} - # ETH firmware - install -d ${LEGACY_ETH_FW_DIR} - install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} -} - -do_install:j721s2-evm() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71 ${LEGACY_IPC_FW_DIR} - # DM Firmware - install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} - # ETH firmware - # install -d ${LEGACY_ETH_FW_DIR} - # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} -} - -do_install:am65xx() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} +# Update the am62pxx ipc binaries to be consistent with other platforms +do_install:prepend:am62pxx() { + ( cd ${S}/${IPC_FW_DIR}; \ + ln -sf am62p-mcu-r5f0_0-fw ${MCU_2_0_FW}; \ + ) } -do_install:am64xx() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu1_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} +# Update the am62axx ipc binaries to be consistent with other platforms +do_install:prepend:am62axx() { + ( cd ${S}/${IPC_FW_DIR}; \ + ln -sf am62a-mcu-r5f0_0-fw ${MCU_2_0_FW}; \ + ) } -do_install:am62xx() { - install -d ${LEGACY_IPC_FW_DIR} - install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} - # DM Firmware - install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} +do_install() { + # IPC Firmware + for FW_NAME in ${IPC_FW_LIST} + do + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${IPC_FW_DIR}/${FW_NAME} ${S}/${IPC_FW_DIR}/${FW_NAME}.signed + done + + # IPC Firmware + install -d ${D}${INSTALL_IPC_FW_DIR} + for FW_NAME in ${IPC_FW_LIST} + do + install -m 0644 ${S}/${IPC_FW_DIR}/${FW_NAME} ${D}${INSTALL_IPC_FW_DIR} + install -m 0644 ${S}/${IPC_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_IPC_FW_DIR} + done } # Set up names for the firmwares ALTERNATIVE:${PN}:am65xx = "\ - am65x-mcu-r5f0_0-fw \ - am65x-mcu-r5f0_1-fw \ + am65x-mcu-r5f0_0-fw am65x-mcu-r5f0_0-fw-sec \ + am65x-mcu-r5f0_1-fw am65x-mcu-r5f0_1-fw-sec \ " ALTERNATIVE:${PN}:am64xx = "\ - am64-main-r5f0_0-fw \ - am64-main-r5f0_1-fw \ - am64-main-r5f1_0-fw \ - am64-main-r5f1_1-fw \ - am64-mcu-m4f0_0-fw \ + am64-main-r5f0_0-fw am64-main-r5f0_0-fw-sec \ + am64-main-r5f0_1-fw am64-main-r5f0_1-fw-sec \ + am64-main-r5f1_0-fw am64-main-r5f1_0-fw-sec \ + am64-main-r5f1_1-fw am64-main-r5f1_1-fw-sec \ + am64-mcu-m4f0_0-fw am64-mcu-m4f0_0-fw-sec \ " + ALTERNATIVE:${PN}:am62xx = "\ - am62-mcu-m4f0_0-fw \ - am62-main-r5f0_0-fw \ + am62-mcu-m4f0_0-fw am62-mcu-m4f0_0-fw-sec \ + am62-main-r5f0_0-fw am62-main-r5f0_0-fw-sec \ " -ALTERNATIVE:${PN}:j7 = "\ - j7-mcu-r5f0_0-fw \ - j7-mcu-r5f0_1-fw \ - j7-main-r5f0_0-fw \ - j7-main-r5f0_1-fw \ - j7-main-r5f1_0-fw \ - j7-main-r5f1_1-fw \ - j7-c66_0-fw \ - j7-c66_1-fw \ - j7-c71_0-fw\ +ALTERNATIVE:${PN}:am62pxx = "\ + am62p-mcu-r5f0_0-fw am62p-mcu-r5f0_0-fw-sec \ " -ALTERNATIVE:${PN}:j7200-evm = "\ - j7200-mcu-r5f0_0-fw \ - j7200-mcu-r5f0_1-fw \ - j7200-main-r5f0_0-fw \ - j7200-main-r5f0_1-fw \ +ALTERNATIVE:${PN}:am62axx = "\ + am62a-mcu-r5f0_0-fw am62a-mcu-r5f0_0-fw-sec \ + am62a-c71_0-fw am62a-c71_0-fw-sec \ " -ALTERNATIVE:${PN}:j7200-hs-evm = "\ - j7200-mcu-r5f0_0-fw \ - j7200-mcu-r5f0_1-fw \ - j7200-main-r5f0_0-fw \ - j7200-main-r5f0_1-fw \ +ALTERNATIVE:${PN}:j721e = "\ + j7-mcu-r5f0_1-fw j7-mcu-r5f0_1-fw-sec \ + j7-main-r5f0_0-fw j7-main-r5f0_0-fw-sec \ + j7-main-r5f0_1-fw j7-main-r5f0_1-fw-sec \ + j7-main-r5f1_0-fw j7-main-r5f1_0-fw-sec \ + j7-main-r5f1_1-fw j7-main-r5f1_1-fw-sec \ + j7-c66_0-fw j7-c66_0-fw-sec \ + j7-c66_1-fw j7-c66_1-fw-sec \ + j7-c71_0-fw j7-c71_0-fw-sec \ " -ALTERNATIVE_${PN}:j721s2-evm = "\ - j721s2-mcu-r5f0_0-fw \ - j721s2-mcu-r5f0_1-fw \ - j721s2-main-r5f0_0-fw \ - j721s2-main-r5f0_1-fw \ - j721s2-main-r5f1_0-fw \ - j721s2-main-r5f1_1-fw \ - j721s2-c71_0-fw \ - j721s2-c71_1-fw \ +ALTERNATIVE:${PN}:j7200 = "\ + j7200-mcu-r5f0_1-fw j7200-mcu-r5f0_1-fw-sec \ + j7200-main-r5f0_0-fw j7200-main-r5f0_0-fw-sec \ + j7200-main-r5f0_1-fw j7200-main-r5f0_1-fw-sec \ " -# Set up link names for the firmwares +ALTERNATIVE:${PN}:j721s2 = "\ + j721s2-mcu-r5f0_1-fw j721s2-mcu-r5f0_1-fw-sec \ + j721s2-main-r5f0_0-fw j721s2-main-r5f0_0-fw-sec \ + j721s2-main-r5f0_1-fw j721s2-main-r5f0_1-fw-sec \ + j721s2-main-r5f1_0-fw j721s2-main-r5f1_0-fw-sec \ + j721s2-main-r5f1_1-fw j721s2-main-r5f1_1-fw-sec \ + j721s2-c71_0-fw j721s2-c71_0-fw-sec \ + j721s2-c71_1-fw j721s2-c71_1-fw-sec \ + " -TARGET_MCU_R5FSS0_0:am65xx = "am65x-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1:am65xx = "am65x-mcu-r5f0_1-fw" - -TARGET_MAIN_R5FSS0_0:am64xx = "am64-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1:am64xx = "am64-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0:am64xx = "am64-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1:am64xx = "am64-main-r5f1_1-fw" -TARGET_MCU_M4FSS0_0:am64xx = "am64-mcu-m4f0_0-fw" - -TARGET_MAIN_R5FSS0_0:am62xx = "am62-main-r5f0_0-fw" -TARGET_MCU_M4FSS0_0:am62xx = "am62-mcu-m4f0_0-fw" - -TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw" -TARGET_C66_0:j7 = "j7-c66_0-fw" -TARGET_C66_1:j7 = "j7-c66_1-fw" -TARGET_C7X_0:j7 = "j7-c71_0-fw" - -TARGET_MCU_R5FSS0_0:j7200-evm = "j7200-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1:j7200-evm = "j7200-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0:j7200-evm = "j7200-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1:j7200-evm = "j7200-main-r5f0_1-fw" - -TARGET_MCU_R5FSS0_0:j7200-hs-evm = "j7200-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1:j7200-hs-evm = "j7200-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0:j7200-hs-evm = "j7200-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1:j7200-hs-evm = "j7200-main-r5f0_1-fw" - -TARGET_MCU_R5FSS0_0:j721s2-evm = "j721s2-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1:j721s2-evm = "j721s2-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0:j721s2-evm = "j721s2-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1:j721s2-evm = "j721s2-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0:j721s2-evm = "j721s2-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1:j721s2-evm = "j721s2-main-r5f1_1-fw" -TARGET_C7X_0:j721s2-evm = "j721s2-c71_0-fw" -TARGET_C7X_1:j721s2-evm = "j721s2-c71_1-fw" - -ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" - -ALTERNATIVE_LINK_NAME[am64-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[am64-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" -ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" -ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" -ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" - -ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" - -ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" -ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" -ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" -ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" -ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C66_0}" -ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C66_1}" -ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C7X_0}" - -ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" -ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" - -ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" -ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" -ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" -ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" -ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" -ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C7X_0}" -ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C7X_1}" +ALTERNATIVE:${PN}:j784s4 = "\ + j784s4-mcu-r5f0_1-fw j784s4-mcu-r5f0_1-fw-sec \ + j784s4-main-r5f0_0-fw j784s4-main-r5f0_0-fw-sec \ + j784s4-main-r5f0_1-fw j784s4-main-r5f0_1-fw-sec \ + j784s4-main-r5f1_0-fw j784s4-main-r5f1_0-fw-sec \ + j784s4-main-r5f1_1-fw j784s4-main-r5f1_1-fw-sec \ + j784s4-main-r5f2_0-fw j784s4-main-r5f2_0-fw-sec \ + j784s4-main-r5f2_1-fw j784s4-main-r5f2_1-fw-sec \ + j784s4-c71_0-fw j784s4-c71_0-fw-sec \ + j784s4-c71_1-fw j784s4-c71_1-fw-sec \ + j784s4-c71_2-fw j784s4-c71_2-fw-sec \ + j784s4-c71_3-fw j784s4-c71_3-fw-sec \ + " -# Create the firmware alternatives +ALTERNATIVE:${PN}:j722s = "\ + j722s-mcu-r5f0_0-fw j722s-mcu-r5f0_0-fw-sec \ + j722s-main-r5f0_0-fw j722s-main-r5f0_0-fw-sec \ + j722s-c71_0-fw j722s-c71_0-fw-sec \ + j722s-c71_1-fw j722s-c71_1-fw-sec \ + " -ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f" -ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" - -ALTERNATIVE_TARGET[am64-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu1_0_release_strip.xer5f" -ALTERNATIVE_TARGET[am64-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu1_1_release_strip.xer5f" -ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" -ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_1_release_strip.xer5f" -ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu3_0_release_strip.xer5f" - -ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" -ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" - -ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" -ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" -ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f" -ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j7-c66_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release_strip.xe66" -ALTERNATIVE_TARGET[j7-c66_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66" -ALTERNATIVE_TARGET[j7-c71_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" - -ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" -ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" -ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" - -ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" -ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f" -ALTERNATIVE_TARGET[j721s2-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j721s2-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f" -ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f" -ALTERNATIVE_TARGET[j721s2-c71_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" -ALTERNATIVE_TARGET[j721s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71" +# Set up link names for the firmwares -ALTERNATIVE_PRIORITY = "10" +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_1-fw-sec" + +ALTERNATIVE_LINK_NAME[am64-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am64-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am64-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am64-main-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[am64-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/am64-main-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[am64-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/am64-main-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/am64-main-r5f1_0-fw" +ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw-sec] = "${nonarch_base_libdir}/firmware/am64-main-r5f1_0-fw-sec" +ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/am64-main-r5f1_1-fw" +ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw-sec] = "${nonarch_base_libdir}/firmware/am64-main-r5f1_1-fw-sec" +ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am64-mcu-m4f0_0-fw" +ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am64-mcu-m4f0_0-fw-sec" + +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw" +ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw-sec" + +ALTERNATIVE_LINK_NAME[am62p-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62p-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am62p-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62p-mcu-r5f0_0-fw-sec" + +ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62a-mcu-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw" +ALTERNATIVE_LINK_NAME[am62a-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw-sec" + +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f1_0-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-main-r5f1_0-fw-sec" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f1_1-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-main-r5f1_1-fw-sec" +ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${nonarch_base_libdir}/firmware/j7-c66_0-fw" +ALTERNATIVE_LINK_NAME[j7-c66_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-c66_0-fw-sec" +ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${nonarch_base_libdir}/firmware/j7-c66_1-fw" +ALTERNATIVE_LINK_NAME[j7-c66_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-c66_1-fw-sec" +ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${nonarch_base_libdir}/firmware/j7-c71_0-fw" +ALTERNATIVE_LINK_NAME[j7-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-c71_0-fw-sec" + +ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_1-fw-sec" + +ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f1_0-fw" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_0-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f1_0-fw-sec" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f1_1-fw" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f1_1-fw-sec" +ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-c71_0-fw" +ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-c71_0-fw-sec" +ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/j721s2-c71_1-fw" +ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-c71_1-fw-sec" + +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_1-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_1-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f1_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f1_0-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f1_1-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_1-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f1_1-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f2_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f2_0-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_1-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f2_1-fw" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_1-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f2_1-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-c71_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-c71_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-c71_0-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-c71_1-fw] = "${nonarch_base_libdir}/firmware/j784s4-c71_1-fw" +ALTERNATIVE_LINK_NAME[j784s4-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-c71_1-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-c71_2-fw] = "${nonarch_base_libdir}/firmware/j784s4-c71_2-fw" +ALTERNATIVE_LINK_NAME[j784s4-c71_2-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-c71_2-fw-sec" +ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw] = "${nonarch_base_libdir}/firmware/j784s4-c71_3-fw" +ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-c71_3-fw-sec" + +ALTERNATIVE_LINK_NAME[j722s-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j722s-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-mcu-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[j722s-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j722s-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-main-r5f0_0-fw-sec" +ALTERNATIVE_LINK_NAME[j722s-c71_0-fw] = "${nonarch_base_libdir}/firmware/j722s-c71_0-fw" +ALTERNATIVE_LINK_NAME[j722s-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-c71_0-fw-sec" +ALTERNATIVE_LINK_NAME[j722s-c71_1-fw] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw" +ALTERNATIVE_LINK_NAME[j722s-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw-sec" -# make sure that lib/firmware, and all its contents are part of the package -FILES:${PN} += "${nonarch_base_libdir}/firmware" +# Create the firmware alternatives -# This is used to prevent the build system to_strip the executables -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -# This is used to prevent the build system to split the debug info in a separate file -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP -INSANE_SKIP:${PN} += "arch" +ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}" +ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}.signed" +ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" +ALTERNATIVE_TARGET[am65x-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" + +ALTERNATIVE_TARGET[am64-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}" +ALTERNATIVE_TARGET[am64-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}.signed" +ALTERNATIVE_TARGET[am64-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" +ALTERNATIVE_TARGET[am64-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" +ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[am64-main-r5f1_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" +ALTERNATIVE_TARGET[am64-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" +ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" +ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed" + +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" + +ALTERNATIVE_TARGET[am62p-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[am62p-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" + +ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" +ALTERNATIVE_TARGET[am62a-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" + +ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" +ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed" +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}" +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}.signed" +ALTERNATIVE_TARGET[j7-c66_0-fw] = "${INSTALL_IPC_FW_DIR}/${C66_1_FW}" +ALTERNATIVE_TARGET[j7-c66_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C66_1_FW}.signed" +ALTERNATIVE_TARGET[j7-c66_1-fw] = "${INSTALL_IPC_FW_DIR}/${C66_2_FW}" +ALTERNATIVE_TARGET[j7-c66_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C66_2_FW}.signed" +ALTERNATIVE_TARGET[j7-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" +ALTERNATIVE_TARGET[j7-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" + +ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" +ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" +ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" + +ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" +ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" +ALTERNATIVE_TARGET[j721s2-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" +ALTERNATIVE_TARGET[j721s2-main-r5f1_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}" +ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}.signed" +ALTERNATIVE_TARGET[j721s2-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" +ALTERNATIVE_TARGET[j721s2-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" +ALTERNATIVE_TARGET[j721s2-c71_1-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}" +ALTERNATIVE_TARGET[j721s2-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed" + +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f2_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_4_0_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f2_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_4_0_FW}.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f2_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_4_1_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f2_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_4_1_FW}.signed" +ALTERNATIVE_TARGET[j784s4-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" +ALTERNATIVE_TARGET[j784s4-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" +ALTERNATIVE_TARGET[j784s4-c71_1-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}" +ALTERNATIVE_TARGET[j784s4-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed" +ALTERNATIVE_TARGET[j784s4-c71_2-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_3_FW}" +ALTERNATIVE_TARGET[j784s4-c71_2-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_3_FW}.signed" +ALTERNATIVE_TARGET[j784s4-c71_3-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_4_FW}" +ALTERNATIVE_TARGET[j784s4-c71_3-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_4_FW}.signed" + +ALTERNATIVE_TARGET[j722s-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" +ALTERNATIVE_TARGET[j722s-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" +ALTERNATIVE_TARGET[j722s-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" +ALTERNATIVE_TARGET[j722s-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed" +ALTERNATIVE_TARGET[j722s-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" +ALTERNATIVE_TARGET[j722s-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" +ALTERNATIVE_TARGET[j722s-c71_1-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}" +ALTERNATIVE_TARGET[j722s-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed" -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" +ALTERNATIVE_PRIORITY = "10" diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb index 67b1d2a9..ff715ce0 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb @@ -1,7 +1,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" -COMPATIBLE_MACHINE = "ti-soc" +COMPATIBLE_MACHINE = "j721e|j7200|am65xx|am64xx" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -10,14 +10,14 @@ INHIBIT_DEFAULT_DEPS = "1" inherit nopackages deploy PLAT_SFX = "" -PLAT_SFX:j7 = "/j721e" -PLAT_SFX:j7200-evm = "/j7200" +PLAT_SFX:j721e = "/j721e" +PLAT_SFX:j7200 = "/j7200" PLAT_SFX:am65xx = "/am65xx" PLAT_SFX:am64xx = "/am64x" # Use weak assignment to set defaults to TI_RTOS_METADATA_* variables -TI_RTOS_METADATA_URI ?= "git://git.ti.com/processor-sdk/coresdk_rtos_releases.git" -TI_RTOS_METADATA_PROTOCOL ?= "git" +TI_RTOS_METADATA_URI ?= "git://git.ti.com/git/processor-sdk/coresdk_rtos_releases.git" +TI_RTOS_METADATA_PROTOCOL ?= "https" TI_RTOS_METADATA_SRCREV ?= "2ecbf45af64bc47806623cc5bf7ab493489acaf9" TI_RTOS_METADATA_BRANCH ?= "master" TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}" diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in index ffb8d24b..2213a348 100644 --- a/meta-ti-bsp/wic/sdimage-2part-efi.wks +++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in @@ -2,6 +2,6 @@ # long-description: Creates a partitioned SD card image for TI platforms that # supports EFI. Boot files are located in the first vfat partition with extra # reserved space. We cannot use a GPT here. -bootloader --append="rootfstype=ext4 ro" -part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M +bootloader --timeout=3 --append="rootfstype=ext4" +part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid diff --git a/meta-ti-extras/README b/meta-ti-extras/README index 1b38921a..c9beb150 100644 --- a/meta-ti-extras/README +++ b/meta-ti-extras/README @@ -8,14 +8,14 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta -branch: master +branch: kirkstone URI: git://git.yoctoproject.org/meta-arm layers: meta-arm -branch: master +branch: kirkstone URI: git://git.yoctoproject.org/meta-ti -branch: master +branch: kirkstone revision: HEAD layers: meta-ti-bsp diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf index 1fb77e2a..b42c1a6a 100644 --- a/meta-ti-extras/conf/layer.conf +++ b/meta-ti-extras/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-extras" BBFILE_PATTERN_meta-ti-extras := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-ti-extras = "6" -LAYERSERIES_COMPAT_meta-ti-extras = "kirkstone" +LAYERSERIES_COMPAT_meta-ti-extras = "kirkstone langdale" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb index 28edf614..8fef493b 100644 --- a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb +++ b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb @@ -8,7 +8,7 @@ CLEANBROKEN = "1" SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4" BRANCH = "master" -SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb index d9d4ef7e..491ee0f3 100644 --- a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb +++ b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb @@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "dsp" -SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git" +SRC_URI = "git://git.ti.com/git/glsdk/dspdce.git;protocol=https;branch=master" SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8" diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc b/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc index 31f775e2..ec159c75 100644 --- a/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc +++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc @@ -3,6 +3,6 @@ SRCREV = "816485e68430bbec643eac9498bfa5303eb2c2e1" PV = "1.4.0" INC_PR = "r2" -SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/sdo-emu/dsptop.git;protocol=https;branch=${BRANCH}" BRANCH = "master" diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb index e8853ff8..90ce8943 100644 --- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb +++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb @@ -15,6 +15,7 @@ EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC do_install() { oe_runmake install DESTDIR=${D} + chown -R root:root ${D} } COMPATIBLE_MACHINE = "dra7xx" diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb index e2302d58..8d066eb0 100644 --- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb @@ -11,7 +11,7 @@ REQUIRED_MACHINE_FEATURES = "mmip" RDEPENDS:${PN} = "libdce" -SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git" +SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" diff --git a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb index cb2f8cc2..b01dd6a5 100644 --- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb +++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb @@ -7,15 +7,14 @@ LIC_FILES_CHKSUM = "file://PRU-Package-v6.1-Manifest.html;md5=1e37797ebe9254922f inherit update-alternatives BRANCH = "master" -SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}" -SRCREV = "ae1decf0b494b2904e6157e1379691ffc468f0cf" +SRC_URI = "git://git.ti.com/git/pru-software-support-package/pru-software-support-package.git;protocol=https;branch=${BRANCH}" +SRCREV = "00a5efa5157feb84cb2e4bf50b481f7082acca82" -PV = "6.1.0" -PR = "r0" +PV = "6.3.0" require recipes-ti/includes/ti-paths.inc -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am62xx|am64xx|am65xx|j721e" PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES:prepend = " \ @@ -43,7 +42,7 @@ PLATFORM:omap-a15 = "am572x" PLATFORM:am62xx = "am62x" PLATFORM:am64xx = "am64x" PLATFORM:am65xx = "am65x" -PLATFORM:j7 = "j721e" +PLATFORM:j721e = "j721e" do_compile() { for dir in ${SUBDIRS} @@ -155,7 +154,7 @@ do_install:append:am65xx() { done } -do_install:append:j7() { +do_install:append:j721e() { for i in 0 1 do install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \ @@ -189,7 +188,7 @@ PRU_ICSS_ALTERNATIVES:omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_ 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" -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" +PRU_ICSS_ALTERNATIVES:j721e = "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" # Set up link names for the firmwares ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/am335x-pru0-fw" @@ -259,7 +258,7 @@ ALTERNATIVE:pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}" # Only Halt firmware images are supported for the Tx_PRU cores ALTERNATIVE:pru-icss-halt:append:am64xx = " am64x-txpru0_0-fw am64x-txpru0_1-fw am64x-txpru1_0-fw am64x-txpru1_1-fw" ALTERNATIVE:pru-icss-halt:append:am65xx = " am65x-txpru0_0-fw am65x-txpru0_1-fw am65x-txpru1_0-fw am65x-txpru1_1-fw am65x-txpru2_0-fw am65x-txpru2_1-fw" -ALTERNATIVE:pru-icss-halt:append:j7 = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw" +ALTERNATIVE:pru-icss-halt:append:j721e = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw" ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out" ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "${nonarch_base_libdir}/firmware/pru/PRU_Halt.out" @@ -380,5 +379,5 @@ ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100" ALLOW_EMPTY:${PN} = "1" # This installs PRU firmware, so skip "arch" QA check -INSANE_SKIP:${PN}-halt = "arch" -INSANE_SKIP:${PN}-rpmsg-echo = "arch" +INSANE_SKIP:${PN}-halt = "arch buildpaths" +INSANE_SKIP:${PN}-rpmsg-echo = "arch buildpaths" diff --git a/meta-ti-extras/recipes-bsp/pru/ti-pru-sw-edma-driver_1.00.00.bb b/meta-ti-extras/recipes-bsp/pru/ti-pru-sw-edma-driver_1.00.00.bb deleted file mode 100644 index 449a9095..00000000 --- a/meta-ti-extras/recipes-bsp/pru/ti-pru-sw-edma-driver_1.00.00.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Builds eDMA module used by eDMA libraries for PRU sw example applications" -HOMEPAGE = "https://gforge.ti.com/gf/project/pru_sw/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://edmautils.c;beginline=1;endline=23;md5=312e9cb8a37a044c617c98a9e980ad1b" - -COMPATIBLE_MACHINE = "omapl138" - -INHIBIT_PACKAGE_STRIP = "1" - -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" -PV:append = "+svn${SRCPV}" - -SRC_URI = "svn://gforge.ti.com/svn/pru_sw/;module=trunk;protocol=https;user=anonymous;pswd=''" - -SRCREV = "33" - -S = "${WORKDIR}/trunk/peripheral_lib/edma_driver/module" - -inherit module - -EXTRA_OEMAKE += "KERNEL_DIR='${STAGING_KERNEL_DIR}'" - -do_compile:prepend () { - export CCTOOL_PREFIX="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" -} - -do_install () { - install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/pru - install -m 0755 ${S}/edmautils.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/pru/ -} diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb index 09968993..dbae5a21 100644 --- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb +++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb @@ -3,7 +3,7 @@ LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e" SRC_URI = " \ - git://git.ti.com/wilink8-wlan/wl18xx_fw.git;protocol=git;branch=${BRANCH} \ + git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \ file://0001-Add-Makefile-to-install-firmware-files.patch \ " diff --git a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb index e5912e81..2e528376 100644 --- a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb +++ b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb @@ -8,7 +8,7 @@ INITSCRIPT_PARAMS = "defaults 03" inherit update-rc.d SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9" -SRC_URI = "git://git.ti.com/ti-bt/uim.git;branch=master;protocol=https" +SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb index 1b9710af..1e9c445d 100644 --- a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb +++ b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb @@ -7,8 +7,8 @@ RDEPENDS:${PN} = "wl18xx-fw" #Tag: R8.7_SP3 (8.7.3) SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master \ - file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \ +SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https \ + file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb index e553ff49..84e8764f 100644 --- a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb +++ b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c # Tag: R8.7_SP3 (8.7.3) SRCREV = "a07b6e711d2a70608101d3d6cdc5749c4d8a96d5" BRANCH = "sitara-scripts" -SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx-target-scripts.git;protocol=git;branch=${BRANCH} \ +SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx-target-scripts.git;protocol=https;branch=${BRANCH} \ file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \ " diff --git a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb index a6f62239..a2a8b775 100644 --- a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb +++ b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85 # Tag: R8.7_SP3 (8.7.3) SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master" +SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https" S = "${WORKDIR}/git/wlconf" diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc index eeb18fb1..54115f4e 100644 --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc @@ -4,6 +4,6 @@ SRCREV = "dd0c82fb5763a6b32dc6d68e561efb66ab8283d7" PV = "1.1.0" INC_PR = "r7" -SRC_URI = "git://git.ti.com/sdo-emu/gdbc6x.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/sdo-emu/gdbc6x.git;protocol=https;branch=${BRANCH}" BRANCH = "master" diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0001-Support-Linux-kernels-v5.15.patch b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0001-Support-Linux-kernels-v5.15.patch new file mode 100644 index 00000000..cb56a470 --- /dev/null +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0001-Support-Linux-kernels-v5.15.patch @@ -0,0 +1,40 @@ +From 7e6e1312629f9bc7a24871f7f395f2d288a1758f Mon Sep 17 00:00:00 2001 +From: Andrew Davis <afd@ti.com> +Date: Tue, 18 Apr 2023 11:38:54 -0500 +Subject: [PATCH] Support Linux kernels v5.15+ + +put_tty_driver was removed and write_room return type has changed. + +Function tty_driver_kref_put has been around a while, so no need +to do a kernel version check. + +Upstream-Status: Pending +Signed-off-by: Andrew Davis <afd@ti.com> +--- + kernel_module/gdbproxy-mod/gdbserverproxy.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/kernel_module/gdbproxy-mod/gdbserverproxy.c b/kernel_module/gdbproxy-mod/gdbserverproxy.c +index 418b6db..4b1c676 100644 +--- a/kernel_module/gdbproxy-mod/gdbserverproxy.c ++++ b/kernel_module/gdbproxy-mod/gdbserverproxy.c +@@ -540,7 +540,11 @@ static int gdb_write(struct tty_struct *tty, + * + * + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)) ++static unsigned int gdb_write_room(struct tty_struct *tty) ++#else + static int gdb_write_room(struct tty_struct *tty) ++#endif + { + return GDB_STR_SIZE; + } +@@ -914,7 +918,7 @@ static int __init gdb_dev_init(void) + if (ret < 0) { + + printk(KERN_ERR "Couldn't register gdbtty driver.\n"); +- put_tty_driver(tty_gdb_driver); ++ tty_driver_kref_put(tty_gdb_driver); + return ret; + } diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb index cb9e4c24..60492f81 100644 --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb @@ -7,6 +7,8 @@ MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" PV:append = "+git${SRCPV}" +SRC_URI:append = " file://0001-Support-Linux-kernels-v5.15.patch;patchdir=../.." + S = "${WORKDIR}/git/kernel_module/gdbproxy-mod" inherit module diff --git a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb index ece07183..400221f9 100644 --- a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb +++ b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb @@ -7,7 +7,7 @@ PV = "4.19.0.0" LIC_FILES_CHKSUM = "file://../ctoolslib_manifest.html;md5=b7dd369a2e07ef9a71795ee5a9bd01bd" -SRC_URI = "git://git.ti.com/sdo-emu/ctoolslib.git;protocol=git;branch=opencl_aetlib_build" +SRC_URI = "git://git.ti.com/git/sdo-emu/ctoolslib.git;protocol=https;branch=opencl_aetlib_build" SRCREV = "de7954abab0f0caa8a2c7b53095c30226d901a31" DEPENDS = "ti-cgt6x-native" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc b/meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc deleted file mode 100644 index 7051fccc..00000000 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)" -HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc" -SECTION = "devel" -LICENSE = "BSD-3-Clause & GPL-2.0-only" - -require recipes-ti/includes/ti-paths.inc -require recipes-ti/includes/ti-staging.inc - -do_install() { - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - - install -d ${D}${XDC_INSTALL_DIR_RECIPE} - cp ${CP_ARGS} ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE} -} - -FILES:${PN}-dev = "${XDC_INSTALL_DIR_RECIPE}" - -BBCLASSEXTEND = "native nativesdk" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP:${PN}-dev = "libdir dev-elf arch file-rdeps" - -# Prevent internal libs from getting picked up -PRIVATE_LIBS = " \ -libncdb.so \ -libcdb.so \ -libjavaplugin_oji.so \ -libjavaplugin_jni.so \ -libjsound.so \ -libinstrument.so \ -libjawt.so \ -libzip.so \ -libjava_crw_demo.so \ -libjavaplugin_nscp_gcc29.so \ -libhprof.so \ -libcmm.so \ -libjdwp.so \ -libmlib_image.so \ -libjpeg.so \ -libverify.so \ -libjavaplugin_nscp.so \ -libmanagement.so \ -libunpack.so \ -librmi.so \ -libJdbcOdbc.so \ -libawt.so \ -libnet.so \ -libjaas_unix.so \ -libnio.so \ -libdcpr.so \ -libioser12.so \ -libjsoundalsa.so \ -libjava.so \ -libfontmanager.so \ -libdt_socket.so \ -libmawt.so \ -libjvm.so \ -libhpi.so \ -lib.so \ -libcairo.so.2 \ -libjli.so \ -libawt_xawt.so \ -" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST:ti-soc = "(.*)" -COMPATIBLE_HOST:class-native = "(.*)" -COMPATIBLE_HOST:class-nativesdk = "(.*)" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc b/meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc deleted file mode 100644 index 47f73b6d..00000000 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc +++ /dev/null @@ -1,5 +0,0 @@ -require ti-xdctools-common.inc - -S = "${WORKDIR}/xdctools_${PV}_core" - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc b/meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc deleted file mode 100644 index 1415f83e..00000000 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc +++ /dev/null @@ -1,10 +0,0 @@ -require ti-xdctools-common.inc -require ../includes/ti-eula-unpack.inc - -S = "${WORKDIR}/xdctools_${PV}" - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdctools_setuplinux_${PV}.bin;name=xdcbin" - -BINFILE="xdctools_setuplinux_${PV}.bin" -TI_BIN_UNPK_CMDS="Y:workdir:Y" -TI_BIN_UNPK_WDEXT="/ti" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb index 6c3fdeb2..b1361804 100644 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb +++ b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb @@ -1,4 +1,77 @@ -require recipes-ti/devtools/ti-xdctools-core.inc +DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)" +HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc" +SECTION = "devel" +LICENSE = "BSD-3-Clause & GPL-2.0-only" + +require recipes-ti/includes/ti-paths.inc +require recipes-ti/includes/ti-staging.inc + +do_install() { + CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" + + install -d ${D}${XDC_INSTALL_DIR_RECIPE} + cp ${CP_ARGS} ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE} +} + +FILES:${PN}-dev = "${XDC_INSTALL_DIR_RECIPE}" + +BBCLASSEXTEND = "native nativesdk" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INSANE_SKIP:${PN}-dev = "libdir dev-elf arch file-rdeps" + +# Prevent internal libs from getting picked up +PRIVATE_LIBS = " \ +libncdb.so \ +libcdb.so \ +libjavaplugin_oji.so \ +libjavaplugin_jni.so \ +libjsound.so \ +libinstrument.so \ +libjawt.so \ +libzip.so \ +libjava_crw_demo.so \ +libjavaplugin_nscp_gcc29.so \ +libhprof.so \ +libcmm.so \ +libjdwp.so \ +libmlib_image.so \ +libjpeg.so \ +libverify.so \ +libjavaplugin_nscp.so \ +libmanagement.so \ +libunpack.so \ +librmi.so \ +libJdbcOdbc.so \ +libawt.so \ +libnet.so \ +libjaas_unix.so \ +libnio.so \ +libdcpr.so \ +libioser12.so \ +libjsoundalsa.so \ +libjava.so \ +libfontmanager.so \ +libdt_socket.so \ +libmawt.so \ +libjvm.so \ +libhpi.so \ +lib.so \ +libcairo.so.2 \ +libjli.so \ +libawt_xawt.so \ +" + +COMPATIBLE_HOST ?= "null" +COMPATIBLE_HOST:ti-soc = "(.*)" +COMPATIBLE_HOST:class-native = "(.*)" +COMPATIBLE_HOST:class-nativesdk = "(.*)" + +S = "${WORKDIR}/xdctools_${PV}_core" + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip" PE = "1" PV = "3_55_02_22" diff --git a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc index 85d79ae3..6ebc3b34 100644 --- a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc +++ b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc @@ -17,8 +17,8 @@ DEPENDS = "ti-cgt6x-native \ S = "${WORKDIR}/git" DSPLIB_GIT_BRANCH = "master" -DSPLIB_GIT_PROTOCOL = "git" -DSPLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/dsplib.git" +DSPLIB_GIT_PROTOCOL = "https" +DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git" DSPLIB_SRCREV = "0390b171042c602e07669fd28a371cc319b90161" SRC_URI = "${DSPLIB_GIT_URI};protocol=${DSPLIB_GIT_PROTOCOL};branch=${DSPLIB_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc index 358d7dfd..e8b0f17b 100644 --- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc +++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc @@ -1,109 +1,60 @@ installdir = "${datadir}/ti" export TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}" + # This is where do_install will put it -export AUDIO_SOC_INSTALL_DIR_RECIPE = "${installdir}/ti-audio-soc-example-tree" -export BIOSPSP_INSTALL_DIR_RECIPE = "${installdir}/ti-biospsp-tree" -export C6ACCEL_INSTALL_DIR_RECIPE = "${installdir}/ti-c6accel-tree" -export C6RUN_INSTALL_DIR_RECIPE = "${installdir}/ti-c6run-tree" -export CE_INSTALL_DIR_RECIPE = "${installdir}/ti-codec-engine-tree" -export CODEC_INSTALL_DIR_RECIPE = "${installdir}/ti-codecs-tree" -export CODEGEN_ARM_INSTALL_DIR_RECIPE= "${installdir}/ti-cgt470-tree" -export CODEGEN_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt6x-tree" -export DSP_BENCHMARK_INSTALL_DIR_RECIPE = "${installdir}/ti-dsp-benchmark-tree" -export DSPLIB_C64P_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-c64p-tree" -export DSPLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-c674x-tree" -export DSPLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-c66x-tree" -export DVSDK_DEMOS_INSTALL_DIR_RECIPE= "${installdir}/ti-dvsdk-demos-tree" -export DVTB_INSTALL_DIR_RECIPE = "${installdir}/ti-dvtb-tree" -export EDMA3_LLD_INSTALL_DIR_RECIPE = "${installdir}/ti-edma3lld-tree" -export EDMA3_LLD_SYSBIOS_INSTALL_DIR_RECIPE = "${installdir}/ti-edma3lld-sysbios-tree" -export FASTMATHLIB_C674P_INSTALL_DIR_RECIPE = "${installdir}/ti-fastmathlib-c67x-tree" -export FC3_INSTALL_DIR_RECIPE = "${installdir}/ti-framework-components3-tree" -export FC_INSTALL_DIR_RECIPE = "${installdir}/ti-framework-components-tree" -export GFX_SDK_INSTALL_DIR_RECIPE = "${installdir}/ti-gfx-sdk-tree" -export HDVICP20_INSTALL_DIR_RECIPE = "${installdir}/ti-hdvicp20-tree" -export IMGLIB_C64P_INSTALL_DIR_RECIPE= "${installdir}/ti-imglib-tree" -export IPC_INSTALL_DIR_RECIPE = "${installdir}/ti-ipc-tree" -export LINK_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplink-tree" -export LPM_INSTALL_DIR_RECIPE = "${installdir}/ti-local-power-manager-tree" -export OMX_INSTALL_DIR_RECIPE = "${installdir}/ti-omx-tree" -export OSAL_INSTALL_DIR_RECIPE = "${installdir}/ti-osal-tree" -export RTFS_INSTALL_DIR_RECIPE = "${installdir}/ti-rtfs-tree" -export SYSBIOS_INSTALL_DIR_RECIPE = "${installdir}/ti-sysbios-tree" -export SYSLINK_INSTALL_DIR_RECIPE = "${installdir}/ti-syslink-tree" -export SWTOOLS_INSTALL_DIR_RECIPE = "${installdir}/ti-swtools-tree" -export UIA_INSTALL_DIR_RECIPE = "${installdir}/ti-uia-tree" -export VICPLIB_INSTALL_DIR_RECIPE = "${installdir}/ti-vicplib-tree" -export XDAIS_INSTALL_DIR_RECIPE = "${installdir}/ti-xdais-tree" -export XDC_INSTALL_DIR_RECIPE = "${installdir}/ti-xdctools-tree" -export PDK_INSTALL_DIR_RECIPE = "${installdir}/ti-pdk-tree" -export OSAL_INSTALL_DIR_RECIPE = "${installdir}/ti-osal-tree" -export M4_TOOLCHAIN_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt-arm" -export GCC_ARM_NONE_TOOLCHAIN_RECIPE = "${installdir}/gcc-arm-none-eabi" -export TI_CGT_PRU_INSTALL_DIR_RECIPE = "${installdir}/cgt-pru" -export MATHLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c66x-tree" -export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree" -export IMGLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-imglib-c66x-tree" -export VLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-vlib-c66x-tree" -export CG_XML_INSTALL_DIR_RECIPE = "${installdir}/ti-cg-xml-tree" -export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" -export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" +export CE_INSTALL_DIR_RECIPE = "${installdir}/ti-codec-engine-tree" +export CODEC_INSTALL_DIR_RECIPE = "${installdir}/ti-codecs-tree" +export CODEGEN_ARM_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt470-tree" +export CG_XML_INSTALL_DIR_RECIPE = "${installdir}/ti-cg-xml-tree" +export DSPLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-c66x-tree" +export DSPLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-c674x-tree" +export DSPLIB_C64P_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-c64p-tree" +export EDMA3_LLD_INSTALL_DIR_RECIPE = "${installdir}/ti-edma3lld-tree" +export FC_INSTALL_DIR_RECIPE = "${installdir}/ti-framework-components-tree" +export GCC_ARM_NONE_TOOLCHAIN_RECIPE = "${installdir}/gcc-arm-none-eabi" +export IMGLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-imglib-c66x-tree" +export IPC_INSTALL_DIR_RECIPE = "${installdir}/ti-ipc-tree" +export M4_TOOLCHAIN_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt-arm" +export MATHLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c66x-tree" +export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree" +export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" +export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" +export OSAL_INSTALL_DIR_RECIPE = "${installdir}/ti-osal-tree" +export PDK_INSTALL_DIR_RECIPE = "${installdir}/ti-pdk-tree" +export SYSBIOS_INSTALL_DIR_RECIPE = "${installdir}/ti-sysbios-tree" +export SWTOOLS_INSTALL_DIR_RECIPE = "${installdir}/ti-swtools-tree" +export TI_CGT_PRU_INSTALL_DIR_RECIPE = "${installdir}/cgt-pru" export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7" -export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" - +export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" +export VLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-vlib-c66x-tree" +export XDAIS_INSTALL_DIR_RECIPE = "${installdir}/ti-xdais-tree" +export XDC_INSTALL_DIR_RECIPE = "${installdir}/ti-xdctools-tree" # This is where the tools will end up in sysroot -export BIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${BIOS_INSTALL_DIR_RECIPE}" -export BIOSPSP_INSTALL_DIR = "${STAGING_DIR_TARGET}${BIOSPSP_INSTALL_DIR_RECIPE}" -export C6ACCEL_INSTALL_DIR = "${STAGING_DIR_TARGET}${C6ACCEL_INSTALL_DIR_RECIPE}" -export C6RUN_INSTALL_DIR = "${STAGING_DIR_TARGET}${C6RUN_INSTALL_DIR_RECIPE}" -export CE_INSTALL_DIR = "${STAGING_DIR_TARGET}${CE_INSTALL_DIR_RECIPE}" -export CMEM_INSTALL_DIR = "${STAGING_DIR_TARGET}${CMEM_INSTALL_DIR_RECIPE}" -export CODEC_INSTALL_DIR = "${STAGING_DIR_TARGET}${CODEC_INSTALL_DIR_RECIPE}" -export CODEGEN_ARM_INSTALL_DIR= "${STAGING_DIR_TARGET}${CODEGEN_ARM_INSTALL_DIR_RECIPE}" -export CODEGEN_INSTALL_DIR = "${STAGING_DIR_TARGET}${CODEGEN_INSTALL_DIR_RECIPE}" -export DSP_BENCHMARK_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSP_BENCHMARK_INSTALL_DIR_RECIPE}" -export EDMA3_LLD_INSTALL_DIR = "${STAGING_DIR_TARGET}${EDMA3_LLD_INSTALL_DIR_RECIPE}" -export EDMA3_LLD_SYSBIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${EDMA3_LLD_SYSBIOS_INSTALL_DIR_RECIPE}" -export FASTMATHLIB_C674P_INSTALL_DIR = "${STAGING_DIR_TARGET}${FASTMATHLIB_C674P_INSTALL_DIR_RECIPE}" -export FC3_INSTALL_DIR = "${STAGING_DIR_TARGET}${FC3_INSTALL_DIR_RECIPE}" -export FC_INSTALL_DIR = "${STAGING_DIR_TARGET}${FC_INSTALL_DIR_RECIPE}" -export HDVICP20_INSTALL_DIR = "${STAGING_DIR_TARGET}${HDVICP20_INSTALL_DIR_RECIPE}" -export IMGLIB_C64P_INSTALL_DIR= "${STAGING_DIR_TARGET}${IMGLIB_C64P_INSTALL_DIR_RECIPE}" -export IPC_INSTALL_DIR = "${STAGING_DIR_TARGET}${IPC_INSTALL_DIR_RECIPE}" -export LINK_INSTALL_DIR = "${STAGING_DIR_TARGET}${LINK_INSTALL_DIR_RECIPE}" -export LPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${LPM_INSTALL_DIR_RECIPE}" -export OMX_INSTALL_DIR = "${STAGING_DIR_TARGET}${OMX_INSTALL_DIR_RECIPE}" -export SYSBIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SYSBIOS_INSTALL_DIR_RECIPE}" -export SYSLINK_INSTALL_DIR = "${STAGING_DIR_TARGET}${SYSLINK_INSTALL_DIR_RECIPE}" -export UIA_INSTALL_DIR = "${STAGING_DIR_TARGET}${UIA_INSTALL_DIR_RECIPE}" -export XDAIS_INSTALL_DIR = "${STAGING_DIR_TARGET}${XDAIS_INSTALL_DIR_RECIPE}" -export XDC_INSTALL_DIR = "${STAGING_DIR_NATIVE}${XDC_INSTALL_DIR_RECIPE}" -export PDK_INSTALL_DIR = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}" -export OSAL_INSTALL_DIR = "${STAGING_DIR_TARGET}${OSAL_INSTALL_DIR_RECIPE}" -export M4_TOOLCHAIN_INSTALL_DIR = "${STAGING_DIR_NATIVE}${M4_TOOLCHAIN_INSTALL_DIR_RECIPE}" -export GCC_ARM_NONE_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}" -export TI_CGT_PRU_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT_PRU_INSTALL_DIR_RECIPE}" -export SWTOOLS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SWTOOLS_INSTALL_DIR_RECIPE}" -export DSPLIB_C64P_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C64P_INSTALL_DIR_RECIPE}" -export DSPLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C674_INSTALL_DIR_RECIPE}" -export DSPLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C66_INSTALL_DIR_RECIPE}" -export MATHLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C66_INSTALL_DIR_RECIPE}" -export MATHLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C674_INSTALL_DIR_RECIPE}" -export IMGLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${IMGLIB_C66_INSTALL_DIR_RECIPE}" -export VLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${VLIB_C66_INSTALL_DIR_RECIPE}" -export CG_XML_INSTALL_DIR = "${STAGING_DIR_NATIVE}${CG_XML_INSTALL_DIR_RECIPE}" -export OMP_INSTALL_DIR = "${STAGING_DIR_TARGET}${OMP_INSTALL_DIR_RECIPE}" -export MPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}" +export CE_INSTALL_DIR = "${STAGING_DIR_TARGET}${CE_INSTALL_DIR_RECIPE}" +export CODEGEN_ARM_INSTALL_DIR = "${STAGING_DIR_TARGET}${CODEGEN_ARM_INSTALL_DIR_RECIPE}" +export CG_XML_INSTALL_DIR = "${STAGING_DIR_NATIVE}${CG_XML_INSTALL_DIR_RECIPE}" +export DSPLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C66_INSTALL_DIR_RECIPE}" +export DSPLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C674_INSTALL_DIR_RECIPE}" +export DSPLIB_C64P_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C64P_INSTALL_DIR_RECIPE}" +export EDMA3_LLD_INSTALL_DIR = "${STAGING_DIR_TARGET}${EDMA3_LLD_INSTALL_DIR_RECIPE}" +export FC_INSTALL_DIR = "${STAGING_DIR_TARGET}${FC_INSTALL_DIR_RECIPE}" +export GCC_ARM_NONE_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_ARM_NONE_TOOLCHAIN_RECIPE}" +export IMGLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${IMGLIB_C66_INSTALL_DIR_RECIPE}" +export IPC_INSTALL_DIR = "${STAGING_DIR_TARGET}${IPC_INSTALL_DIR_RECIPE}" +export M4_TOOLCHAIN_INSTALL_DIR = "${STAGING_DIR_NATIVE}${M4_TOOLCHAIN_INSTALL_DIR_RECIPE}" +export MATHLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C66_INSTALL_DIR_RECIPE}" +export MATHLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C674_INSTALL_DIR_RECIPE}" +export MPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}" +export OMP_INSTALL_DIR = "${STAGING_DIR_TARGET}${OMP_INSTALL_DIR_RECIPE}" +export OSAL_INSTALL_DIR = "${STAGING_DIR_TARGET}${OSAL_INSTALL_DIR_RECIPE}" +export PDK_INSTALL_DIR = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}" +export SWTOOLS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SWTOOLS_INSTALL_DIR_RECIPE}" +export SYSBIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SYSBIOS_INSTALL_DIR_RECIPE}" +export TI_CGT_PRU_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT_PRU_INSTALL_DIR_RECIPE}" export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR_RECIPE}" -export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}" -export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}" -export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" - - -DSPSUFFIX:omapl137 = "x674" -DSPSUFFIX:omapl138 = "x674" -DSPSUFFIX_ti816x = "xe674" -DSPSUFFIX_ti814x = "xe674" -DSPSUFFIX ?= "x64P" +export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" +export VLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${VLIB_C66_INSTALL_DIR_RECIPE}" +export XDAIS_INSTALL_DIR = "${STAGING_DIR_TARGET}${XDAIS_INSTALL_DIR_RECIPE}" +export XDC_INSTALL_DIR = "${STAGING_DIR_NATIVE}${XDC_INSTALL_DIR_RECIPE}" diff --git a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc index 46bfb957..13068843 100644 --- a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc +++ b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc @@ -24,7 +24,6 @@ python ti_bin_do_unpack() { bb.fatal("TI installer requires 32bit glibc libraries for proper operation\nrun 'yum install glibc.i686' on Fedora or 'apt-get install libc6:i386' on Ubuntu/Debian") localdata = bb.data.createCopy(d) - bb.data.update_data(localdata) binfile = localdata.getVar('BINFILE') binfile = bb.data.expand(binfile, localdata) diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc index 56667ad1..14ac7c77 100644 --- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc +++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc @@ -1,8 +1,8 @@ require recipes-ti/includes/ti-paths.inc -TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/ipc/ipc-examples.git" +TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git" TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples" -TI_IPC_EXAMPLES_GIT_PROTOCOL = "git" +TI_IPC_EXAMPLES_GIT_PROTOCOL = "https" TI_IPC_EXAMPLES_GIT_BRANCH = "master" TI_IPC_EXAMPLES_NAME = "ipc-examples" @@ -12,9 +12,9 @@ protocol=${TI_IPC_EXAMPLES_GIT_PROTOCOL};\ branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\ name=${TI_IPC_EXAMPLES_NAME}" -TI_IPC_METADATA_GIT_URI = "git://git.ti.com/ipc/ipc-metadata.git" +TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git" TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata" -TI_IPC_METADATA_GIT_PROTOCOL = "git" +TI_IPC_METADATA_GIT_PROTOCOL = "https" TI_IPC_METADATA_GIT_BRANCH = "master" TI_IPC_METADATA_NAME = "ipc-metadata" diff --git a/meta-ti-extras/recipes-ti/jailhouse/jailhouse-inmate.bb b/meta-ti-extras/recipes-ti/jailhouse/jailhouse-inmate.bb new file mode 100644 index 00000000..39654a53 --- /dev/null +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse-inmate.bb @@ -0,0 +1,12 @@ +require ti-jailhouse.inc + +do_install() { + + install -d ${D}${bindir} + install -m 0755 ${TOOLS_SRC_DIR}/demos/ivshmem-demo ${D}${bindir} + +} + +FILES:${PN} = " \ + ${bindir}/ivshmem-demo \ +" diff --git a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb new file mode 100644 index 00000000..98ec0e9e --- /dev/null +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb @@ -0,0 +1,126 @@ +require ti-jailhouse.inc + +RDEPENDS:${PN} += "\ + python3-curses\ + python3-datetime\ + python3-mmap\ +" + +JH_CELL_FILES ?= "*.cell" +JH_CELL_FILES:k3 ?= "k3-*.cell" +JH_CELL_FILES:am62xx ?= "k3-am625-*.cell" +JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell" + +JH_INMATE_DTB ?= "" +JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb" +JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb" +JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb" +JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb" +JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb" + +JH_LINUX_DEMO_CELL ?= "" +JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell" +JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell" +JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell" +JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell" +JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell" + +INITRAMFS_IMAGE ?= "" +JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}" + +JH_CMDLINE ?= "" +JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000" +JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8" +JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8" +JH_CMDLINE:j7 ?= "console=ttyS3,115200n8" +JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8" + +do_install() { + + # We want to install the python tools, but we do not want to use pip... + # At least with v0.10, we can work around this with + # 'PIP=":" PYTHON_PIP_USEABLE=yes' + oe_runmake PIP=: PYTHON=python3 PYTHON_PIP_USEABLE=yes DESTDIR=${D} install + + install -d ${D}${CELL_DIR} + install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/ + + install -d ${D}${INMATES_DIR} + install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR} + + install -d ${D}/boot + if [ -n "${JH_RAMFS_IMAGE}" ] + then + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ] + then + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot + else + bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!" + bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES." + fi + fi + + if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then + cd ${TOOLS_SRC_DIR} + + echo "#! /bin/sh" > ${D}${JH_DATADIR}/linux-demo.sh + echo "jailhouse enable ${CELL_DIR}/${JH_SYSCONFIG_CELL}" >> ${D}${JH_DATADIR}/linux-demo.sh + ./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \ + -a ${JH_ARCH} -c "${JH_CMDLINE}" \ + -d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \ + -i ${D}/boot/${JH_RAMFS_IMAGE}-${MACHINE}.cpio \ + ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \ + ${DEPLOY_DIR_IMAGE}/Image \ + | tr -cd '\11\12\15\40-\176' \ + >> ${D}${JH_DATADIR}/linux-demo.sh + + sed -i -e 's,^Modified device tree written.*,,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's,\${D},,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's, linux-loader.bin, ${JH_EXEC_DIR}/linux-loader.bin,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e 's,\${DEPLOY_DIR_IMAGE},/boot,g' ${D}${JH_DATADIR}/linux-demo.sh + sed -i -e '/^\s*$/d' ${D}${JH_DATADIR}/linux-demo.sh + chmod +x ${D}${JH_DATADIR}/linux-demo.sh + fi + + rm ${D}${JH_DATADIR}/root-cell-config.c.tmpl + rm ${D}${JH_DATADIR}/jailhouse-config-collect.tmpl +} + +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools" + +FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*" + +RDEPENDS:${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression" +RDEPENDS:pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell" + +RRECOMMENDS:${PN} = "${PN}-tools" + +INSANE_SKIP:${PN} = "ldflags" + +KERNEL_MODULE_AUTOLOAD += "jailhouse" + +# Any extra cells/inmates from external recipes/packages +CELLS = "" + +python __anonymous () { + d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy') + ramfs = d.getVar('JH_RAMFS_IMAGE', True) + if ramfs: + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete') + + # Setup DEPENDS and RDEPENDS to included cells + cells = d.getVar('CELLS', True) or "" + for cell in cells.split(): + d.appendVar('DEPENDS', ' ' + cell) + d.appendVar('RDEPENDS_${PN}', ' ' + cell) +} + +FILES:${PN} = " \ + /boot/* \ + /usr/libexec \ + /usr/sbin/* \ + /usr/libexec/* \ + /usr/share/* \ + /lib/firmware/* \ +" diff --git a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc new file mode 100644 index 00000000..af94a780 --- /dev/null +++ b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc @@ -0,0 +1,87 @@ +SUMMARY = "Linux-based partitioning hypervisor" +DESCRIPTION = "Jailhouse is a partitioning Hypervisor based on Linux. It is able to run bare-metal applications or (adapted) \ +operating systems besides Linux. For this purpose, it configures CPU and device virtualization features of the hardware \ +platform in a way that none of these domains, called 'cells' here, can interfere with each other in an unacceptable way." +HOMEPAGE = "https://github.com/siemens/jailhouse" +SECTION = "jailhouse" + +LICENSE = "GPL-2.0-only & BSD-2-Clause" + +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ +" + +COMPATIBLE_MACHINE = "am62xx|am62pxx" +TARGET_CC_ARCH += "${LDFLAGS}" +PV = "0.12+git${SRCPV}" +SRCREV = "603819ef9a771a3c253a141220daab8e61751a43" +BRANCH = "master" +SRC_URI = " \ + git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \ +" + +# Set jailhouse architecture JH_ARCH variable +# +# return value must match one of architectures supported by jailhouse +# +valid_jh_archs = "x86 arm" + +def map_jh_arch(a, d): + import re + + valid_jh_archs = d.getVar('valid_jh_archs', True).split() + + if re.match('(i.86|athlon|x86.64)$', a): return 'x86' + elif re.match('armeb$', a): return 'arm' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('aarch64_be$', a): return 'arm64' + elif a in valid_jh_archs: return a + else: + bb.error("cannot map '%s' to a jailhouse supported architecture" % a) + +export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" + +S = "${WORKDIR}/git" +B = "${S}" + +DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native" + +inherit module python3native bash-completion deploy setuptools3 + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(ti-soc)" + +JH_DATADIR ?= "${datadir}/jailhouse" +JH_EXEC_DIR ?= "${libexecdir}/jailhouse" +CELL_DIR ?= "${JH_DATADIR}/cells" +CELLCONF_DIR ?= "${JH_DATADIR}/configs" +INMATES_DIR ?= "${JH_DATADIR}/inmates" + +JH_SYSCONFIG_CELL ?= "" +JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell" +JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell" +JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell" +JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell" +JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell" + +do_configure() { + if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; + then + cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/ + fi +} + +USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ + -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \ + -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \ + -I../driver' + +TOOLS_SRC_DIR = "${S}/tools" + +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" KDIR=${STAGING_KERNEL_BUILDDIR}" + +do_compile() { + oe_runmake V=1 +} diff --git a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc index fe75c099..6ad073ec 100644 --- a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc +++ b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc @@ -17,8 +17,8 @@ DEPENDS = "ti-cgt6x-native \ S = "${WORKDIR}/git" MATHLIB_GIT_BRANCH = "master" -MATHLIB_GIT_PROTOCOL = "git" -MATHLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/mathlib.git" +MATHLIB_GIT_PROTOCOL = "https" +MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git" MATHLIB_SRCREV = "eadcc9547faf69789661b004bb0b5ef53bb69951" SRC_URI = "${MATHLIB_GIT_URI};protocol=${MATHLIB_GIT_PROTOCOL};branch=${MATHLIB_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb index 7c4a3409..aa4bc6cd 100644 --- a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb +++ b/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "TI OpenMP RTOS" -HOMEPAGE = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git" +HOMEPAGE = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git" LICENSE = "BSD-3-Clause" require recipes-ti/includes/ti-paths.inc @@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "openmp" PV = "2_06_03_00" PR = "r0" -OPENMP_RTOS_GIT_URI = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git" -OPENMP_RTOS_GIT_PROTOCOL = "git" +OPENMP_RTOS_GIT_URI = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git" +OPENMP_RTOS_GIT_PROTOCOL = "https" OPENMP_RTOS_GIT_BRANCH = "master" BRANCH = "${OPENMP_RTOS_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb index a4cb1053..4bcd6754 100644 --- a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb +++ b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb @@ -15,8 +15,8 @@ PR = "r3" S = "${WORKDIR}/git" SWTOOLS_GIT_BRANCH = "master" -SWTOOLS_GIT_PROTOCOL = "git" -SWTOOLS_GIT_URI = "git://git.ti.com/ep-processor-libraries/swtools.git" +SWTOOLS_GIT_PROTOCOL = "https" +SWTOOLS_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/swtools.git" SWTOOLS_SRCREV = "7d1c85e686b1466cd2d535fc9cac5baf1aae24a4" SRC_URI = "${SWTOOLS_GIT_URI};protocol=${SWTOOLS_GIT_PROTOCOL};branch=${SWTOOLS_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb b/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb deleted file mode 100644 index 59576daa..00000000 --- a/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Provides test pruss firmware for uio based tests" -LICENSE = "BSD-3-Clause" -PV = "1.0.2.0" -require recipes-ti/includes/ti-paths.inc - -S = "${WORKDIR}/git" - -DEPENDS = "ti-cgt-pru-native" - -BRANCH = "master" -LIC_FILES_CHKSUM = "file://Makefile;startline=1;endline=31;md5=0ee4f2c42eb6b04e37859bb55a18b144" - -UIO_TEST_PRUSS_GIT_URI = "git://git.ti.com/processor-sdk/uio-test-pruss.git" -UIO_TEST_PRUSS_GIT_PROTOCOL = "git" -SRC_URI = "${UIO_TEST_PRUSS_GIT_URI};protocol=${UIO_TEST_PRUSS_GIT_PROTOCOL};branch=${BRANCH}" - -# Corresponds to version 01.00.02.00 -UIO_TEST_PRUSS_SRCREV = "e52a7b099d7203ca52519650df51419e9fef7e0c" - -SRCREV = "${UIO_TEST_PRUSS_SRCREV}" - -PR = "r0" - -COMPATIBLE_MACHINE = "omap-a15|ti33x|ti43x" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEVICE_NAME = "" -DEVICE_NAME:append:am57xx-evm = "am57xx" -DEVICE_NAME:append:ti33x = "am33xx" -DEVICE_NAME:append:ti43x = "am43xx" - -EXTRA_OEMAKE = "CGT_PRU=${TI_CGT_PRU_INSTALL_DIR} DEVICE=${DEVICE_NAME}" - -do_install() { - install -d ${D}${bindir}/ - cp -r *.bin ${D}${bindir}/ -} |