1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-14 06:40:42 +00:00
Commit Graph

194 Commits

Author SHA1 Message Date
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
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 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 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 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
Praneeth Bajjuri 45f43b3a29 conf: am65xx-evm: ReIntroduce display overlays for 5.10
commit 9ea50db095 ("conf: am65xx-evm: Remove non-existent dtb* from 5.10")
removed all non-existent dtb* for am65xx-evm as they were not
available on linux 5.10 branch at that time.

This patch reintroduces following display overlays.
- k3-am654-evm-tc358876.dtbo
- k3-am654-evm-oldi-lcd1evm.dtbo

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-06-08 09:19:41 -05:00
Praneeth Bajjuri e13d00e73e conf/machine: am64xx: Add overlay to support icssg1-dualemac
This patch adds overlay to support icssg1-dualemac
ie: 1 x CPSW3g ports and 2 x ICSSG1 ports configuration

overlay: k3-am642-evm-icssg1-dualemac.dtbo

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-06-08 09:18:48 -05:00
Yogesh Siraswar 99cf543ee3 linux-ti-staging: Add extra dtc flags to support dtb overlays
Added KERNEL_DTB_OVERLAY_SUPPORT to common ti-soc include. This fixes the issue
where the dtbs are build without symbols causing issue with overlays.

Please note this increases the size of the dtb for all platform
derived from ti-soc. So for custom boards disable it from local.conf to
reduce size.

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
2021-05-26 12:17:22 -05:00
Lokesh Vutla 33ad83a1de conf/machine: am64xx: Include SK dtb for machine am64xx-evm
As a step towards unification for am64xx-evm and am64xx-sk,
start including am64xx-sk dtb for machine=am64xx-evm.

Once U-Boot merges support for unified bootloader, am64xx-sk
machine can be dropped.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
2021-05-14 01:07:05 -05:00
Praneeth Bajjuri 8ec0047a59 conf: am65xx-evm: ReIntroduce AM65 SR1.0 overlay
ReIntroduce AM65x SR1.0 Overlay as the support for it
is added in the ti-linux-5.10.y kernel now.

Reviewed-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-30 16:03:25 -05:00
Praneeth Bajjuri 4327c89816 conf: am65xx-evm: ReIntroduce existent dtbo for 5.10
commit 9ea50db095 ("conf: am65xx-evm: Remove non-existent dtb* from 5.10")
removed all non-existent dtb* for am65xx-evm as they were not
available on linux 5.10 branch at that time.

This patch reintroduces overlays present current on ti-linux-5.10.y kernel.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-27 23:20:58 -05:00
Praneeth Bajjuri ba0ddc5ae9 conf: am437xx-evm: Remove non-existent dtb* from 5.10
Remove the non-existent dtb* , as they are not currently present on
ti-linux-5.10.y.

-    am437x-gp-evm-hdmi.dtb
-    am43x-epos-evm-hdmi.dtb

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-19 16:33:41 -05:00
Praneeth Bajjuri ad28c58781 conf: am335x-evm: Remove non-existent dtb* from 5.10
Remove the non-existent dtb* , as they are not currently present on
ti-linux-5.10.y.

-    am335x-icev2-prueth.dtb

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-19 16:33:41 -05:00
Praneeth Bajjuri 9ea50db095 conf: am65xx-evm: Remove non-existent dtb* from 5.10
Remove the non-existent dtb* , as they are not currently present on
ti-linux-5.10.y.

