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

Compare commits

...

99 Commits

Author SHA1 Message Date
Praneeth Bajjuri
02a53f48b9 ti-rtos: Update metadata and versions for RTOS firmware
updated rtos firmwares
j721e, j7200: 07.03.00.29

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-05 09:51:27 -05:00
Shiju Sivasankaran
1da075847d ti-rtos: update metadata and version of am64x rtos firmware
update am64x rtos firmware to keep pinmux and control MMRs
remain unlocked now since linux needs this to be unlock.
this fix the USB and performance degradation issues.

am64xx: 07.03.00.19

Signed-off-by: Shiju Sivasankaran <shiju@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-05 09:28:38 -05:00
Praneeth Bajjuri
5e3770dbfb ti-rtos: Update metadata and versions for RTOS firmware
updated rtos firmwares
j721e, j7200: 07.03.00.26

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-01 15:13:25 -05:00
Nishanth Menon
03450999c5 conf/machine: k3: Lets build bmap files by default
Lets generate bmap files for bmaptool to use as well as default to use
with wic files.

NOTE: bmaptool can speed up flashing SD cards by 2x-3x by skipping
empty blocks of the image.

https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#flashing-images-using-bmaptool

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:45:25 -05:00
Nishanth Menon
44d9a6a344 conf/machine: am64xx: Switch to multi-certificate boot images
Switch to using all of multi-certificate boot images. This allows us
to create bootable images - in this case, we are missing tiboot3.bin

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:45:07 -05:00
Nishanth Menon
6d4a13deb0 conf/machine: am64xx: Consolidate image configuration to SoC include
IMAGE type and dependencies can easily be centralized to SoC include
file. This is necessary to make sure that we don't do the duplication
and having multiple places to fix up.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:44:57 -05:00
Nishanth Menon
fbbeea5344 conf/machine: j7200-evm: Switch to multi-certificate boot images
Switch to using all of multi-certificate boot images. This allows us
to create bootable images - in this case, we are missing tiboot3.bin

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:44:47 -05:00
Nishanth Menon
4393653953 conf/machine: am64xx/j7200: Drop trusted-firmware deployment for tar wic
wic and tar dependency on trusted firmware is wrong. It is u-boot build
that depends on trusted firmware deployment and is correctly handled by
u-boot recipe. No point in duplicating that dependency, so just clean it
all up.

Reported-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:44:18 -05:00
Nishanth Menon
ff6e95ff42 conf/machine: j7: Document boot images as legacy mode
We use the default IMAGE_BOOT_FILES configuration which matches up with
legacy boot configuration. Document the same to allow folks to
understand by just looking at the SoC include file.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:43:19 -05:00
Nishanth Menon
be0c8f09c4 conf/machine: am65xx: Document boot images as legacy mode
We use the default IMAGE_BOOT_FILES configuration which matches up with
legacy boot configuration. Document the same to allow folks to
understand by just looking at the SoC include file.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:43:07 -05:00
Nishanth Menon
f36bf3544c conf/machine: k3: Add multi-certificate boot image support
Lets keep things consistent by providing two possibilities for platforms
to pick from - legacy boot and multi-certificate boot.

In legacy boot, the base bootloader and system firmware are
maintained as separate binaries (tiboot3.bin and sysfw.itb).

In multi-certificate boot that newer K3 devices support, ROM is smarter
and can handle multiple x509 certificate based images: so we can strip
out the sysfw.itb and integrate it as part of tiboot3.bin itself. This
improves authentication and overall system boot times since we are now
able to boot both the system controller and the boot processor in
parallel.

We do have a scheme currently to identify the images necessary for boot
etc, but things are handled on a platform conf file basis. We can
improve that by introducing the pattern at the top level include and use
the relevant pattern in platforms as needed.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-31 21:42:59 -05:00
Denys Dmytriyenko
d1fec62587 conf/machine: am64*, j7200: cleanup k3r5 configs
Remove duplicate machine-specific redefines of UBOOT_BINARY, UBOOT_IMAGE and
UBOOT_SYMLINK variables, as they are already defined with same values in the
common k3r5.inc file.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Reviewed-by: Nishanth Menon <nm@ti.com>
2021-03-31 21:41:25 -05:00
Shiju Sivasankaran
31ff7a4768 ti-rtos: update metadata and version of am64x rtos firmware
updated am64x rtos release mode firmware
am64xx: 07.03.00.18

Signed-off-by: Shiju Sivasankaran <shiju@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-31 21:38:58 -05:00
Praneeth Bajjuri
eb52e3d60f linux-ti-staging: Update 5.4 kernel to 07.03.00.004
Update 5.4 kernel to 07.03.00.004

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-29 17:59:53 -05:00
Shiju Sivasankaran
b3e1efd370 ti-rtos: update metadata and version of am64x rtos firmware
updated rtos firmware
am64xx: 07.03.00.13

rtos fw of am64x build and upload from mcu-plus-sdk repo.

Signed-off-by: Shiju Sivasankaran <shiju@ti.com>
[praneeth@ti.com: updated commit message]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-28 23:45:23 -05:00
Denys Dmytriyenko
75e510d8bd ti-rtos-firmware: depend on openssl-native for signing
Fixes:
.../scripts/secure-binary-image.sh: line 69: openssl: command not found
.../scripts/secure-binary-image.sh: line 78: openssl: command not found

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-28 21:41:53 -05:00
Praneeth Bajjuri
7f98b27724 linux-ti-staging: Update 5.4 kernel to 5.4.106
Update linux 5.4 to 5.4.106 stable.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-27 12:19:27 -05:00
Praneeth Bajjuri
51a6085326 ti-uboot-staging: Update to the latest commit
ti-uboot-staging: Update to the latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-26 19:15:15 -05:00
Praneeth Bajjuri
8b1aa75cfe ti-rtos-firmware: sign DM firmware for J721e HS platform
U-boot build process requires DM firmware to be signed for J7 HS.
It's better for ti-rtos-firmware package (that delivers DM firmware) to sign
it once and provide signed version to other packages, instead of U-boot needing
to re-sign it during build in staging location.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-26 13:18:18 -05:00
Praneeth Bajjuri
5809a83e37 conf/machine: fix OPTEEMACHINE name for J721e
OPTEEMACHINE name as defined in the optee_os project [1] for
j721e is k3-j721e.

This patch fixes the name to correct target.

[1]: 87613cf952

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Acked-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-26 08:15:15 -05:00
Gowtham Tammana
dd2f003ad3 ti-img-rogue-umlibs: Update to pick rpath fixes
Update srcrev to pick the rpath warning fixes.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-25 16:25:34 -05:00
Dan Murphy
ff736a05b3 linux-ti-mainline: Set the branch for the ti-upstream-tools repo
ti-upstream-tools[1] repository carries the overlays and defconfig
fragments that we don't wish to overload upstream kernel community with.
The reason for that being these are constantly on churn as our test
coverage increases etc. Currently we reuse the "BRANCH" variable to also
matchup with kernel and ti-upstream-tools repositories as well.

