Frieder Schrempf db869a2785 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. 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>		2023-03-30 08:40:27 +02:00
..
actions	cubieboard7: Remove ARCH= references from documentation	2020-06-02 17:27:04 -04:00
advantech	imx: Suggest the NXP ATF github repo	2023-01-31 16:02:05 +01:00
allwinner	sunxi: add board documentation	2021-12-31 06:44:51 +01:00
amlogic	ARM: meson: Add support for Odroid-N2L	2023-01-30 14:24:17 +01:00
AndesTech	riscv: Rename Andes cpu and board names	2023-02-17 19:07:48 +08:00
apple	doc: board: apple: Mention M1 Ultra support	2022-04-23 22:05:33 +02:00
armltd	vexpress64: Add ARMv8R-64 board variant	2022-04-01 15:03:03 -04:00
atmel	doc: board: Add missing board index.rst files	2019-07-29 09:32:08 -04:00
broadcom	doc: board: bcm7xxx: Convert to reStructuredText format	2023-02-19 21:15:15 +01:00
bsh	bsh: imx8mn-smm-s2/pro: Add iMX8MN BSH SMM S2 boards	2022-04-12 19:10:44 +02:00
cloos	imx8mm-phg: Add board support	2023-01-30 23:23:02 +01:00
congatec	imx: Suggest the NXP ATF github repo	2023-01-31 16:02:05 +01:00
coreboot	Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE	2022-10-31 11:01:31 -04:00
emulation	doc: fix references to distro documentation	2023-01-20 16:38:52 +01:00
gateworks	board: gateworks: venice: move README to RST	2023-02-19 21:15:15 +01:00
google	x86: Fix saying arch_cpu_init_dm in debug/docs	2023-01-18 12:46:13 -05:00
highbank	doc: board: Add Calxeda Highbank/Midway documentation	2021-12-18 12:05:19 +01:00
intel	x86: minnowmax: Fix up adjustment of CONFIG_TEXT_BASE	2023-03-27 09:38:44 +08:00
kontron	doc: sl-mx8mm: Fix mistake in merge conflict resolution	2023-03-30 08:40:27 +02:00
mediatek	doc: mediatek: add documentation for mt7621 reference boards	2022-07-13 23:03:37 +02:00
microchip	doc: board: typo GIUD Microchip MPFS Icicle Kit doc	2022-12-02 19:17:24 +01:00
nokia	Nokia RX-51: Document debugging options and compile command	2022-11-21 09:23:00 -05:00
nxp	imx: Suggest the NXP ATF github repo	2023-01-31 16:02:05 +01:00
openpiton	doc: fix board/openpiton/riscv64.rst	2021-07-24 10:49:51 +02:00
purism	board: purism: add the Purism Librem5 phone	2022-09-18 22:56:10 +02:00
qualcomm	board: qualcomm: Add support for QCS404 EVB	2022-07-25 13:02:04 -04:00
rockchip	board: rockchip: add Radxa ROCK5B Rk3588 board	2023-02-28 18:07:29 +08:00
samsung	board: axy17lte: get board usable - add bootcmd and docs	2022-04-04 19:02:03 -04:00
siemens	board: iot2050: update build documentation for OP-TEE	2021-11-29 11:15:37 -05:00
sifive	riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel	2022-05-26 18:42:34 +08:00
sipeed	Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE	2022-10-31 11:01:31 -04:00
socionext	board: synquacer: Add DeveloperBox 96boards EE support	2021-07-06 14:11:50 -04:00
st	doc: add rst references to distro documentation in stm32mp1 board	2023-01-27 18:31:59 +01:00
ste	board: stemmy: Update documentation	2021-09-01 19:25:37 -04:00
tbs	doc: fix references to distro documentation	2023-01-20 16:38:52 +01:00
ti	Merge branch 'next'	2023-01-09 11:30:08 -05:00
toradex	imx: Suggest the NXP ATF github repo	2023-01-31 16:02:05 +01:00
variscite	imx8mn_var_som: Add support for Variscite VAR-SOM-MX8M-NANO board	2022-02-05 13:38:39 +01:00
xen	doc: xen: Add Xen guest ARM64 board documentation	2020-08-14 15:18:30 -04:00
xilinx	doc: board: xilinx: Add documentation for ZynqMP R5	2020-10-27 08:01:36 +01:00
index.rst	board: gateworks: venice: move README to RST	2023-02-19 21:15:15 +01:00