imx8mn-somdevices: arm: dts: Add imx8mn-somdevices.dts copying imx8mn-evk.dtsi file.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mn_somdevices: configs: Add imx8mn_somdevices_defconfig copying imx8mn_evk_defconfig file.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mn_somdevices: Add somdevices board files based on freescale/imx8mn_evk files.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: configs: Disable cursor blink.

Signed-off-by: Alejandro Benete <abenete@somdevices.com>

imx8mm-somdevices: spl: Changes to decrease temperature.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: configs: Change bootdelay to 0.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: spl: Turn on display at boot.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: configs: Disable video.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Read MAC from EEPROM and save it in ethaddr environment variable.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Light on LED at boot up.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: arm: dts: Removed not used peripherals.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Enable ethernet.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: configs: Disable CONFIG_USB_TCPC to enable USB.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Change uart2 pinmux.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Change usdhc2 cd gpio.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Change memory size from 2GB to 1GB.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Add imx8mm-somdevices lpddr4 configuration.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Add somdevices board necessary files based on freescale/common.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: arm: dts: Added imx8mm-evk.dts features to imx8mm-somdevices.dts.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: arm: Add imx8mm_somdevices Kconfig.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: arm: dts: Add imx8mm-somdevices.dtb to Makefile.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Changed evk/freescale references to somdevices.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Renamed imx8mm_evk.c -> imx8mm_somdevices.c.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: configs: Add imx8mm_somdevices.h file copying imx8mm_evk.h file.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: arm: dts: Add imx8mm-somdevices.dts copying imx8mm-evk.dtsi file.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: configs: Add imx8mm_somdevices_defconfig copying imx8mm_evk_defconfig file.

Signed-off-by: Josep Orga <jorga@somdevices.com>

imx8mm-somdevices: Add somdevices board files based on freescale/imx8mm_evk files.

Signed-off-by: Josep Orga <jorga@somdevices.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-164 arm: dts: imx8qm: Remove alias of pcieb node

LFU-164 arm: dts: imx8qm: Remove alias of pcieb node

When pcieb alias is added, 2021.04 PCI uclass driver will occupy
its seq as a bus address even the controller is disabled.

This causes the device enumerated on pciea bridge assigned with a
bus address 2 which is conflict with address translate scheme
in the driver.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LF-3946 crypto: caam: Fix kick_trng for i.MX

LF-3946 crypto: caam: Fix kick_trng for i.MX

Porting the RNG init relevant configurations for i.MX from fsl_caam.c
to jr.c to fix hwrng performance issue in kernel.

Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Gaurav Jain <gaurav.jain@nxp.com>

Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04

* origin/ls_v2021.04:
  net: fm: Fix a memory leak issue
  net: e1000: Fix Unchecked return value coverity

net: fm: Fix a memory leak issue

Fix a memory leak issue in the RX port initialization.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

net: e1000: Fix Unchecked return value coverity

Added check for return value of e1000_read_phy_reg().

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-145 imx8qm_val: Fix uninitialized gpio variable
  LF-3943 arm: dts: imx8mm-evk: Change board's model name

LFU-145 imx8qm_val: Fix uninitialized gpio variable

Fix coverity Issue: 13562326 Uninitialized scalar variable
The flags field of struct gpio_desc is not initialized. When calling
dm_gpio_set_dir_flags, the flags field will be used.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

LF-3943 arm: dts: imx8mm-evk: Change board's model name

Update Model to "NXP i.MX8MM EVK board"

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-161 imx8m: Fix pad DSE issue for imx8mm/mn/mp
  LFU-160 mx6sabre: Enable IMX_THERMAL for iMX6Q/DL/QP SDB and ARD

LFU-161 imx8m: Fix pad DSE issue for imx8mm/mn/mp

According to RM, 8MM/MN/MP pad only have 4 valid DSE values.
And DSE2 and DSE4 are different with current definitions in iomux-v3.h.
Fix the issue to align with RM.

Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>

LFU-160 mx6sabre: Enable IMX_THERMAL for iMX6Q/DL/QP SDB and ARD

The CONFIG_IMX_THERMAL has been deleted from header file, so we
have to enable it in Kconfig. Add it to common Kconfig for
iMX6Q/DL/QP SDB and ARD boards

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04

* origin/ls_v2021.04:
  mmc: fsl_esdhc: convert to CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT

mmc: fsl_esdhc: convert to CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT

