1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-09 04:13:52 +00:00
Commit Graph

454 Commits

Author SHA1 Message Date
Andrew Davis e625b874b1 conf: machine: am64xx: Move multi-config targets into base SoC include
The supported device types depends on the SoC, not on any specific
board or EVM. Any board can be populated with any of the 3 supported
AM64x types. Move these into the AM64x common include.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-09-08 07:35:17 -05:00
Andrew Davis 0dcd351432 conf: machine: am64xx-evm: Switch to SR2.0 HS-FS build by default
AM64x devices will only be available as SR2.0 HS-FS. Set this as the
default type provided by the SDK. To allow SR2.0 HS-SE to continue to
boot, like we did with GP, we add an extra machine to build SR2.0 HS-SE
SYSFW. To use on SR2.0 HS-SE boards simply switch out the SYSFW image:

$ cd /mnt/sd-card/boot
$ mv tiboot3-am64x_sr2-hs-evm.bin tiboot3.bin

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-09-08 07:35:17 -05:00
Anand Gadiyar 0c7a7de23b machine: add am62xx-lp-evm configuration
This platform is similar to the currently supported am62xx-evm, except
that we currently need new defconfigs for u-boot and new dtbs in the
filesystem.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Hari Nagalla <hnagalla@ti.com>
Cc: Andrew Davis <afd@ti.com>
Cc: Praneeth Bajjuri <praneeth@ti.com>
Cc: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-29 12:15:03 -05:00
Andrew Davis f59278042b conf: machine: am64xx-evm: Update default HS names
In the latest U-Boot the HS images for AM64x have been renamed to the
default names, and the GP have been changed to *_unsigned. Remove
the overrides to pull the now default HS images.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-28 17:37:36 -05:00
Andrew Davis dbc88f2d65 conf: machine: am64xx-evm: Make HS-SE the default
The HS-SE AM64xx machine can now be run on GP devices and built without
needing the TI_SECURE_DEV_PKG for the same. AM64xx will only be available
in the HS-FS type going forward. Make the HS-SE the default and remove
the original GP machine.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-26 14:33:15 -05:00
Andrew Davis e6deeba806 conf: machine: k3: Add fitImage to the default kernel image types
FIT Image based kernels are valid for all K3 devices, not just HS, deploy
this kernel image type by default so it doesn't have to be appended on
a per-device-type basis.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-08 20:07:47 -05:00
Andrew Davis d4bfd5ec91 conf: machine: am64xx-hs-evm: Add extra machine to build GP SYSFW
Use multiconfig to generate a GP SYSFW image. This allows the HS SDK
to be used on GP boards by simply switching out the SYSFW image:

$ cd /mnt/sd-card/boot
$ mv tiboot3-am64x-gp-evm.bin tiboot3.bin

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-06 19:07:44 -05:00
Andrew Davis 9917cb4abf u-boot-ti-staging: Update to the latest ti-u-boot-2021.01
Update to the latest commit of ti-u-boot-2021.01.

As part of this U-Boot update the non-HS AM64x-evm defconfig was removed.
This is okay as building this defconfig without defining TI_SECURE_DEV_PKG
will still result in usable binaries for the non-HS devices. Use the
HS defconfig for both the HS and non-HS machines.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-06 19:07:08 -05:00
Andrew Davis b572721c6d conf: machine: Move K3 TI_SECURE_DEV_PKG definition to common include
The K3 TI_SECURE_DEV_PKG is the same for all devices, move this out
of each machine file and into the common K3 includes. This doesn't
have any effect on the GP machines as they make no use of it.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-06 19:04:37 -05:00
Andrew Davis 142be8971f ti-sci-fw: Make combined R5 boot the default
Going forward, the combined tiboot3.bin is going to be the standard. Only
AM65x and J721e will still use the split boot.

Set DEPENDS and EXTRA_OEMAKE for combined boot and override only for the
two split boot platforms. This makes it easier to add new platforms and
simplifies deployment logic.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-06 19:04:37 -05:00
Andrew Davis 50c39940b6 machine: k3r5: Make combined R5 boot the default
Going forward, the combined tiboot3.bin is going to be the standard. Only
AM65x and J721e will still use the split boot. Set the output of U-Boot
to be u-boot-spl.bin by default and override only for the two split boot
platforms. This makes it easier to add new platforms and simplifies
deployment logic.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-06 19:04:37 -05:00
Andrew Davis 038148a6d0 conf: machine: Make multi-certificate image the default
Only the first two K3 devices do not support multi-cert boot so
lets make multi-cert the default and only add back sysfw.itb
for these two devices.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: lines be preserved?
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-08-05 08:29:17 -05:00
Jonathan Humphreys a45a3d5786 j7200-hs-evm-k3r5: Move J7200 HS evm support to PG2.0
With J7200 PG1.0 being deprecated, use PG2.0 sysfw when building images for j7200-hs-evm.
Also update k3-image-gen version to support this change.