This can tend to be a little painful if we decide to start testing
various kernel configurations - RT etc.. So, lets just split out the
TOOLS_BRANCH separated from the branch we use for kernel. Even though
the branch remains the exact same at this point.

[1] https://git.ti.com/cgit/ti-linux-kernel/ti-upstream-tools/

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
2021-03-25 16:23:03 -05:00
Dan Murphy
0376ebcd43 linux-ti-mainline: Add gmp-native as a kernel dependency
Add GNU Multiple Precision Arithmetic Library as a dependency for
mainline linux builds. These are necesary for kernel to handle gcc
plugins for builtins.h

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-25 16:22:30 -05:00
Lucas Weaver
5776fe04ad ti-sci-fw: Update J7200/AM64 deploy to install ti-sci-fw
The J7200/AM64 ti-sci-fw needs to be installed in the deploy
directory so that it can be packaged in Processor SDK bundle

This is required because the ti-sci-fw is needed in the
installer prebuilt-images in order to build the combined boot
image for J7200/AM64

Signed-off-by: Lucas Weaver <l-weaver@ti.com>
2021-03-25 16:21:42 -05:00
Praneeth Bajjuri
25a1adc13a linux-ti-staging: Update 5.4 kernel to the latest commit SHA
Update 5.4 kernel to the latest commit SHA

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-19 18:20:22 -05:00
Praneeth Bajjuri
06f86d1f88 ti-uboot-staging: Update to the latest commit
ti-uboot-staging: Update to the latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-19 18:20:22 -05:00
Denys Dmytriyenko
00eb3341d4 layer.conf: remove releases before dunfell as compatible
For dunfell meta-ti moved to depend on meta-arm and is no longer compatible
with older releases.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-19 17:57:22 -05:00
Praneeth Bajjuri
1bd2073310 ti-sci-fw: Update image gen and sysfw to v2021.01a
Update the image gen and linux-firmware commit SHAs so that
we pick v2021.01a sysfw and the applicable
DM update with following version
* 07.03.00.21 for J721E and J7200

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-17 19:19:35 -05:00
Gowtham Tammana
57f24176dd ti-img-rogue-umlibs: Update artifacts to 1.13.5776728
Update GLES binary artifacts to latest version 1.13.5776728.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-17 12:53:58 -05:00
Gowtham Tammana
6cb197cbdd ti-img-rogue-driver: Update driver to 1.13.5776728
Update the Rogue kernel driver sources to version 1.13.5776728.

Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-17 12:53:24 -05:00
Shiju Sivasankaran
fd22326861 ti-rtos: update to uisng fw from mcu-plus-sdk for AM64x
update ti-rtos-metadata and ti-rtos-firmware recipes of meta-ti to
pick AM64x rtos firmware from mcu-plus-sdk instead of PDK.

Other devices such as AM65x, J7 continue to use fw from PDK.

Built and tested both IPC echo test applications - "rpmsg_client_sample”
& “rpmsg_char_simple”. Both tests passed for all remote R5F cores
on AM64x EVM

Signed-off-by: Shiju Sivasankaran <shiju@ti.com>
[praneeth@ti.com: rebase to dunfell/next]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-17 12:51:03 -05:00
Praneeth Bajjuri
40ee321451 ti-rtos: Update metadata and versions for RTOS firmware
updated rtos firmwares
j721e, j7200: 07.03.00.21
am65xx: 07.03.00.22

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-17 12:51:03 -05:00
Nikhil Devshatwar
6c7764e500 recipes-bsp: wl18xx-fw: update SRCREV to latest
Update the wl18xx firmware recipe to latest version 8.9.0.0.86

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-11 22:30:00 -06:00
Vivien Didelot
0e26563f5f ti33x: allow different virtual/bootloader
Boards like the beaglebone currently hardcode "u-boot" as a dependency
for the image and the wic format, and this prevents one from choosing
a different bootloader via:

    PREFERRED_PROVIDER_virtual/bootloader = "non-u-boot-bootloader"

Depending on "virtual/bootloader" instead of "u-boot" fixes this.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
Suggested-by: Denys Dmytriyenko <denis@denix.org>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-11 22:29:35 -06:00
Praneeth Bajjuri
9421b0df61 linux-ti-staging: Update 5.4 kernel to the latest commit SHA
Update 5.4 kernel to the latest commit SHA

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-05 17:24:25 -06:00
Praneeth Bajjuri
513d02a22a ti-uboot-staging: Update to the latest commit
ti-uboot-staging: Update to the latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-05 17:21:21 -06:00
Praneeth Bajjuri
acbff6ec61 ti-rtos: Update path for firmwares on j7200
Between j7200 firmware tags 07.03.00.10 to 07.03.00.16
the downloadable weburl link changed
from *processor-sdk-rtos-jacinto7 to *processor-sdk-rtos-j7200.

This patch is to fix the recipe to pick the firmware from the
expected location on the new tag.

