[PATCH] doc: sl-mx8mm: Fix mistake in merge conflict resolution

Frieder Schrempf frieder at fris.de
Wed Feb 8 17:20:33 CET 2023

From: Frieder Schrempf <frieder.schrempf at kontron.de>

There was a conflict between the following two commits, that wasn't
resolved correctly. Fix this.

a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference")
f0f461287eff ("imx: Suggest the NXP ATF github repo")

Signed-off-by: Frieder Schrempf <frieder.schrempf at kontron.de>
Cc: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
Cc: Fabio Estevam <festevam at denx.de>
Cc: Stefano Babic <sbabic at denx.de>
 doc/board/kontron/sl-mx8mm.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/board/kontron/sl-mx8mm.rst b/doc/board/kontron/sl-mx8mm.rst
index 09c50aa8b1..702db60fe3 100644
--- a/doc/board/kontron/sl-mx8mm.rst
+++ b/doc/board/kontron/sl-mx8mm.rst
@@ -40,7 +40,7 @@ There are two sources for the TF-A. Mainline and NXP. Get the one you prefer
 **NXP's imx-atf**
-1. Get TF-A from: https://github.com/nxp-imx/imx-atf, branch: imx_5.4.70_2.3.0
+1. Get TF-A from: https://github.com/nxp-imx/imx-atf, branch: lf_v2.6
 2. Build
   .. code-block:: bash

More information about the U-Boot mailing list