For eSDHC, power supply is through peripheral circuit. So, 3.3V
power supply capability from register bit does not reflect the
truth. 3.3V is common for SD/MMC, and is supported for all boards
with eSDHC in current u-boot. So, let's use a Kconfig
CONFIG_FSL_ESDHC_VS33_NOT_SUPPORT making 3.3V is supported in
default.

This is also a fix-up for one previous patch, which converted to
use IS_ENABLED() for CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 that is
not a Kconfig option.

Fixes: 52faec31827e ("mmc: fsl_esdhc: replace most #ifdefs by IS_ENABLED()")
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-156 video: mxsfb: Fix pixel clock issue in non-DM driver

LFU-156 video: mxsfb: Fix pixel clock issue in non-DM driver

When changing video mode to display timing structure, the pclk from
env or board codes is represented by the time of one clock (picosecond).
So we can't directly assign it to pixel clock (hz), but use PS2KHZ
to convert.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-143 tcpc: Add i2c read/write return check
  LFU-18 spi: fsl_lpspi: Fix dereference before null check
  LFU-145 imx8qxp_val: Fix uninitialized gpio variable

LFU-143 tcpc: Add i2c read/write return check

Fix coverity Issue: 2970631/5409463 Unchecked return value.
Add relevant return check for i2c read and write

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

LFU-18 spi: fsl_lpspi: Fix dereference before null check

Fix coverity Issue: 11026161 Dereference before null check
The lpspi should not be dereferenced before null checking, moving
getting its udevice after the checking

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

LFU-145 imx8qxp_val: Fix uninitialized gpio variable

Fix coverity Issue: 13562326 Uninitialized scalar variable
The flags field of struct gpio_desc is not initialized. When calling
dm_gpio_set_dir_flags, the flags field will be used.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

LFU-154 imx6ul: bee: fix build break

Fix below build break by including the global_data.h header file.
"
  CC      arch/arm/mach-imx/mx6/bee.o
arch/arm/mach-imx/mx6/bee.c:18:1: warning: data definition has no type or storage class
   18 | DECLARE_GLOBAL_DATA_PTR;
      | ^~~~~~~~~~~~~~~~~~~~~~~