Fixes j7200 build error reported due to
77cdfa9f65 ("ti-rtos: Update metadata and versions for RTOS firmware")

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
2021-03-05 17:19:05 -06:00
Nishanth Menon
687c4b9397 linux-ti-mainline: Bump kernel version to v5.11
And lets work with the latest kernel

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-04 18:45:42 -06:00
Nishanth Menon
cc672ee2e8 linux-ti-mainline: Bump up ti-upstream-tools SRCREV
Bump up our recipe version for ti-upstream-tools for updates in config
files needed for latest kernel

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-03-04 18:44:56 -06:00
Praneeth Bajjuri
06bddc4509 ti-rtos: Update metadata and versions for RTOS firmware
updated rtos firmwares
am64xx: 07.03.01.06
j721e, j7200, am65xx: 07.03.00.16

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
2021-03-04 17:39:38 -06:00
Praneeth Bajjuri
c26165ef90 ti-sci-fw: Update image gen and sysfw to v2021.01
Update the image gen and linux-firmware commit SHAs so that
am65x, j7200 and j721e also picks v2021.01 sysfw and the applicable
DM update with following version
* 07.03.00.12 for J721E
* 07.03.00.10 for J7200

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-23 21:33:57 -06:00
Praneeth Bajjuri
77cdfa9f65 ti-rtos: Update metadata and versions for RTOS firmware
updated rtos firmwares
am64xx: 07.03.01.02
am65xx: 07.03.00.10
j721e: 07.03.00.12
j7200: 07.03.00.10

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-22 14:08:05 -06:00
Praneeth Bajjuri
312f83615c linux-ti-staging: Update 5.4 kernel to the latest commit SHA
Update 5.4 kernel to the latest commit SHA

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-21 22:10:26 -06:00
Praneeth Bajjuri
0b4a372eca ti-uboot-staging: Update to the latest commit
ti-uboot-staging: Update to the latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-21 22:02:57 -06:00
Praneeth Bajjuri
7401e9c10c ti-sci-fw: Update image gen to latest
update image get to latest

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-21 21:58:31 -06:00
Praneeth Bajjuri
94bd05eda5 linux-ti-staging: Update 5.4 kernel to 07.03.00.000
Update 5.4 kernel to 07.03.00.000

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-11 15:57:47 -06:00
Praneeth Bajjuri
c4ba4d5cea ti-uboot-staging: Update to the latest commit
ti-uboot-staging: Update to the latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-11 11:54:31 -06:00
Lokesh Vutla
a882433f3e am64xx-sk Add combined boot build support
Add combined boot flow support for the AM64XX SK device.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-10 13:59:30 -06:00
Lokesh Vutla
9ae470af88 machine: am64xx-sk.conf: Add machine definition for AM64xx SK
AM642 StarterKit (SK) board is a low cost, small form factor board
designed for TI’s AM642 SoC. Add machine definition for SK board.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-06 14:51:56 -06:00
Praneeth Bajjuri
649ebb21dd linux-ti-staging: Update 5.4 kernel to the latest commit SHA
Update 5.4 kernel to the latest commit SHA

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-06 14:46:13 -06:00
Lokesh Vutla
f71fe2438f ti-uboot-staging: Update to the latest commit
Update SRCREV to latest commit that includes AM64xx SK platform

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-02-06 14:36:26 -06:00
Dan Murphy
67ad5a9bb3 linux-ti-staging_5.4: Update to 5.4.93 kernel revision
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-02-03 14:23:50 -06:00
Dan Murphy
b1a69deb89 linux-ti-staging_5.4: Update to 5.4.91 kernel revision
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-27 07:43:25 -06:00
Denys Dmytriyenko
6496a0edeb linux-ti-staging, u-boot-ti-staging: lower default preference
Latest versions of Linux kernel (5.10) and U-boot (2021.01) are not yet ready
for prime time in meta-ti and some features are still being migrated and causing
issues. The recipes are meant for development and not yet for production.

Normally selection of the version is done with PREFERRED_VERSION by the Distro
(e.g. Arago), but if not specified by a Distro (Poky, distroless, etc.), the
default is to use the latest version. Hence need to change the default to not
automatically pick the latest version that is not ready yet.

This can be removed/reverted once those versions are ready to be picked by
default.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-27 06:52:43 -06:00
Dan Murphy
ad5390700f u-boot-ti-staging: Override the LIC_FILE_CHKSUM for 2021
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-27 06:51:16 -06:00
Dan Murphy
a0ee3effd6 linux-ti-staging-5.10: With the kernel being AUTOREV'd remove the minor version
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-27 06:50:47 -06:00
Dan Murphy
542456ca08 ti-sci-fw: Update image gen and sysfw to v2020.12a
Update the image gen and linux-firmware commit SHAs so that
am65x, j7200 and j721e also picks v2020.12a sysfw and the applicable
DM update on j7200 and j721e based on 07.02.00.10 tag

Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-20 14:58:01 -06:00
Dan Murphy
c55ef77607 ti-rtos: Update metadata and versions for RTOS firmware
am64xx update to 07.02.01.06
am65, j7 and j7200 updated to 07.02.00.10

Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-20 12:58:47 -06:00
Praneeth Bajjuri
1ed529d1cb ti-uboot-staging: Update to the latest commit
Update SRCREV to latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-20 12:41:52 -06:00
Dan Murphy
4bd3b055a9 linux-ti-staging: Update 5.4 kernel to the latest SHA
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-20 08:51:48 -06:00
Praneeth Bajjuri
c232ecd8c3 ti-uboot-staging: Update to the latest commit
Update SRCREV to latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-20 07:40:42 -06:00
Dan Murphy
72e443f03f ti-sci-fw: Remove incorrect directive for 7200-hs
The 7200-hs-evm does not exist as a machine and if it did then this
directive should have been j7200-hs.  So just remove it as it is
unneeded.

From: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-18 13:28:12 -06:00
Dan Murphy
47987915f7 u-boot-ti-staging: Add 2021.01 recipe
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-14 15:07:16 -06:00
Dan Murphy
874ff0d7f9 linux-ti-staging: Add 5.10 recipe
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-14 15:07:05 -06:00
Praneeth Bajjuri
26cd10d5ae ti-sci-fw: Update image gen and sysfw to v2020.12
Update the image gen and linux-firmware commit SHAs so that
am65x, j7200 and j721e also picks v2020.12 sysfw and the applicable
DM update on j7200 and j721e based on 07.02.00.05 tag

Dan Murphy - Removed am64xx PV over ride

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-14 14:39:34 -06:00
Dan Murphy
221737207c ti-rtos: Update metadata and versions for RTOS firmware to 07.02.0x.05
From: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-14 13:20:01 -06:00
Dan Murphy
14a232a272 linux-ti-staging: Update 5.4 kernel to the latest 5.4.87
From: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-14 13:19:05 -06:00
Praneeth Bajjuri
82e41e4414 ti-uboot-staging: Update to the latest commit
Update SRCREV to latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-14 13:19:05 -06:00
Dan Murphy
46b2004ab2 u-boot-ti: am64xx: Remove dm support for uboot
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-08 11:40:25 -06:00
Dan Murphy
53ae9e8076 linux-ti-staging: Update 5.4 kernel to the latest commit SHA
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-08 06:34:55 -06:00
Denys Dmytriyenko
be0396863b optee-os: upgrade to upstream 3.11.0
As meta-arm has this version in master, but not in dunfell, temporarily overlay
corresponding patches locally - could be removed for the next release. Need to
alter FILESEXTRAPATHS for bbappend to locate local patches.

Since meta-arm/dunfell has 3.8-specific patches in SRC_URI, let's redefine it
completely to match 3.11-specific patch list in meta-arm/master.

Last, but not least, guard all upstream recipe varibales with "ti-soc" override
to only affect platforms in meta-ti, but not any other BSPs.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-08 06:34:55 -06:00
Dan Murphy
89402b1230 am64xx: Add combined boot build support
Add combined boot flow support for the AM64XX device.

From: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-08 06:34:55 -06:00
Praneeth Bajjuri
707f3b67c8 ti-sci-fw: am64x: Update image gen and sysfw to v2020.12
Update the image gen and sysfw commit SHAs so that am64x picks
v2020.12 version.