Signed-off-by: Jonathan Humphreys <j-humphreys@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-07-25 14:57:41 -05:00
Denys Dmytriyenko ca89c6ec0f j7-hs-evm-k3r5: do not create generic sysfw.itb symlink
Commit bdceaa05ac added SR1.1 support for
J721e HS with the idea that the default sysfw.itb will point to SR1.1.
For that to work, the config for SR1 has to explicitly disable creating
such symlink.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-07-20 14:58:34 -05:00
Drew Fustini 00b859dbf7 conf: am43: avoid missing dtb files when ARAGO_BRAND=mainline
For ARAGO_BRAND=mainline with the am43xx machines, avoid the inclusion
of device tree files that do not exist upstream.

Signed-off-by: Drew Fustini <dfustini@baylibre.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-07-12 11:42:17 -05:00
Drew Fustini 4b490a2e89 conf: dra7xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline
For ARAGO_BRAND=mainline with the dra7xx-evm MACHINE, avoid the
inclusion of device tree files that do not exist upstream.

Signed-off-by: Drew Fustini <dfustini@baylibre.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-07-12 11:42:17 -05:00
Drew Fustini 460c3f0fbd conf: am57xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline
For ARAGO_BRAND=mainline with the am57xx-evm MACHINE, avoid the
inclusion of device tree files that do not exist upstream.

Signed-off-by: Drew Fustini <dfustini@baylibre.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-07-12 11:42:17 -05:00
Ryan Eatmon 3621d7392d conf: machine: j721s2: add new dtb for GESI
The following commits in ti-linux-5.10.y kernel has introduced a new dtb.

commit: 9b05b2a89ff ("arm64: dts: ti: Add overlay for GESI to enable main CPSW2G in J721S2")

This patch on j721s2 conf is to include the new dtb.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-07-06 11:16:22 -05:00
Ryan Eatmon 0c27a2802f conf: machine: wic: Fix j721s2-hs-evm image boot partition
This patch is to align with a recent change to how the HS platforms
are setup in the /boot partition.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-06-23 12:57:24 -05:00
Manorit Chawdhry 5e1204d728 conf: machine: wic: Fix HS image boot partition
IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to
incomplete binaries in /boot and the naming of the binaries were not
correct.

Fixes /boot partition for HS devices.

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@ti.com>
Acked-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-06-23 09:22:05 -05:00
Andrew Davis f8182afdcf optee: Upgrade to upstream 3.17.0
Update to the latest upstream master which is 3.17.
We do this to add HUK and AM64x/AM62x support.
With this we need to also switch OPTEEMACHINE for AM64x/AM62x.

To build against the latest OP-TEE the support recipes need updated also.
Move these here into meta-ti so that builds will still work when not using
meta-arago-distro.

The fix patches do not look to be needed anymore.

While here switch to git checkout with https.

NOTE: The latest OP-TEE requires SYSFW 8.04+

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-06-20 12:32:57 -05:00
Jayesh Choudhary b20073dcb2 conf: machine: Add j721s2 hs platform
Machine conf for J721S2 HS platform.
Used j7200 hs as reference.

Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-06-15 13:47:15 -05:00
Andrew Davis 1f68751baa conf: machine: am64xx: Add missing dtbo
Add missing k3-am642-evm-icssg1-dualemac-mii.dtbo.

Reported-by: Judith Mendez <jm@ti.com>
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-06-13 15:19:14 -05:00
Praneeth Bajjuri c451221ad8 conf: machine: am62xx: add new dtb for low-power
The following commits in ti-linux-5.10.y kernel has introduced new dtbs.
a minimal skeleton and a lpm (low-power-mode) demo dtb.

commit c161df7b1ea0 ("arm64: dts: ti: Introduce k3-am625-sk-lpmdemo")
commit 61df7fcf9307 ("arm64: dts: ti: introduce minimal dt for am625")

This patch on am62xx conf is to include the new dtbs.

Reported-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-05-18 09:31:41 -05:00
Ryan Eatmon 414d4d0b1b conf: machine: am62xx Fix overlay extension
The file extension for the overlay needs to be .dtbo.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-05-13 11:48:54 -05:00
Nishanth Menon 53a8a8a82c conf/machine: am62xx: Update build flag for low power mode
Update build flag for arm-trusted-firmware to include low power mode
support

