]> git.baikalelectronics.ru Git - uboot.git/commit
doc: sl-mx8mm: Fix mistake in merge conflict resolution
authorFrieder Schrempf <frieder.schrempf@kontron.de>
Wed, 8 Feb 2023 16:20:33 +0000 (17:20 +0100)
committerStefano Babic <sbabic@denx.de>
Thu, 30 Mar 2023 06:40:27 +0000 (08:40 +0200)
commitfce0f2b3a8fd4eac267c858d5e6c175593b81773
tree267bc8fa0e044c294c21ca1b3aa354de1ff1e0ce
parent2fdbcc9de144c301324dddd24b0b2e7f83c4fee9
doc: sl-mx8mm: Fix mistake in merge conflict resolution

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

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

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <festevam@denx.de>
doc/board/kontron/sl-mx8mm.rst