Reviewed-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-08 06:34:17 -06:00
Praneeth Bajjuri
d6f8a0ba02 ti-uboot-staging: Update to the latest commit
Update SRCREV to latest commit

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-07 06:59:11 -06:00
Lokesh Vutla
bd2b6bf172 pruprp-fw: Update prp firmware to 2.17.25
Update prueth prp firmware to 2.17.25

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-06 09:41:47 -06:00
Lokesh Vutla
77776a0e73 pruhsr-fw: Update hsr firmware to 2.17.25
Update prueth hsr firmware to 2.17.25

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-06 09:41:41 -06:00
Lokesh Vutla
0704aef081 prusw-fw: Update switch firmwares to 3.2.7 version
Update prueth switch firmwares to 3.2.7 version

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-06 09:41:23 -06:00
Lokesh Vutla
76cc333b6d prueth-fw: Update prueth dual emac firmware to 5.5.13
Update the prueth dual emac firmware to 5.5.13 version

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-06 09:39:21 -06:00
Lokesh Vutla
ce0fecc116 k3conf: Update to latest commit
Update k3conf to latest sha, bumping up version to 0.2

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-05 14:42:07 -06:00
Dan Murphy
928cb40fbe linux-ti-staging: Update 5.4 kernel to 5.4.84
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2021-01-04 14:01:24 -06:00
Dan Murphy
418855aa0b prueth-fw-am65x-sr2: Updating firmware to 02.02.08.02
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 14:22:58 -06:00
Dan Murphy
d3d78e286c ti-sci-fw: Update image gen and sysfw commit SHA
Update the image gen and sysfw commit SHAs.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 14:22:51 -06:00
Dan Murphy
26c9810a30 k3conf: Update SRCREV to latest
Update the k3conf to the latest SHA to pick up AM64.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 11:55:34 -06:00
Dan Murphy
def08bdfe3 am64xx-evm-k3r5: Update SYSFW_SOC to am64x from am65x
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 11:55:34 -06:00
Dan Murphy
c13d467e73 ti-uboot-staging: Update to the latest commit
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 11:55:34 -06:00
Praneeth Bajjuri
888ed87486 trusted-firmware-a: Update SRCREV for AM64X support
Update SRCREV to pick latest that includes AM64X support

commit 65dd16b4e ("ti: k3: Introduce lite device board support")
adds support of AM64X platform in ti-atf branch.

This patch updates the SRCREV and also updates the BOARD to "lite" to
build for the mentioned platform.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Suggested-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Reviewed-by: Denys Dmytriyenko <denis@denix.org>
2020-12-17 07:13:47 -06:00
Dan Murphy
76ba5caad6 ti-rtos: Update metadata and versions for RTOS firmware
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 07:13:47 -06:00
Dan Murphy
ffe3b7c6e0 machine: am64xx-evm.conf: Remove commented code and update PDK values
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 07:13:47 -06:00
Dan Murphy
873917f7dc u-boot-ti: Remove unneeded variable for am64xx
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 07:13:47 -06:00
Dan Murphy
0097e62a6c linux-ti-staging: Update kernel to latest commit sha
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-17 07:13:47 -06:00
Dan Murphy
9ec15b2fad ti-rtos: Update metadata with AM64 firmware
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-11 12:38:26 -06:00
Dan Murphy
a7b1d85c9f u-boot-ti: Update u-boot to pick up AM64 architecture
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-11 10:44:06 -06:00
Dan Murphy
2436bcd3dd linux-ti-staging: Update kernel to pick up AM64 platform
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-11 10:44:06 -06:00
Dan Murphy
5f8c89ef7f machine: am64xx-evm.conf: Add machine definition for AM64xx platform
The AM64 is a follow on device of the AM65xx K3 multicore SoC architecture.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-11 10:44:06 -06:00
Suman Anna
05437e4d51 ipc: ti-rpmsg-char: Update library to 0.3.0
Update the ti-rpmsg-char library to 0.3.0 version that enables
the support for the various R5F remote processors on AM64x SoCs.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-11 06:23:45 -06:00
Nishanth Menon
33c89d6c52 trusted-firmware-a: Update to v2.4 merge
Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
 - stub for shutdown (CPUs enter wfi)
 - uart console is now configurable.

While at it, update to include PV_k3 as 2.4. We use PV_k3 instead of
PV since this allows meta-ti to not affect other platforms esp in a
multi-BSP configuration.

We also add LIC_FILES_CHKSUM_k3 to make sure that we don't let any
re-licensing in the project pass through unnoticed as that has to
be carefully examined for making sure we have all the right legal
compliance - There has been no change compared to previous versions,
but we introduce this as a protection in case there is a change in the
future.

Reviewed-by: Denys Dmytriyenko <denis@denix.org>
Suggested-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-11 06:23:45 -06:00
Dan Murphy
9dce84ef28 linux-ti-staging: Update kernel to 5.4.78
From: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-08 07:43:31 -06:00
Praneeth Bajjuri
19f7b0e421 u-boot-ti-staging_2020.01: Update SRCREV to latest
commit a6904f563f ("Remove redundant YYLOC global declaration")
is in ti-u-boot-2020.01 branch now.

Updating SRCREV of ti-u-boot-2020.01 to pick the patch from there.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-12-07 06:54:05 -06:00
Khem Raj
efabc3ccce u-boot-ti-staging_2020.01: Fix build on hosts with gcc10 on them
Backport a patch from upstream to fix build on distros with gcc10+

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-11-19 10:33:45 -06:00
65 changed files with 539 additions and 56 deletions

View File

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "meta-ti"
BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-ti = "6"
LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus dunfell"
LAYERSERIES_COMPAT_meta-ti = "dunfell"
LICENSE_PATH += "${LAYERDIR}/licenses"

View File

@@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: AM64xx EVM (R5F)
#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core)
require conf/machine/include/k3r5.inc
SYSFW_SOC = "am64x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
UBOOT_MACHINE = "am64x_evm_r5_defconfig"

View File

@@ -0,0 +1,7 @@
#@TYPE: Machine
#@NAME: AM64xx EVM
#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
require conf/machine/include/am64xx.inc
UBOOT_MACHINE = "am64x_evm_a53_defconfig"

View File

@@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: AM64xx SK (R5F)
#@DESCRIPTION: Machine configuration for the TI AM64xx SK (R5F core)
require conf/machine/include/k3r5.inc
SYSFW_SOC = "am64x"
SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
UBOOT_MACHINE = "am64x_sk_r5_defconfig"

View File

@@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: AM64xx SK
#@DESCRIPTION: Machine configuration for the TI AM64xx SK board
require conf/machine/include/am64xx.inc
UBOOT_MACHINE = "am64x_sk_a53_defconfig"
KERNEL_DEVICETREE = " \
ti/k3-am642-sk.dtb \
"

View File