-    ti/k3-am654-base-board-sr1.dtb
-    ti/k3-am654-gp.dtbo
-    ti/k3-am654-idk.dtbo
-    ti/k3-am654-idk-sr1.dtbo
-    ti/k3-am654-evm-hdmi.dtbo
-    ti/k3-am654-evm-oldi-lcd1evm.dtbo
-    ti/k3-am654-evm-tc358876.dtbo
-    ti/k3-am654-pcie-usb2.dtbo
-    ti/k3-am654-pcie-usb3.dtbo
-    ti/k3-am654-base-board-jailhouse.dtbo
-    ti/k3-am654-evm-prupwm.dtbo

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2021-04-19 16:33:41 -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 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
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]: https://github.com/OP-TEE/optee_os/commit/87613cf9520db2e65bc8367d3e13c4217c13bdad

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Acked-by: Denys Dmytriyenko <denys@konsulko.com>
2021-03-26 08:15:15 -05: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 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 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 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
Denys Dmytriyenko dc122351a0 conf/machine: extend SR2.0 support from AM65 GP to AM65 HS platform
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-10-22 14:38:49 -05:00
Denys Dmytriyenko 8025ba5995 ti-sci-fw: now Cortex-R5 SPL can also be provided by u-boot-ti-mainline
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-10-14 10:46:40 -05:00
Denys Dmytriyenko 8ac0c75768 conf/machine: pass OPTEEFLAVOR via OPTEEMACHINE as <mach>-<flavor>
Recipe in meta-arm doesn't use OPTEEFLAVOR, but optee-os Makefile can extract
it from OPTEEMACHINE.
Keep OPTEEFLAVOR for legacy platforms - used for HS signing in the output name.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
2020-10-10 11:46:38 -05:00
Denys Dmytriyenko 5e12310bfc conf/machine: clean up MACHINE_FEATURES for k3/j7/am65 families
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-08-06 20:55:36 +00:00
Denys Dmytriyenko df3d0dd66e conf/machine: unify common AM65x GP and HS settings
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-05-28 01:11:05 +00:00
Denys Dmytriyenko 0f99cfb94c trusted-firmware-a: upstreamed and unified to meta-arm, drop locally
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-05-19 20:30:29 +00:00
Denys Dmytriyenko a83fb916dc conf/wic: switch back to 2-partition SD images, reserve extra space in boot
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-05-07 01:16:33 +00:00
Daniel D?az f0371c25b8 conf/machine: Use weak assignment for preferred virtual/kernel
A user of the meta-ti layer may choose to use a combination
of the machines herein with another kernel, not necessarily
the one from the machine definition.

Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-05-06 00:55:11 +00:00
Denys Dmytriyenko f814840465 conf, recipes-bsp: support building for K3 R5F cores via multiconfig
K3 Multicore SoC architecture defines different functional domains, each
containing specific processing cores and peripherals. Early boot is normally
handled by running bootloader and loading SYSFW on MCU Cortex-R5F core:
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

This change adds support for building bootloader and SYSFW ITB image for
K3 Cortex-R5F cores via multiconfig.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-05-05 05:22:25 +00:00
Denys Dmytriyenko dd0d596fff conf, recipes: add support for j7-hs-evm platform and j7 SoC family
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-04-23 23:31:32 +00:00
Denys Dmytriyenko 7646efc16a wic: create SD card with 3 partitions for testing
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-03-23 17:52:49 +00:00
Denys Dmytriyenko 2a2fed7265 omap-a15: add gc320 machine feature
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-02-21 05:14:41 +00:00
Denys Dmytriyenko 418c90c917 conf/machine: add dependency for wic to package deployed SPL
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-02-13 18:33:55 +00:00
Denys Dmytriyenko 39893104c0 linux-ti-staging: update to the latest
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-02-11 03:53:47 +00:00
Denys Dmytriyenko 576c6f9a31 conf/machine: generalize wic usage by moving settings to SOC files
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-02-11 01:14:57 +00:00
Denys Dmytriyenko d8bc9f4d92 ti33x.inc: remove unavailable PRU-related DTBs
* am335x-icev2-prueth.dtb
* am335x-boneblack-prusuart.dtb

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2020-01-30 04:53:54 +00:00
Denys Dmytriyenko 8088399477 conf/machine: update with new DTBs/DTBOs
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2019-08-20 23:00:11 +00:00
Denys Dmytriyenko 0d9910c171 conf/machine: rename "sgx" flag to "gpu" in MACHINE_FEATURES
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2019-06-25 14:58:33 +00:00
Denys Dmytriyenko 344792b518 conf/machine: introduce am65xx SOC family and new am65xx-hs-evm
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2019-05-09 12:49:55 +00:00
Denys Dmytriyenko bc2680c582 ti43x.inc: add back am43x-epos-evm-hdmi.dtb
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2019-03-04 19:42:41 +00:00
Denys Dmytriyenko b229d3856c ti33x.inc: add back am335x-icev2-prueth.dtb
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2019-03-04 19:42:37 +00:00
Denys Dmytriyenko d1e893a38c ti43x.inc: re-enable HDMI specific DTB for AM437x GP
This reverts commit 517864fb4f.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2019-02-26 21:26:28 +00:00