Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi

author Tom Rini <trini@konsulko.com>

Fri, 23 Oct 2020 00:32:02 +0000 (20:32 -0400)

committer Tom Rini <trini@konsulko.com>

Fri, 23 Oct 2020 00:32:02 +0000 (20:32 -0400)
author Tom Rini <trini@konsulko.com>
Fri, 23 Oct 2020 00:32:02 +0000 (20:32 -0400)
committer Tom Rini <trini@konsulko.com>
Fri, 23 Oct 2020 00:32:02 +0000 (20:32 -0400)
diff --cc Makefile
Simple merge
diff --cc common/spl/Kconfig
Simple merge
diff --cc common/spl/spl_fit.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Fri, 23 Oct 2020 00:32:02 +0000 (20:32 -0400)
committer	Tom Rini <trini@konsulko.com>
	Fri, 23 Oct 2020 00:32:02 +0000 (20:32 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/spl/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
common/spl/spl_fit.c	patch \|	diff1 \|	diff2 \|	blob \| history