K3_PM_SYSTEM_SUSPEND is added in arm-trusted-firmware now which enables
low power mode support for am62xx.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-05-04 20:27:06 -05:00
Ryan Eatmon a45acda50e conf: machine: am62xx Add missing dtbo file
Add missing k3-am625-sk-csi2-ov5640.dtb required for the camera overlay.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
2022-04-25 09:05:53 -05:00
Etheridge, Darren ed94c75b43 ti-graphics: gpu enable and move all platforms to ddk 1.15
Enable the GPU for am62xx and j721s2 and use IMG DDK 1.15

Migrate Imagination DDK 1.13 to DDK 1.15 for J721e

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-04-07 07:48:39 -05:00
Nishanth Menon 1ab91bcc15 machine: Add am62xx evm configuration
Lets add the basic AM62xx-evm configuration.
- Add configurations.
- Add firmware overrides.
- Add u-boot overrides.
- Update TI_LINUX_FW_SRCREV and K3_IMAGE_GEN_SRCREV to appropriate SHAs.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Hari Nagalla <hnagalla@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-04-07 07:48:39 -05:00
Jonathan Humphreys ad38c8d1af conf: Enable bmap file for wic images on legacy platforms
To allow a consistent experience across current devices, enable wic.bmap file
generation for AM3/4/5 images.

