Merge tag 'u-boot-imx-20231024' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

author Tom Rini <trini@konsulko.com>

Tue, 24 Oct 2023 13:39:02 +0000 (09:39 -0400)

committer Tom Rini <trini@konsulko.com>

Tue, 24 Oct 2023 13:39:02 +0000 (09:39 -0400)
author Tom Rini <trini@konsulko.com>
Tue, 24 Oct 2023 13:39:02 +0000 (09:39 -0400)
committer Tom Rini <trini@konsulko.com>
Tue, 24 Oct 2023 13:39:02 +0000 (09:39 -0400)
diff --cc arch/arm/mach-imx/Kconfig
Simple merge
diff --cc arch/arm/mach-imx/image-container.c
Simple merge
diff --cc arch/arm/mach-sunxi/board.c
Simple merge
diff --cc common/spl/spl_mmc.c
Simple merge
diff --cc configs/imx93_11x11_evk_defconfig
Simple merge
diff --cc include/spl.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Tue, 24 Oct 2023 13:39:02 +0000 (09:39 -0400)
committer	Tom Rini <trini@konsulko.com>
	Tue, 24 Oct 2023 13:39:02 +0000 (09:39 -0400)
		1	2
arch/arm/mach-imx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/image-container.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sunxi/board.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/spl/spl_mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
configs/imx93_11x11_evk_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/spl.h	patch \|	diff1 \|	diff2 \|	blob \| history