@@ -0,0 +1,26 @@
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 = " \
ti/k3-am642-evm.dtb \
"
# AM64 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"
TFA_BOARD = "lite"
OPTEEMACHINE = "k3-am65x"
OPTEEOUTPUTMACHINE = "k3"
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "am64x"
TI_PDK_LIMIT_BOARDS = "am64x_evm"
TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1"

View File

@@ -23,6 +23,8 @@ KERNEL_DEVICETREE = " \
BBMULTICONFIG += "k3r5-sr2"
# 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"

View File

@@ -1,9 +1,11 @@
require conf/machine/include/k3.inc
SOC_FAMILY_append = ":j7"
OPTEEMACHINE = "k3-j7"
OPTEEMACHINE = "k3-j721e"
OPTEEOUTPUTMACHINE = "k3"
# Use default IMAGE_BOOT_FILES_LEGACY files
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "j721e j7200"
TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm"

View File

@@ -38,9 +38,13 @@ 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"
IMAGE_FSTYPES += "tar.xz wic.xz"
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_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
WKS_FILE ?= "sdimage-2part.wks"
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"

View File

@@ -51,7 +51,7 @@ UBOOT_SUFFIX = "img"
# and u-boot.
UBI_VOLNAME = "rootfs"
EXTRA_IMAGEDEPENDS += "u-boot"
EXTRA_IMAGEDEPENDS += "virtual/bootloader"
# List common SoC features, may need to add touchscreen for specific machines
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
@@ -63,4 +63,4 @@ TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x"
IMAGE_FSTYPES += "tar.xz wic.xz"
WKS_FILE ?= "sdimage-2part.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
do_image_wic[depends] += "u-boot:do_deploy"
do_image_wic[depends] += "virtual/bootloader:do_deploy"

View File

@@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm"
SYSFW_SUFFIX = "gp"
UBOOT_MACHINE = "j7200_evm_r5_defconfig"
UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"

View File

@@ -14,10 +14,8 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j7200_evm_a72_config"
IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
do_image_wic[depends] += "trusted-firmware-a:do_deploy"
do_image_tar[depends] += "trusted-firmware-a:do_deploy"
# 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"

View File

@@ -1,13 +1,13 @@
DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
LICENSE = "MIT | GPLv2"
LIC_FILES_CHKSUM = "file://README;beginline=15;endline=20;md5=0403c7dea01a2b8232261e805325fac2"
LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
inherit module features_check
REQUIRED_MACHINE_FEATURES = "gpu"
MACHINE_KERNEL_PR_append = "g"
MACHINE_KERNEL_PR_append = "a"
PR = "${MACHINE_KERNEL_PR}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -17,13 +17,13 @@ DEPENDS = "virtual/kernel"
PROVIDES = "virtual/gpudriver"
BRANCH = "linuxws/zeus/k5.4/${PV}"
BRANCH = "1.13-5776728/linux-k5.4"
SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH}"
S = "${WORKDIR}/git"
SRCREV = "f58bea1084c5004f129943a53b94ee1446e9c3a7"
SRCREV = "ea77784e89f919bd3343a421862bf90cb65cc26c"
PVR_SOC = "j721e_linux"
PVR_BVNC = "22.104.208.318"

View File

@@ -3,7 +3,7 @@ SUMMARY = "PRU Ethernet firmware for AM65xx SR2.0"
LICENSE = "TI-TFL"
LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
PV = "02.02.07.02"
PV = "02.02.08.02"
CLEANBROKEN = "1"
@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "am65xx-evm"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "c911bcec682ef053a15f9c7d5867a0dd2da2632b"
SRCREV = "31e626d84a3f8a5dc7175b79440972ce90a23de0"
BRANCH ?= "ti-linux-firmware"
SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

View File

@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "b19bf13a16d7f5c1260cf4d48cf967e5c7e15128"
SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
BRANCH ?= "ti-linux-firmware"
SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

View File

@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "48e2c46ff62d796345b6587be58f88f0e608addc"
SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
BRANCH ?= "ti-linux-firmware"
SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

View File

@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "48e2c46ff62d796345b6587be58f88f0e608addc"
SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
BRANCH ?= "ti-linux-firmware"
SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

View File

@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "f95d048c0a007a5acac706edea4a3ffbfa8ca933"
SRCREV = "0038ff0ecda8dae83c65d454c85776c6a4ef8e63"
BRANCH ?= "ti-linux-firmware"
SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"

View File

@@ -3,11 +3,11 @@ SUMMARY = "TI SCI firmware (SYSFW)"
LICENSE = "TI-TFL"
LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
PV = "2020.08b"
PV = "2021.01a"
SRCREV = "c26c279257c13a0ff5002b09113fcff0e1d18853"
SRCREV = "306e8b92bcce0fe88b494732c0a614079f8ff73a"
BRANCH ?= "ti-linux-firmware"
SRCREV_imggen = "7b4fe13d642d69a559724349aede4817891008a7"
SRCREV_imggen = "c376cd495b9821b6e3cb296b1bbae10d0f010817"
SRCREV_FORMAT = "imggen"
SRC_URI = " \

View File

@@ -2,6 +2,8 @@ require recipes-bsp/ti-sci-fw/ti-sci-fw.inc
DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader"
DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader"
DEPENDS_append_am64xx-sk-k3r5 = " virtual/bootloader"
CLEANBROKEN = "1"
PR = "r1"
@@ -22,7 +24,6 @@ SYSFW_PREFIX = "ti-sci-firmware"
SYSFW_PREFIX_j7-evm-k3r5 = "ti-fs-firmware"
SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware"
SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware"
SYSFW_PREFIX_7200-hs-evm-k3r5 = "ti-fs-firmware"
SYSFW_SUFFIX ?= "unknown"
@@ -52,6 +53,8 @@ EXTRA_OEMAKE_HS = " \
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_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
EXTRA_OEMAKE_append_am64xx-sk-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
do_compile() {
cd ${WORKDIR}/imggen/
@@ -96,6 +99,37 @@ do_deploy_j7200-evm-k3r5() {
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-sk-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-sk-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}/
}
addtask deploy before do_build after do_compile

View File

@@ -1,6 +1,8 @@
PV_k3 = "2.4"
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 = "52c334fc361194e3896ea3b2529c10a06e586a5f"
SRCREV_tfa_k3 = "65dd16b4ea5032752af62e94ca64cff41733a123"
COMPATIBLE_MACHINE_k3 = "k3"
TFA_BUILD_TARGET_k3 = "all"
TFA_INSTALL_TARGET_k3 = "bl31"

View File

@@ -1,7 +1,7 @@
require u-boot-ti.inc
PR = "r22"
PR = "r36"
BRANCH = "ti-u-boot-2020.01"
SRCREV = "3c9ebdb87d65aacc4ec302be8bef3df15364bacd"
SRCREV = "2781231a33c3d779e32445f4fe55164c45d6d7c1"

View File

