Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 79babd4b1120759c09740bd21ed49515a9fe5a33

Authored by Ye Li
2 parents cabf3f997d d8a14872f3
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

Merge remote-tracking branch 'remotes/uboot-nxp/s32_uboot' into imx_uboot 

Conflicts:
	arch/arm/config.mk

Merge with s32_uboot for secondary merge window of lf_uboot

Signed-off-by: Ye Li <ye.li@nxp.com>

Warning! This is a large diff.

To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.

If you still want to see the diff click this link

Showing 54 changed files Side-by-side Diff