Signed-off-by: Jonathan Humphreys <j-humphreys@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-02-18 09:42:25 -06:00
Kevin Hilman 796e471e7b conf/machine/am57xx-evm: add overlay for OV10635 sensor
The VIP camera capture driver recently ported to ti-linux-5.10.y adds
a DT overlay for the OV10635 camera sensor.  Add this to
KERNEL_DEVICTREE so it's added to the artifacts.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-02-10 19:52:05 -06:00
Nishanth Menon 92b3664eba machine: Add j721s2 evm configuration
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2022-01-24 09:10:35 -06:00
Amjad Ouled-Ameur 80b79863c3 conf: am437xx-evm: re-introduce required DTBs for HDMI support
commit ba0ddc5ae9 ("conf: am437xx-evm: Remove non-existent dtb* from
5.10") removed all non-existent dtb* for am437xx-evm as they were not
available on linux 5.10 branch at that time.

This patch reintroduces following HDMI DTBs.
- am437x-gp-evm-hdmi.dtb
- am43x-epos-evm-hdmi.dtb

The required dts have been added to the 5.10LTS by these two following
commits:
- https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/arch/arm/
boot/dts/am437x-gp-evm-hdmi.dts?h=ti-linux-5.10.y&id=25434078d3f93d1346af5
e52e0f150f9083321d8
- https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/arch/arm/
boot/dts/am43x-epos-evm-hdmi.dts?h=ti-linux-5.10.y&id=c5114144b568e470a8f6
e613f7c6e8b88ad19d7e

Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2021-12-16 08:23:47 -06:00
Yogesh Siraswar 89cb44409d conf: j7200-hs: fix the wrong machine configuration included
j7-evm instead of j7200-evm was included causing boot failure

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-12-10 03:14:28 +00:00
Yogesh Siraswar f9779e93f1 j7-hs-evm: Correct image boot file causing build error
Correct the boot image file that is causing build error

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-11-19 18:21:12 +00:00
Yogesh Siraswar 1eb6e71fe0 wic: revert grub-efi patch
Revert "conf/machine: k3: Enable grub-efi by default in wic images"

This reverts commit d0b09833b4.
2021-11-19 02:27:48 +00:00
Yogesh Siraswar f438a091c3 j721e-sr1_1: Add j721e sr1.1 HS support
This patch adds support for J721e HS SR1.1
HS SR1.1 requires updated sysfw binary. Both SR1.0 and SR1.1 sysfw
binary will be generated. sysfw.itb will point to SR1.1

This patch requires J7 SR 1.1 support in K3 Image gen.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
2021-11-19 00:07:45 +00:00
Yogesh Siraswar 926e364877 conf: machine: Add j7200 hs platform
Machine conf for J7200 HS platform.
Used am64xx hs and j721e hs as reference.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-11-16 11:14:52 +00:00
Yogesh Siraswar 33d5f0bb7d conf: machine : am65xx: Add missing dtbo
Added missing dtbo k3-am654-evm-ov5640.dtbo required for system test

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-11-15 21:11:49 +00:00
Yogesh Siraswar 4cde8b6cae conf: machine: am64xx: Add missing dtbo
Add missing k3-am642-evm-nand.dtbo required for system test

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-11-15 21:11:49 +00:00
Yogesh Siraswar 7ba78e1b89 conf: machine: add new am64x hs platform
Add new am64x hs platform. This requires two files to be created.
Used am65x and j7  hs platform for reference.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-11-15 21:06:46 +00:00
Yogesh Siraswar ea40937c4b conf: am57xx-evm: Add missing *.dtb and *.dtbo
Add missing dtb and dtbo to deploy folder

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-11-12 14:12:41 +00:00
Sinthu Raja 79ffa04131 conf: j7-evm: Replace eaik dtb with sk to KERNEL_DEVICETREE
The board name for J721E EdgeAI Kit (EAIK) is changed to J721E SK [1],
so replace the eaik dtb with sk dtb file

[1] https://www.ti.com/tool/SK-TDA4VM

Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-10-21 18:47:05 +00:00
Yogesh Siraswar bc74a9cfc3 conf: am57xx-evm: ReIntroduce existent dtb* for 5.10
This reverts commit 43bf0f36a3.
Added dtb and dtbo for am57xx

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-10-19 04:07:40 +00:00
Yogesh Siraswar 6cea06c3e2 conf: dra7xx-evm: ReIntroduce existent dtb* for 5.10
This reverts commit 8bdfe1413c.
Introduces existent dtb and dtbo for dra7x

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-10-19 04:07:40 +00:00
Yogesh Siraswar 537ef85437 conf: omap-a15: fix the dtb file path for extlinux boot
The uboot extlinux is using kernel device tree variable to populate the
dtb files. The error occurs if the device tree files are in ti folder
since there is no ti folder in deploy directory. Fix the kernel device
tree path before using in the uboot extlinux.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-10-19 04:07:40 +00:00
Tom Rini c3ce6cd08d conf: Add extlinux.conf support on some 32bit platforms
To make use of the "generic distro boot" support in U-Boot, an
extlinux.conf file needs to be generated and reside in the extlinux
directory.  The extlinux.conf file will be parsed by U-Boot and the
"append" line will be evaluated and expanded and used entirely as the
bootargs passed to the kernel.  Our generated extlinux.conf states
that the kernel image and device trees live one level up (so the root
directory) from it, so populate that location with our kernel and device
trees.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-08-19 09:45:24 +00:00
Tom Rini d0b09833b4 conf/machine: k3: Enable grub-efi by default in wic images
All of our platforms here support running EFI binaries.  We can have wic
generate a simple grub.cfg file for us that will find the root partition
via PARTUUID and utilize the device tree that is already discoverable
via the EFI configuration tables.  Assuming the EFI loader is U-Boot,
this device tree can be replaced at run-time by the normal mechanism of
loading in to memory and passing that address as an argument to bootefi.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-08-09 15:39:11 +00:00
Sinthu Raja 26acf04c06 conf: j7-evm: Add j721e eaik dtb to KERNEL_DEVICETREE
J721E EdgeAI Kit (EAIK) is a low cost, small form factor board designed
for TI’s J721E SoC. TI’s J721E SoC comprises of dual core A72, high
performance vision accelerators, video codec accelerators, latest C71x
and C66x DSP, high bandwidth real-time IPs for capture and display,
GPU, dedicated safety island and security accelerators.

J721E EAIK supports the following interfaces:
* 4 GB LPDDR4 RAM
* x1 Gigabit Ethernet interface
* x1 USB 3.0 Type-C port
* x3 USB 3.0 Type-A ports
* x1 PCIe M.2 E Key
* x1 PCIe M.2 M Key
* x2 CSI2 Camera interface (RPi and TI Camera connector)
* 40-pin Raspberry Pi compatible GPIO header

J721e EVM and EAIK uses the unified bootloader. Add j721e eaik dtb
for machine=j721e-evm

Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-07-14 04:29:26 +00:00
Praneeth Bajjuri 3f7375b6d1 conf: j7-evm: ReIntroduce pm1 SOM with tps65917 PMIC
commit 8b206b32ec ("conf: j7-evm: Remove unavailable dtb/o from 5.10 kernel")
removed all non-existent dtb* for j7-evm as they were not
available on linux 5.10 branch at that time.

Since the support for pm1 SOM with tps65917 PMIC is added in ti-linux-5.10.y by
commit dd97d0bbafb7 ("arm64: dts: ti: k3-j721e: Add support for pm1 SOM with tps65917 PMIC")

This patch adds the support back with the supported dtb.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-06-10 08:19:17 -05:00