db869a2785
There was a conflict between the following two commits, that wasn't resolved correctly. Fix this.a93985ddfc("doc: sl-mx8mm: Update the NXP TF-A source reference")f0f461287e("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>