From: Tom Rini Date: Fri, 13 Dec 2024 23:30:27 +0000 (-0600) Subject: Merge patch series "Add phyCORE AM62Ax" X-Git-Tag: v2025.04-rc1~17^2~53 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5360c683e6fe324376c11bfe5064ff1718f78c50;p=pandora-u-boot.git Merge patch series "Add phyCORE AM62Ax" Garrett Giordano says: This patch set adds the phyCORE AM62Ax board support and documenation to u-boot. The phyCORE-AM62Ax is a SoM (System on Module) featuring TI's AM62Ax SoC. It can be used in combination with different carrier boards. This module can come with different sizes and models for DDR, eMMC, SPI NOR Flash and various SoCs from the AM62x family. A development Kit, called phyBOARD-Lyra is used as a carrier board reference design around the AM62x SoM. This series depends on the following two patches: - [PATCH v2] arm: mach-k3: am62a7: Provide a way to obtain boot device for non SPL https://lists.denx.de/pipermail/u-boot/2024-October/570156.html - [PATCH] board: phytec: common: Introduce CONFIG_PHYTEC_K3_DDR_PATCH https://lists.denx.de/pipermail/u-boot/2024-November/571543.html Link: https://lore.kernel.org/r/20241118231606.3161665-1-ggiordano@phytec.com [trini: Fix warning in board/phytec/common/k3/board.c when CONFIG_EFI_HAVE_CAPSULE_SUPPORT is not enabled] Signed-off-by: Tom Rini --- 5360c683e6fe324376c11bfe5064ff1718f78c50 diff --cc board/phytec/common/k3/board.c index 065e446e154,346b2b6491a..9ff861cd3f4 --- a/board/phytec/common/k3/board.c +++ b/board/phytec/common/k3/board.c @@@ -171,9 -94,6 +171,10 @@@ int board_late_init(void } } - if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) - configure_capsule_updates(); ++#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) ++ configure_capsule_updates(); ++#endif + return 0; } #endif diff --cc doc/board/phytec/index.rst index fa306974645,697aec30512..1ae30c2dcd5 --- a/doc/board/phytec/index.rst +++ b/doc/board/phytec/index.rst @@@ -7,8 -7,9 +7,9 @@@ PHYTE :maxdepth: 2 imx8mm-phygate-tauri-l - imx93-phyboard-segin + imx93-phycore phycore-am62x + phycore-am62ax phycore-am64x phycore-imx8mm phycore-imx8mp