@@ -0,0 +1,12 @@
require u-boot-ti.inc
#Temporarily add this as the checksum has changed in 2021
LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
PR = "r1"
BRANCH = "ti-u-boot-2021.01"
SRCREV = "c4fddedc48f336eabc4ce3f74940e6aa372de18c"
DEFAULT_PREFERENCE = "-1"

View File

@@ -65,6 +65,8 @@ SPL_UART_BINARY_keystone = ""
SPL_UART_BINARY_k3r5 = ""
SPL_UART_BINARY_lego-ev3 = ""
SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin"
SPL_UART_BINARY_am64xx-sk-k3r5 = "u-boot-spl.bin"
SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}"
SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
@@ -395,4 +397,14 @@ do_deploy_append_j7200-evm-k3r5 () {
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
}
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_am64xx-sk-k3r5 () {
mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
}
TOOLCHAIN = "gcc"

View File

@@ -7,8 +7,7 @@ SRC_URI = " \
file://0001-Add-Makefile-to-install-firmware-files.patch \
"
# Tag: R8.7-SP3 (8.7.3)
SRCREV = "f659be25473e4bde8dc790bff703ecacde6e21da"
SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71"
BRANCH = "master"
S = "${WORKDIR}/git"

View File

@@ -3,12 +3,12 @@ SUMMARY = "Diagnostic tool for TI K3 processors"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://common/k3conf.c;beginline=1;endline=34;md5=7154c0ffcd418064ffa528e34e70ca9d"
PV = "0.1+git${SRCPV}"
PV = "0.2+git${SRCPV}"
COMPATIBLE_MACHINE = "k3"
BRANCH ?= "master"
SRCREV = "1ff0c4f429e8e33d22b52ec002d9b97bbca6bf0b"
SRCREV = "79f007cd462384ce22e750e9002b714878f56892"
SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"

View File

@@ -10,13 +10,13 @@ REQUIRED_MACHINE_FEATURES = "gpu"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "j7"
PR = "r9"
PR = "r2"
BRANCH = "linuxws/zeus/k5.4/${PV}"
BRANCH = "linuxws/dunfell/k5.4/${PV}"
SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
SRCREV = "8d3d1891186ed3f397bb90f4f8c518c6c9970479"
SRCREV = "5ef38353c38d921a65ea6df75c7b6ce710b66034"
PVR_SOC ?= "j721e_linux"
PVR_BUILD ?= "release"

View File

@@ -9,15 +9,18 @@ DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh"
require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/kernel-rdepends.inc
DEPENDS += "gmp-native"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
S = "${WORKDIR}/git"
BRANCH = "master"
TOOLS_BRANCH = "master"
# 5.9 Mainline version
SRCREV = "bbf5c979011a099af5dc76498918ed7df445635b"
PV = "5.9+git${SRCPV}"
# 5.11 Mainline version
SRCREV = "f40ddce88593482919761f74910f42f4b84c004b"
PV = "5.11+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR_append = "a"
@@ -27,11 +30,11 @@ KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.g
KERNEL_GIT_PROTOCOL = "git"
SRC_URI += " \
${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \
git://git.ti.com/ti-linux-kernel/ti-upstream-tools.git;protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \
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 \
"
SRCREV_ti-upstream-tools = "3f36f66594d7905f7b97bc7870931173fd2466bd"
SRCREV_ti-upstream-tools = "d59b7471d99b806e3dc22342c8f42d5bb33f8cce"
SRCREV_FORMAT = "linux"
KERNEL_DEVICETREE = ""

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_omap2_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_dra7x_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_k2g_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_arm64_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_keystone_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_omapl138_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_am3x_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_am4x_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_omap2_rt_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_dra7x_rt_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_k2g_rt_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_arm64_rt_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_keystone_rt_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_am3x_rt_release

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_am4x_rt_release

View File

@@ -0,0 +1,10 @@
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 = "5990047eb007737030748d449dc37275b317117b"
PV = "5.10.4+git${SRCPV}"

View File

@@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
BRANCH = "ti-rt-linux-5.4.y"
SRCREV = "9002faf1c069e1b0d435199a80a89268e69aeecf"
PV = "5.4.74+git${SRCPV}"
SRCREV = "519667b0d81d74a6e55105dcd6072ae550352599"
PV = "5.4.106+git${SRCPV}"

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_omap2_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_dra7x_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_k2g_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_arm64_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_keystone_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_omapl138_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_am3x_debug

View File

@@ -0,0 +1 @@
use-tisdk-config=ti_sdk_am4x_debug

View File

@@ -0,0 +1,5 @@
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:"

View File

@@ -0,0 +1,45 @@
SECTION = "kernel"
SUMMARY = "Linux kernel for TI devices"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
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.10:"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
S = "${WORKDIR}/git"
BRANCH = "ti-linux-5.10.y"
SRCREV = "44fb363f878fa80d5b502291954bb83d9cae842b"
PV = "5.10+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"
DEFAULT_PREFERENCE = "-1"

View File

@@ -21,8 +21,8 @@ S = "${WORKDIR}/git"
BRANCH = "ti-linux-5.4.y"
SRCREV = "9574bba32a1898794895ca3816e815154c80226d"
PV = "5.4.74+git${SRCPV}"
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"

View File

@@ -0,0 +1,62 @@
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
From 36e784f621bf5d5be9183beba35f39426277c110 Mon Sep 17 00:00:00 2001
From: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Date: Tue, 13 Oct 2020 22:45:39 +0300
Subject: [PATCH 1/3] libutils: provide empty __getauxval() implementation
Never version of libgcc are built with LSE implementation in mind. To
determine if LSE is available on platform it calls __getauxval(), so in
some cases we can get undefined reference to __getauxval() error.
Prominent case is libgcc_eh.a library, which is used by C++ TAs. Exception
handler depends on atomic operations, so it tries to call
init_have_lse_atomics() first. This function in turn calls __getauxval(),
which causes linking error.
In the future we can make __getauxval() to return actual platform
capabilities.
Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
---
lib/libutils/ext/arch/arm/auxval.c | 12 ++++++++++++
lib/libutils/ext/arch/arm/sub.mk | 1 +
2 files changed, 13 insertions(+)
create mode 100644 lib/libutils/ext/arch/arm/auxval.c
diff --git a/lib/libutils/ext/arch/arm/auxval.c b/lib/libutils/ext/arch/arm/auxval.c
new file mode 100644
index 00000000..98bca850
--- /dev/null
+++ b/lib/libutils/ext/arch/arm/auxval.c
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-2-Clause
+/*
+ * Copyright (c) 2020, EPAM Systems
+ */
+
+#include <compiler.h>
+
+unsigned long int __getauxval (unsigned long int type);
+unsigned long int __getauxval (unsigned long int type __unused)
+{
+ return 0;
+}
diff --git a/lib/libutils/ext/arch/arm/sub.mk b/lib/libutils/ext/arch/arm/sub.mk
index dc5eed67..2e779066 100644
--- a/lib/libutils/ext/arch/arm/sub.mk
+++ b/lib/libutils/ext/arch/arm/sub.mk
@@ -3,6 +3,7 @@ srcs-$(CFG_ARM32_$(sm)) += aeabi_unwind.c
endif
srcs-$(CFG_ARM32_$(sm)) += atomic_a32.S
srcs-$(CFG_ARM64_$(sm)) += atomic_a64.S
+srcs-y += auxval.c
ifneq ($(sm),ldelf) # TA, core
srcs-$(CFG_ARM32_$(sm)) += mcount_a32.S
srcs-$(CFG_ARM64_$(sm)) += mcount_a64.S
--
2.25.1

