- Added the SX8M SD target
  - Added the FSPI SX8M target
  - FSPI offset fix pulled in from the 2.1.0 branch

Because the flexspi build image will add 0x1000 header with flexspi
configurations. So its offset and fit hab blocks needs to change
accordingly.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 250864fedd441a1ab7f4951217e1e3aea6deb604)

Signed-off-by: Chuck Cannon <chuck.cannon@nxp.com>
(cherry picked from commit e0eade91e2efc8b63b77b067c4ab882a35af82ef)

Add new targets which only include u-boot proper to
support dual bootloader for xen.

Test: build and boot on imx8qm_mek.
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Move spl to 0x8000_0000 will make cpu1 ~ cpu3 jump to spl when
boot/reboot, which causes cpu1 ~ cpu3 power on fail. Revert this
patch to fix it.

This reverts commit 99bfc0bb.

Move spl to dram for Android/Android Auto, the memory
map will be changed to:
  SPL:    0x0000_0000 --------> 0x8000_0000
  ATF:    0x8000_0000 --------> 0x8004_0000
  U-boot: 0x8002_0000 --------> 0x8006_0000

Test: reboot ok on imx8qm/imx8qxp.
Signed-off-by: Ji Luo <ji.luo@nxp.com>

Keep the target for normal android and car2 image as previous one.
Use new target name for car image for imx8qxp.
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>

Since trusty not ready, we need a new target without tee,
but we switch to spl uboot for dom0 to ease adding trusty in future.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Add scfw flags to disable bootup AP in scfw and do alternate config.
Add -p3/-p4 to make M4 in a separate partition.
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>

The copyright should be: Copyright <year range> NXP
There is no ( C ).
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 274c4f426f414b0ea3d205f582ab479a9f291879)

add flash_all_spl_container_ddr which is used in android auto.
refine the m4 image name.
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>

Add old iMX8QXP a0 targets to alias.mak to avoid breaking any build.
For 8QM, users have to use new targets for a0.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 669ccf96590586f95c1b998bc05e55d37029cdb2)

This reverts commit 5e9a4be871e0e53b9ec6700a9f793ce163eb9c12.

Clarify the logic for -p parameter as below. So consider the case that
M4 and AP share in one partition, secondary CPU need set -p0, this secondary
CPU could be AP either M4.
It is better to revert the patch to avoid break this case.
Our single M4 targets have added -p1, so no impact to them.

"
 - Without the boot flag there is only a partition 1. One CPU must be p1.
   Others must be p0 (indicates secondary CPU).  The default was no boot flag,
   AP is p1, M4s p0. If no AP then one of the M4 needs to be p1 (but not both).
   With the bootflag there is 1, 3, and 4 (on QM). AP should be p1 (the default)
   and M4_0 is p3 and M4_1 is p4.
"
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 6bbc40546c9a8f08742ab10c8ef83dfa525ae9b8)

rev_a.mak is missed to be included. Fix the issue. Also align the QX
revision A0 targets name with QM, using prefix flash_a0_xxx
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 6ccb89d9c7a560114d8189358c373b3c0baf822a)

Default M4 partition should be 1 same as A core partition, not the 0.
Otherwise M4 has to specify the -p1 for its standalone build
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 5e9a4be871e0e53b9ec6700a9f793ce163eb9c12)

Split the soc.mak to several .mak files for different usages:

soc.mak:       BSP default build targets
android.mak:   Android specified targets
m4.mak:        M4 standalone targets
rev_a.mak:     Revision A0 chip targets
autobuild.mak: Nightly build targets
misc.mak:      Mfgtool, secofw, msgblock, nandfw targets
test.mak:      Various test targets: scfw_test, DDR_stress_test,
               NAND test, etc
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 28dd3769902263e6e304520559b0ec43c9c6180f)

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>
(cherry picked from commit 1ddeb4b4a65854725af4e16d8741a0f117be888b)

Signed-off-by: Chuck Cannon <chuck.cannon@nxp.com>

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>

Android auto M4 image need to place the binary in DDR, because the size
of image is too large to place in TCM. Add new target for android image.
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>

flash_all_spl_container is used by BSP to work TCM based M4 image.
Should not change it to DDR address.
Signed-off-by: Ye Li <ye.li@nxp.com>

in DDR RAM

As the default M4 image has replaced to DDR build type, need to change
the entry address of M4 image to DDR.
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>

To enable dual bootloader, this patch will individually save a copy of
container contains SPL and a copy of container contains uboot.

The container file of u-boot-atf-container.img is also processed based
on whether "ROLLBACK_INDEX_IN_CONTAINER" is defined or not.
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>

Remove "-dcd skip" in the targets: flash_b0_spl_container_m4_1_trusty and
flash_all_spl_container. As M4 image is run in DDR, DDR need to be initialized
in ROM before M4 image loaded by ROM.
Change the entry address of M4 image to DDR address for SCFW to bootup.
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>

Support building image for SPL NAND booting using container for u-boot,
atf and optee.
Signed-off-by: Ye Li <ye.li@nxp.com>

Add none m4 trusty os build

Change-Id: I8944cc4e42d63df5952a90b214d86ee07cd96f41
Signed-off-by: guoyin.chen <guoyin.chen@nxp.com>

Since the IVT offset is changed on this SoC. Added a -version parameter
to pass the v1 or v2 to mkimage_imx8.
v1 is for iMX8MQ and iMX8MM
v2 is for iMX8M Nano (iMX8MN)

Also the ROM on iMX8MN does not support DCD nor plugin. Checks the
parameters if they are used.

Additional, on Nano the addresses of SPL and ATF are changed to OCRAM.
Signed-off-by: Ye Li <ye.li@nxp.com>

Remove the u-boot-atf-container.img when running clean target.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Remove the u-boot-atf-container.img when running clean target.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Leave the u-boot-atf-container.img alone since it might be needed.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>

Leave the u-boot-atf-container.img alone since it might be needed.
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>

Add targets to make images with SPL+CONTAINER format for 8qm_mek and
8qxp_mek.
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>

Signed-off-by: Oliver Brown <oliver.brown@nxp.com>

Fix coverity issue CID 3303250: Untrusted array index read (TAINTED_SCALAR)
tainted_data: Using tainted variable header.num_images - 1 as an index
into an array header.img
Signed-off-by: Ye Li <ye.li@nxp.com>

Fix coverity issue CID 1900601: Unchecked return value from library (CHECKED_RETURN)
check_return: Calling lseek(ifd, offset, 0) without checking return value.
This library function may fail and return an error code
Signed-off-by: Ye Li <ye.li@nxp.com>

Fix coverity issue CID 1900601, CID 2872685, CID 3327494:
Unchecked return value from library (CHECKED_RETURN)
check_return: Calling lseek(ifd, offset, 0) without checking return value.
This library function may fail and return an error code
Signed-off-by: Ye Li <ye.li@nxp.com>

Fix coverity issue CID 3303250: Untrusted array index read (TAINTED_SCALAR)
tainted_data: Using tainted variable header.num_images - 1 as an index into
an array header.img
Signed-off-by: Ye Li <ye.li@nxp.com>

Fix coverity issue CID 3327493: Negative array index read (NEGATIVE_RETURNS)
negative_returns: Using variable container as an index to array imx_header.fhdr
Signed-off-by: Ye Li <ye.li@nxp.com>

Fix coverity issue CID 4338240, CID 4338242:
Unchecked return value from library (CHECKED_RETURN)

check_return: Calling lseek(fd, fit_offset + fit_size, 0) without checking return
value. This library function may fail and return an error code
Signed-off-by: Ye Li <ye.li@nxp.com>