arch/arm/mach-imx/mx6/bee.c:18:1: warning: type defaults to ‘int’ in declaration of ‘DECLARE_GLOBAL_DATA_PTR’ [-Wimplicit-int]
arch/arm/mach-imx/mx6/bee.c: In function ‘region_valid’:
arch/arm/mach-imx/mx6/bee.c:261:29: error: ‘gd’ undeclared (first use in this function)
  261 |  if ((start + size - 1) >= (gd->start_addr_sp - SZ_128K)) {
      |                             ^~
arch/arm/mach-imx/mx6/bee.c:261:29: note: each undeclared identifier is reported only once for each function it appears in
scripts/Makefile.build:265: recipe for target 'arch/arm/mach-imx/mx6/bee.o' failed
make[2]: *** [arch/arm/mach-imx/mx6/bee.o] Error 1

"

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-154 imx6ul: bee: fix build break

Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04

* origin/ls_v2021.04:
  net: phy: inphi in112525 gen1/gen2 retimers support

net: phy: inphi in112525 gen1/gen2 retimers support

Add support for Inphi retimers used on LX2160A-RDB/QDS boards
Add support for M13,M8 mezzanine cards using Inphi retimers
Gen1 configurations: 10/25
Gen2 configurations: 10/25 + 40/50/100G (using 2 retimers)
Speeds are configurable via menuconfig options

Signed-off-by: Florin Chiculita <florinlaurentiu.chiculita@nxp.com>
Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com> # rebased
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> # rebased over v2021.04

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  MA-19082-2 imx8m: Use Trusty OS handle SNVS operation

MA-19082-2 imx8m: Use Trusty OS handle SNVS operation

This patch added Trusty OS in u-boot to handle
some snvs related operation.

Change-Id: Iba2b9e12381ce537b40959f14e831accbdecba8f
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
Signed-off-by: Ji Luo <ji.luo@nxp.com>

LF-3898-4 dts: imx8mm/n-evk: disable over current for usb1

Sync with Ticket LF-3861.

Since imx8mm and imx8mn evk base board does not support over current
detection for usb1, so disable it.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

LF-3898-3 imx: imx8m: soc: runtime drop extcon property from usbotg node

The extcon is an decrepted property and not used by upstream Linux and
NXP 5.10 kernel, so we remove it before kicking linux in case it is in
dts. Otherwise distro kernel will not able to have usb function.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

LF-3898-2 arm: dts: imx8mm: remove power domain property

The current power domain node in imx8mm.dtsi is not used in U-Boot,
and it not match with upstream Linux Kernel. U-Boot use arm smccc
to enable usb power domain, so we could remove this property.
It could be added back when we finally switch to upstream pgc node.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

LF-3898-1 configs: imx8mm_evk: enable CONFIG_CMD_POWEROFF

Enable CONFIG_CMD_POWEROFF to support ARM SystemReady power off test.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LF-3898-4 dts: imx8mm/n-evk: disable over current for usb1
  LF-3898-3 imx: imx8m: soc: runtime drop extcon property from usbotg node
  LF-3898-2 arm: dts: imx8mm: remove power domain property
  LF-3898-1 configs: imx8mm_evk: enable CONFIG_CMD_POWEROFF

Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04

* origin/ls_v2021.04:
  configs: ls2088aqds: fix synchronous exception

configs: ls2088aqds: fix synchronous exception

IFC NOR flash base address of ls2088a is 0x580000000,
and env crc offset size is 0x500000, so fix the macro
CONFIG_ENV_ADDR to fix synchronous exception(access illegal address)

Fixes: 59071804c1 ("configs: ls2080a: Correct ENV_ADDR value")
Signed-off-by: Biwen Li <biwen.li@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LF-3843: dts: imx8mq evk: correct 1280x720p60 video timing

LF-3843: dts: imx8mq evk: correct 1280x720p60 video timing

For 720p60 CEA mode:
hfront_porch = hsync_start - hdisplay = 1390-1280=110
hback_porch = htotal - hsync_end = 1650-1430=220
vfront_porch = vsync_start - vdisplay = 725-720=5
vback_porch = vtotal - vsync_end = 750-730=20

Add hsync-active and vsync-active;

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  MA-19065-1 Support widevine keybox provision

Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04

* origin/ls_v2021.04:
  configs: ls1088a: Enable CONFIG_SYS_RELOC_ENV_ADDR

configs: ls1088a: Enable CONFIG_SYS_RELOC_ENV_ADDR

Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>

MA-19065-1 Support widevine keybox provision

support widevine keybox provisioning via hwcrypto,
the keybox would be wrote into secure storage.

This commit supports two kinds of widevine keybox
provisioning: plain text keybox and encrypted keybox.

Command to provision the plain text keybox:
  $ fastboot stage <path-to-plain-text-keybox>
  $ fastboot oem provision-wv-keybox

Command to provision the encrypted text keybox:
  $ fastboot stage <path-to-encrypted-keybox>
  $ fastboot oem provision-wv-keybox-enc

Test: plain text/encrypted keybox provisioning on imx8mp.

Change-Id: I241afade415fc3e2b0a80d286b3cc4e8d702e620
Signed-off-by: Ji Luo <ji.luo@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  MA-19068 android auto: get right kernel size

MA-19068 android auto: get right kernel size

Pass the correct kernel address for android auto
so uboot can get correct kernel size.

Change-Id: I20b6501bbc401c5a1d5752179e00b3b9875a10a2
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04: (7 commits)
  LFU-15 Fix using uninitialized value
  LF-1897 trusty: Fix extra argument to printf format specifier
  LF-1896 trusty: fix invalid type in argument to printf format specifier
  LF-1894 trusty: fix invalid printf format string
  LF-1892 7ulp: Fix missing break in switch
  ...

LFU-15 Fix using uninitialized value

This commit fixes Coverity Issue: 11468195, avoid
uninitialized value using.

Test: AVB check.

Change-Id: I04eb8faafd6c9a9fec1aeae0b29edc6940251094
Signed-off-by: Ji Luo <ji.luo@nxp.com>
(cherry picked from commit 742cc182bf9d0d0a7c8cecdac2a328e5c0bd64cb)

LF-1897 trusty: Fix extra argument to printf format specifier

Fix Coverity Issue 10473659 and 10473672. Pass correct parameter
to fix the extra argument issue.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: I72e30250827ad0c48e079a7048bdb40773c17a96
(cherry picked from commit ed061b4a21a24d8deb36561e0bfe2343e2ce45c8)

LF-1896 trusty: fix invalid type in argument to printf format specifier

Fix Coverity Issue 10473658, 10473663, 10473664 and 10473668. Use "%lu"
for "uint64_t" and "unsigned long" parameter in printf to fix the type
mismatch issue.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: Ic1642ab4d5aecee9676b65582b04eaca4c16d3c2

LF-1894 trusty: fix invalid printf format string

Fix Coverity Issue 10473656. Use "%s" instead of "%" to
print the function name.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: I3158b2504a2be0330eb982d279811ca88935a902
(cherry picked from commit 4339a489b8f24b35d2e59084e7ce42de27f28461)

LF-1892 7ulp: Fix missing break in switch

Fix Coverity Issue 10473654. Add 'break' statememt for 'case 2' to
fix MISSING_BREAK issue.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: I33072ffeb1b8ecf108d1fbea8bc14905a23facc3
(cherry picked from commit e1155dc7a77b299899f8e0f7ca1c20a2bcbcea94)

LF-1846 avb: Fix unintentional integer overflow

Fix Coverity Issue 2690361. Fix unintentional integer overflow by
casting the pte->length to type 'uint64_t'.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: I4536e733c82cb31bbd7da0ee916e7698850c3b81
(cherry picked from commit 3a332c5264b1cdb5aa026bcb6fd4afad69c0d19b)

LF-1850 fastboot: Fix buffer not null terminated

Fix Coverity Issue 3351934. Calling strncpy() with the size shorter
than the source string and would cause null-terminate dest buffer.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: I1e71fb584eb8f10a90ec87564cc49b7f9388c3de
(cherry picked from commit 0c408158af2592f34ed4ecc7c6a30db5c8676ffe)

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  MA-19067 android: skip optee dtb node handling

MA-19067 android: skip optee dtb node handling

Android doesn't use optee so skip optee dtb node
handling.

Change-Id: I30bf91a62fe774dbae0d219fd17405feed6f0784
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LFU-126-12 i.MX8: Moved Power on JR resource to jobring driver.

LFU-126-12 i.MX8: Moved Power on JR resource to jobring driver.

u-boot power domain driver API is used to power on JR.
so that u-boot framework will automatically
power off JR resource before booting into kernel.

Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
Signed-off-by: Ye Li <ye.li@nxp.com>

Merging in latest from upstream (LFAC/uboot-nxp:refs/heads/imx_v2021.04)

* commit '4272c700e189240ca1befba02dd6c0ee795c1751':
  LF-3782 fastboot: Select USB_GADGET_OS_DESCRIPTORS for fastboot function
  MLK-25497 nand: mxs_nand_spl: Fix nand_spl_adjust_offset issue
  MLK-25496 imx6: Fix CONFIG_SYS_MMC_ENV_DEV for QSPI/SPI/EIM boot

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04:
  LF-3782 fastboot: Select USB_GADGET_OS_DESCRIPTORS for fastboot function
  MLK-25497 nand: mxs_nand_spl: Fix nand_spl_adjust_offset issue
  MLK-25496 imx6: Fix CONFIG_SYS_MMC_ENV_DEV for QSPI/SPI/EIM boot

LF-3782 fastboot: Select USB_GADGET_OS_DESCRIPTORS for fastboot function

CONFIG_USB_GADGET_OS_DESCRIPTORS must be set when using OS descriptor,
otherwise the OS descriptors (windows WCID) are not handled.
Since only fastboot uses this feature, default select
USB_GADGET_OS_DESCRIPTORS for fastboot function

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

MLK-25497 nand: mxs_nand_spl: Fix nand_spl_adjust_offset issue

Wrong offset was returned in commit e849aaa
(LF-3483-2 nand: mxs_nand_spl: Implement the nand_spl_adjust_offset)
Fix the issue by removing the sector.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

MLK-25496 imx6: Fix CONFIG_SYS_MMC_ENV_DEV for QSPI/SPI/EIM boot

CONFIG_SYS_MMC_ENV_DEV depends on CONFIG_ENV_IS_IN_MMC.  So even
we have added it in defconfig for QSPI/SPI/EIM, but this does not
really set due to we set ENV in NOR flash device.

This causes "mmcdev" set to invalid value. So u-boot fails to
select SD card before loading kernel image.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Merge remote-tracking branch 'origin/ls_v2021.04' into lf_v2021.04

* origin/ls_v2021.04:
  pci: layerscape-ep: Add check of the PCIe controller enablement

pci: layerscape-ep: Add check of the PCIe controller enablement

Stop to initialize the PCIe controller if it's disabled by RCW.

Fixes: 118e58e26eba ("pci: layerscape: Split the EP and RC driver")
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

Merge remote-tracking branch 'origin/imx_v2021.04' into lf_v2021.04

* origin/imx_v2021.04: (94 commits)
  MA-19038 Android: Add imx8/imx8m reference boards support
  MA-19037 imx8mn: Add spl mmc boot support
  MA-19036 android: imx8mm: Add 4GB lpddr4 support
  MA-19032 android: imx8: don't initialize caam in uboot
  MA-19031 imx: hab: fix build break
  ...

MA-19038 Android: Add imx8/imx8m reference boards support

Add configs to support imx8/imx8m reference boards, each platform
has specific header files include.

Test: sanity test on imx8/imx8m platforms.

Change-Id: Ic7341fe71fc765b93beb061208e1e3b8b92b990b
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19037 imx8mn: Add spl mmc boot support

Android won't boot with boot rom so add spl
mmc boot support here.

Change-Id: I0d1d9240ed63b99cec6d964ea369ff55865547c5
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19036 android: imx8mm: Add 4GB lpddr4 support

Add support for imx8mm evk board with 4GB lpddr4.

Change-Id: I8254dfba90ac48a04c38bef21741cdc22d3cd470
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19032 android: imx8: don't initialize caam in uboot

CAAM JR0/JR1 are reserved for SECO, JR2/JR3 will be used in
Trusty OS for android. As Android doesn't need the caam
in uboot for imx8q, so bypass the caam JR probe to avoid
conflicts.

Change-Id: Id4ffe9fbb466abfeadc2c18e4b5d7e1b68360ab5
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19031 imx: hab: fix build break

Include correct header file to fix below build
break:
  arch/arm/mach-imx/hab.c:20:1: warning: data definition has no type or storage class DECLARE_GLOBAL_DATA_PTR;
  ^~~~~~~~~~~~~~~~~~~~~~~
  arch/arm/mach-imx/hab.c:20:1: warning: type defaults to 'int' in declaration of 'DECLARE_GLOBAL_DATA_PTR' [-Wimplicit-int]
  arch/arm/mach-imx/hab.c:61:17: error: unknown type name 'gd_t'
  static volatile gd_t *gd_save;
  ^~~~
  arch/arm/mach-imx/hab.c: In function 'save_gd':
  arch/arm/mach-imx/hab.c:67:12: error: 'gd'
  undeclared (first use in this function)
  gd_save = gd;
  ^~
  arch/arm/mach-imx/hab.c:67:12: note: each undeclared identifier is reported only once for each function it appears in

Change-Id: Ie8c396be901a80d9bf90b74e59607d6d17619aaa
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19030 android: Switch to new caam drivers

fsl_caam.c would be dropped and this commit switches to
the new caam drivers for android.

Change-Id: I91ff446dc9a337d14732f05fb724368010d73dd2
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19027 crypto/fsl: code clean up

This commit makes some clean up for the caam blob
codes.

Change-Id: I1544894825ad9a25ae1e346b5fb917dd7cd78829
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19026 Add config to guard rpmb driver in SPL

Android will need rpmb operation in SPL, below commit
guard the rpmb.c build with CONFIG_SPL_SUPPORT_EMMC_RPMB
but didn't add it in the Kconfig:
  commit 2448c34f9fc26d3c459e6e7b28c6357656bfa287
  Author: Heinrich Schuchardt <xypron.glpk@gmx.de>
  Date:   Wed Apr 15 18:28:09 2020 +0200

      drivers: mmc: rpmb: do not build for SPL

      RPMB support is used by the 'mmc rpmb' command and by the OP-TEE
      support.
      We do not need it in SPL.
This commit will add CONFIG_SPL_SUPPORT_EMMC_RPMB defination
and select it by default when trusty is enabled.

Change-Id: I8d3b4481d529828cb03328b826e0e7065104ba46
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19023 Add is_recovery_key_pressing() for imx8/imx8m

This is_recovery_key_pressing() will simply return as
we don't support it on the reference board.

Change-Id: I4748450f5d571737aa457662da7c972d613e15df
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-19022 Remove cmd_tbl_t typedef for imx

cmd_tbl_t typedef has been removed by below commit:
  commit 09140113108541b95d340f3c7b6ee597d31ccc73
  Author: Simon Glass <sjg@chromium.org>
  Date:   Sun May 10 11:40:03 2020 -0600

      command: Remove the cmd_tbl_t typedef
Sync this change for imx platforms.

Change-Id: Ia08287658a3471569a92438434f3163ac078a49c
Signed-off-by: Ji Luo <ji.luo@nxp.com>

MA-17916-1 Clean Up: Guard codes with correct configs

This commit does some clean-up to guard the codes/configs with
correct configs, so we can enable/disable the feature without
modifying the codes.

Test: builds and boots on imx8qm.

Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: Ic4cf4d9f47bd5a4317b2621a5378cb4b192e52fb
(cherry picked from commit 2c2363e47b858bd178c44869328eca211b2c3f62)
(cherry picked from commit cdf01e8a0fbf29df6230344889d1ec5035b6c978)