View File

@@ -0,0 +1,55 @@
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
From 73196b58ea6978ffa5e581738030f51c5789ef73 Mon Sep 17 00:00:00 2001
From: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Date: Tue, 13 Oct 2020 22:54:13 +0300
Subject: [PATCH 2/3] link.mk: implement support for libnames-after-libgcc
variable
Newer versions of libgcc depend on external __getauxval() symbol, which is
now provided by libutils. But libgcc is linked after libutils, so linker
can't resolve that symbol. We can't include libgcc into linking group with
libtutils, because libgcc provides symbols that conflict with libutil's
ones, like __aeabi_idiv with friends for instance.
So, to resolve libgcc dependency on libutils we need to link with libutils
second time. To make things more generic, we will introduce
$(libnames-after-libgcc) variable for libraries that should be linked after
libgcc.
Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
---
ta/arch/arm/link.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ta/arch/arm/link.mk b/ta/arch/arm/link.mk
index 445c285d..3025acb1 100644
--- a/ta/arch/arm/link.mk
+++ b/ta/arch/arm/link.mk
@@ -55,8 +55,11 @@ link-ldflags += --eh-frame-hdr
link-ldadd += $(libstdc++$(sm)) $(libgcc_eh$(sm))
endif
link-ldadd += --end-group
-ldargs-$(user-ta-uuid).elf := $(link-ldflags) $(objs) $(link-ldadd) $(libgcc$(sm))
+link-ldadd-after-libgcc += $(addprefix -l,$(libnames-after-libgcc))
+
+ldargs-$(user-ta-uuid).elf := $(link-ldflags) $(objs) $(link-ldadd) \
+ $(libgcc$(sm)) $(link-ldadd-after-libgcc)
link-script-cppflags-$(sm) := \
$(filter-out $(CPPFLAGS_REMOVE) $(cppflags-remove), \
@@ -76,6 +79,7 @@ $(link-script-pp$(sm)): $(link-script$(sm)) $(conf-file) $(link-script-pp-makefi
$(link-script-cppflags-$(sm)) $$< -o $$@
$(link-out-dir$(sm))/$(user-ta-uuid).elf: $(objs) $(libdeps) \
+ $(libdeps-after-libgcc) \
$(link-script-pp$(sm)) \
$(dynlistdep) \
$(additional-link-deps)
--
2.25.1

View File

@@ -0,0 +1,44 @@
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
From f50962e3f56f0932662b2ffa10afe53339a335dd Mon Sep 17 00:00:00 2001
From: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Date: Fri, 16 Oct 2020 16:36:08 +0300
Subject: [PATCH 3/3] ta_dev_kit.mk: make sure that libutils is linked second
time
libgcc depends on __getauxval symbol from libuils. As, generally libutils
is linked before libgcc, we will get "unresolved symbol" error. To resolve
this dependency we need to link libutils second time - after libgcc.
Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome@forissier.org>
---
ta/mk/ta_dev_kit.mk | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk
index e28be677..d0e66317 100644
--- a/ta/mk/ta_dev_kit.mk
+++ b/ta/mk/ta_dev_kit.mk
@@ -78,6 +78,16 @@ endif
libnames += dl
libdeps += $(ta-dev-kit-dir$(sm))/lib/libdl.a
+# libutils provides __getauxval symbol which is needed by libgcc 10.x. We can't
+# link libutils after libgcc, because libgcc will replace some symbols provided
+# by libutils, which will cause further linking issues.
+#
+# But if we place libutils before libgcc, linker will not be able to resolve
+# __getauxval. So we need to link with libutils twice: before and after libgcc.
+# Hence it included both in $(libnames) and in $(libnames-after-libgcc)
+libnames-after-libgcc += utils
+libdeps-after-libgcc += $(ta-dev-kit-dir$(sm))/lib/libutils.a
+
# Pass config variable (CFG_) from conf.mk on the command line
cppflags$(sm) += $(strip \
$(foreach var, $(filter CFG_%,$(.VARIABLES)), \
--
2.25.1

View File

@@ -0,0 +1,34 @@
From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Tue, 26 May 2020 14:38:02 -0500
Subject: [PATCH] allow setting sysroot for libgcc lookup
Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching
for the compiler libraries as there's no easy way to reliably pass --sysroot
otherwise.
Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
mk/gcc.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mk/gcc.mk b/mk/gcc.mk
index adc77a24..81bfa78a 100644
--- a/mk/gcc.mk
+++ b/mk/gcc.mk
@@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \
-print-file-name=include 2> /dev/null)
# Get location of libgcc from gcc
-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
-print-libgcc-file-name 2> /dev/null)
-libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
+libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-print-file-name=libstdc++.a 2> /dev/null)
-libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
+libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-print-file-name=libgcc_eh.a 2> /dev/null)
# Define these to something to discover accidental use

View File

@@ -0,0 +1,29 @@
From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
From: Brett Warren <brett.warren@arm.com>
Date: Wed, 23 Sep 2020 09:27:34 +0100
Subject: [PATCH] optee: enable clang support
When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
to provide a sysroot wasn't included, which results in not locating
compiler-rt. This is mitigated by including the variable as ammended.
Upstream-Status: Pending
ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
Signed-off-by: Brett Warren <brett.warren@arm.com>
---
mk/clang.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mk/clang.mk b/mk/clang.mk
index 0f48c836..47465523 100644
--- a/mk/clang.mk
+++ b/mk/clang.mk
@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
# Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
# libgcc for clang
-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
-rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
# Core ASLR relies on the executable being ready to run from its preferred load

View File

@@ -1,3 +1,18 @@
FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:"
PV_ti-soc = "3.11.0+git${SRCPV}"
SRCREV_ti-soc = "c4def2a8262a03244d9a88461699b9b8e43c6b55"
SRC_URI_ti-soc = " \
git://github.com/OP-TEE/optee_os.git \
file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
file://0007-allow-setting-sysroot-for-clang.patch \
file://0001-libutils-provide-empty-__getauxval-implementation.patch \
file://0002-link.mk-implement-support-for-libnames-after-libgcc-.patch \
file://0003-ta_dev_kit.mk-make-sure-that-libutils-is-linked-seco.patch \
"
do_compile_prepend_ti-soc() {
export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
}

