imx: Fix imx8m FIT script issue

The FIT config node has reversed ATF and u-boot: ATF is set to 'firmware' but
u-boot is set to 'loadables'.
This script can work previously because spl fit driver wrongly appends fdt to
all loadable images. With the issue fixed in commit 9d15d1d1c2 ("Revert
"common: spl_fit: Default to IH_OS_U_BOOT if FIT_IMAGE_TINY enabled"") the
u-boot in 'loadables' does not have fdt appended and fails to work.  So correct
the script by moving u-boot to 'firmware' and ATF to 'loadables'.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reported-by: Matt Porter <mporter@konsulko.com>
Tested-by: Matt Porter <mporter@konsulko.com>
This commit is contained in:
Ye Li 2020-04-09 01:44:43 -07:00 committed by Tom Rini
parent 97c7ac214e
commit 0db0ba6141

View file

@ -116,8 +116,8 @@ if [ -f $BL32 ]; then
cat << __CONF_SECTION_EOF cat << __CONF_SECTION_EOF
config@$cnt { config@$cnt {
description = "$(basename $dtname .dtb)"; description = "$(basename $dtname .dtb)";
firmware = "atf@1"; firmware = "uboot@1";
loadables = "uboot@1", "tee@1"; loadables = "atf@1", "tee@1";
fdt = "fdt@$cnt"; fdt = "fdt@$cnt";
}; };
__CONF_SECTION_EOF __CONF_SECTION_EOF
@ -125,8 +125,8 @@ else
cat << __CONF_SECTION1_EOF cat << __CONF_SECTION1_EOF
config@$cnt { config@$cnt {
description = "$(basename $dtname .dtb)"; description = "$(basename $dtname .dtb)";
firmware = "atf@1"; firmware = "uboot@1";
loadables = "uboot@1"; loadables = "atf@1";
fdt = "fdt@$cnt"; fdt = "fdt@$cnt";
}; };
__CONF_SECTION1_EOF __CONF_SECTION1_EOF