View File

@@ -7,10 +7,10 @@ PROTOCOL = "git"
BRANCH = "master"
SRC_URI = "git://git.ti.com/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"
# Initial 0.2.0 release
SRCREV = "ecee54d2bd5125d4e78028013433b568a2b72d07"
# Initial 0.3.0 release
SRCREV = "0e76d13d08f0df5c7e70d58bbf76f7e299906ae1"
PV = "0.2.0+git${SRCPV}"
PV = "0.3.0+git${SRCPV}"
S = "${WORKDIR}/git"

View File

@@ -11,33 +11,47 @@ INHIBIT_DEFAULT_DEPS = "1"
inherit deploy
DEFAULT_METADATA_FILE ?= "metadata.inc"
DEFAULT_METADATA_FILE_am64xx ?= "mcusdk_metadata.inc"
# First, let's try including metadata.inc that could be fetched and deployed
# by ti-rtos-metadata earlier and provide new set of CORESDK_RTOS_* variables
include ${DEPLOY_DIR_IMAGE}/metadata.inc
include ${DEPLOY_DIR_IMAGE}/${DEFAULT_METADATA_FILE}
# Set some defaults for when metadata.inc is not available
DEFAULT_RTOS_FAMILY = "jacinto"
DEFAULT_RTOS_VERSION = "07_01_00_38"
DEFAULT_RTOS_VERSION_DOT = "07.01.00.38"
DEFAULT_RTOS_VERSION = "07_03_00_29"
DEFAULT_RTOS_VERSION_DOT = "07.03.00.29"
DEFAULT_RTOS_VERSION_am64xx = "07_03_00_19"
DEFAULT_RTOS_VERSION_DOT_am64xx = "07.03.00.19"
DEFAULT_RTOS_VERSION_am65xx = "07_03_00_22"
DEFAULT_RTOS_VERSION_DOT_am65xx = "07.03.00.22"
DEFAULT_RTOS_SOC = "undefined"
DEFAULT_RTOS_SOC_j7 = "j721e"
DEFAULT_RTOS_SOC_j7200-evm = "j7200"
DEFAULT_RTOS_SOC_am65xx = "am65xx"
DEFAULT_RTOS_SOC_am64xx = "am64x"
DEFAULT_RTOS_WEBLINK = "undefined"
DEFAULT_RTOS_WEBLINK_j7 = "https://software-dl.ti.com/jacinto7/esd/processor-sdk-rtos-jacinto7/firmware/${CORESDK_RTOS_VERSION}"
DEFAULT_RTOS_WEBLINK_j7200-evm = "https://software-dl.ti.com/jacinto7/esd/processor-sdk-rtos-j7200/firmware/${CORESDK_RTOS_VERSION}"
DEFAULT_RTOS_WEBLINK_am65xx = "https://software-dl.ti.com/processor-sdk-rtos/esd/AM65X/firmware/${CORESDK_RTOS_VERSION}"
DEFAULT_RTOS_WEBLINK_am64xx = "https://software-dl.ti.com/processor-sdk-rtos/esd/AM64X/firmware/${CORESDK_RTOS_VERSION}"
DEFAULT_FIRMWARE_FILE = "coresdk_rtos_${CORESDK_RTOS_SOC}_${CORESDK_RTOS_VERSION}_firmware.tar.xz"
DEFAULT_FIRMWARE_FILE_am64xx = "mcu_plus_sdk_${CORESDK_RTOS_SOC}_${CORESDK_RTOS_VERSION}_firmware.tar.xz"
DEFAULT_FIRMWARE_URL = "file://empty"
DEFAULT_FIRMWARE_URL_k3 = "${CORESDK_RTOS_WEBLINK}/${DEFAULT_FIRMWARE_FILE}"
DEFAULT_FIRMWARE_SHA256SUM = "unknown"
DEFAULT_FIRMWARE_SHA256SUM_j7 = "93e4d3742a922015f3295f5c20ef4bc2b9751139ffcd5620b8df7047bff50651"
DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "cd5071a8f6ddaec05346e4c2bbeed6dc7bcb376d6edc47f81b9aeaf38f151176"
DEFAULT_FIRMWARE_SHA256SUM_am65xx = "e54cc8da7fefa1ebf55454b184b42c364de3eebb34a328d244b8275b7763eb58"
DEFAULT_FIRMWARE_SHA256SUM_j7 = "1e306065d7273c4ac6f803d5b404ba5ff0ddd55a1afa2911944fe5e696629193"
DEFAULT_FIRMWARE_SHA256SUM_j7200-evm = "28fa4f5c57459ea0adc44e8c83b814a4adcfb887bee69769c5656adf628586b2"
DEFAULT_FIRMWARE_SHA256SUM_am65xx = "61e0be08bea8ab1055645bd96504a6a29c70318c5b277237dee9981cd94d7f79"
DEFAULT_FIRMWARE_SHA256SUM_am64xx = "5d1785cbdb91904a5ef3027378061041c59186c4198d7ebcfa660a1ff513d528"
# Use weak assignment for CORESDK_RTOS_* variables to use defaults if not yet set
CORESDK_RTOS_FAMILY ?= "${DEFAULT_RTOS_FAMILY}"
@@ -58,8 +72,22 @@ PV = "${CORESDK_RTOS_VERSION_DOT}"
SRC_URI = "${CORESDK_RTOS_FIRMWARE_URL}${CORESDK_RTOS_FILE_SUFFIX}"
SRC_URI[sha256sum] = "${CORESDK_RTOS_FIRMWARE_SHA256SUM}"
DEPENDS += "openssl-native"
FILES_${PN} += "${base_libdir}"
TI_SECURE_DEV_PKG ?= ""
DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
do_install_prepend_j7-hs-evm() {
export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
( cd ${S}/firmware/pdk-ipc/; \
mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
)
}
do_install() {
CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
install -d ${D}${base_libdir}

View File

@@ -13,14 +13,16 @@ PLAT_SFX = ""
PLAT_SFX_j7 = "/j721e"
PLAT_SFX_j7200-evm = "/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_SRCREV ?= "6b63577eec787cde277d3d12b23ea80578b6ad91"
TI_RTOS_METADATA_SRCREV ?= "2ecbf45af64bc47806623cc5bf7ab493489acaf9"
TI_RTOS_METADATA_BRANCH ?= "master"
TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}"
TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc"
TI_RTOS_METADATA_FILE_am64xx ?= "${S}${TI_RTOS_METADATA_DIR}/mcusdk_metadata.inc"
PV = "1.0.0+git${SRCPV}"