We read the ROM version to determine the CPU revision before B1 chip.
The rom version is 4 bytes word, it has major version at low byte,
minor version at second byte.

On B0.1 chip, the value is 0x1020 not 0x20, if reading the word and comparing
with 0x20, the result is wrong.

Fix the issue by only reading the lowest byte for major version.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 8d0812e63155cca91ecb78c630a450e7d5e5fd00)

Add "clocks" command to list clocks values for core and some peripherals
on QM/QXP.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit c2c9b6487440946a52564ee20c2b1943a4085152)

Enable the mtest command and add relevant configurations for tested memory
range to all validation boards and EVK board.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit d92447e705ff6f077c602d340c01535ccee0ea66)

Enable the mtest command and add relevant configurations for tested memory
range to all ARM2 boards and EVK board.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit bb3dfa130dd0af57dfe7a41869f6ecd843e6c558)

Enable the mtest command and add relevant configurations for tested memory
range.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 4bfe6f1e7527921d9f02dbd37eea8924dd6d3336)

On iMX8MQ Rev B1, reading from fuse box is not allowed. The
OCOTP_READ_FUSE_DATA register is tied to magic number 0xff0055aa
for chip rev. So u-boot has to disable the fuse sense function for it.
Signed-off-by: Ye Li <ye.li@nxp.com>
Tested-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit da95f60611e8859eba3e7ccb715fdce4d6376774)

The mscale B1 uses OCOTP_HW_OCOTP_READ_FUSE_DATA register for chip id.
It returns a magic number 0xff0055aa.
Update get_cpu_rev to support this way, also enable OCOTP clock to allow
access OCOTP register.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 866631c2140b9352c6f74ec36d1a51fea40c0445)

Add common CHIP_REV_2_1 for chip revision 2.1
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit f7fc83ffb0f204d9f6ec6c77c08d23869d9ecde4)

ipg_stop from GPC is not connected to WDOG directly, the sec_debug clock is
used to sample the ipg_stop from GPC. So when this clock is off, ipg_stop input
of WDOG can’t assert, WDOG will fail to stop in DSM mode.
Enable this clock forever in SPL, so other SW don't need to touch it.
Signed-off-by: Ye Li <ye.li@nxp.com>
Tested-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit 1da6c9b3a837d15c25086af449462d5e8b56c290)

enhance memory controller performance and QoS setting
Signed-off-by: Tom.zheng <haidong.zheng@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Reviewed-by: Jian Li <jian.li@nxp.com>
(cherry picked from commit ae7b37d3ed72bad542c8e77db4bbc0325180d6d2)

After executing each ucmd, the ucmd callback function always call fastboot_setup
to setup some enviroments.

Because the mmc will be switched to user area by calling blk_get_dev in _fastboot_load_partitions.
When running "mmc partconf" by ucmd, the PART_CONFIG EXTCSD is updated, but the part_config and
hwpart variables in mmc and blk structure are not synced. So the old value will write to
PART_CONFIG EXTCSD again when switch to user area.

This patch changes the fastboot_setup, only load the partitions when the storage device is changed.
Also force to re-init mmc before loading the partitions to sync mmc variables.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit c9cd93b25586ecd4ce9178da7b8141f60cdd9deb)

Enable RTC in bootloader to avoid rtc time less than jiffies time
when linux first bootup after RTC lose power.
It will cause the issue as
MA-9554[Android_6DL_SD]RTC: Sometimes the RTC reset to the initial
time 1970 after softare reboot the first time. 40%

Change-Id: I0c87180640be98a2c928a30c6949f91f4515844d
Signed-off-by: Zhang Bo <bo.zhang@nxp.com>

Now fsl_esdhc driver require the index of  USDHCx_CLK_ROOT should be
defined sequentially. otherwise driver may get the wrong usdhc root
clock.

e.g. for imx8mm, usdhc3, driver actually get the rate of I2C1_CLK_ROOT

This patch add MXC_XXX_CLK, map to the real defined clock index.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
(cherry picked from commit 5cddab6e02e99a748f66e32880906aa427dc8e60)

Enable TZASC on i.MX 8mm.
There is a need on 8MM to enable
the BYPASS ID SWAP bit (GPR10 bit 1) in order for GPU not to generated AXI bus errors.
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit d72b8baecd8495cfba990b999fe390937859ad75)

In order to use uuu, SPL needs USB functions.
USB releated Configurations are added for imx8mm_evk.

Change-Id: Ibf49ac4c8f1107b15706f752a393847b4188b344
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>

Change bootcmd to "fastboot 0" directly when detect
booted from USB. By this the u-boot which booted by
uuu will enter fastboot mode and ready for the
remain commands.
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

Pull down the DSI_EN gpio to disable mipi dsi panel before booting kernel.
This avoids display full yellow screen before kernel mipi driver probes
the device.

For MIPI2HDMI card, this DSI_EN gpio is not used. So nothing impact to it.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e73adc9a139f2e8bb92bda1631fa2f2391a8a5e3)

Remove CONFIG_BCB_SUPPORT config from BSP u-boot defconfig files.
So that we can eliminate such errors during boot up:

can't find partition: misc, dump the partition table
idx 0, ptn 0 name='gpt' start=0 len=2048
idx 1, ptn 0 name='tos' start=0 len=2047
idx 2, ptn 0 name='all' start=0 len=7864320
idx 3, ptn 0 name='bootloader' start=2 len=4094
idx 4, ptn 1 name='mmcsdb1' start=20480 len=1024000
idx 5, ptn 2 name='mmcsdb2' start=1228800 len=6635520
cannot get the partion info for misc
Cannot find partition 4080
do_raw_read failed, ret 1
read_bootctl, bcb_rw_block read failed
read command failed
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 4d282a7a429876f1c1c67754a1d5c7aaaf75bb43)

The BCB_SUPPORT is not needed by fastboot to support uuu, change it to
disabled at default. Android header file explicitly enables this
config, so there is no impact to android.

Also remove the CONFIG_BCB_SUPPORT from whilelist, since we already add
it in kconfig.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 36fd8fd0d5f34d69ef9a1a3833f3f052d64a25b3)

BSP u-boot has enabled fastboot for uuu. But the BCB is not needed. It will
gives some errors during u-boot boot up.
This patch uses CONFIG_BCB_SUPPORT to control bcb codes, so that BSP u-boot can
disable it.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e64a0eedb1ea84fbdbb67630fba88b92d1b49ed2)

The flexspi defconfig uses CONFIG_ENV_IS_IN_SPI_FLASH not CONFIG_ENV_IS_IN_MMC.
So when fastboot is enabled for flexspi, the build break happens.

drivers/usb/gadget/built-in.o: In function `board_fastboot_setup':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/f_fastboot.c:1539: undefined reference to `mmc_get_env_dev'
drivers/usb/gadget/built-in.o: In function `_fastboot_setup_dev':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/f_fastboot.c:1260: undefined reference to `mmc_get_env_dev'
drivers/usb/gadget/built-in.o: In function `get_single_var':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/f_fastboot.c:2935: undefined reference to `mmc_get_env_dev'
drivers/usb/gadget/built-in.o: In function `bcb_rw_block':
/home/leyoen/Workspace/uboot-imx/drivers/usb/gadget/bcb.c:120: undefined reference to `mmc_get_env_dev'

Fix the issue by decoupling mmc_get_env_dev function with CONFIG_ENV_IS_IN_MMC
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 2716f9a325681737593b3a6e79f94576a35067c2)

enable fastboot for i.MX8MM flexspi u-boot
Signed-off-by: Han Xu <han.xu@nxp.com>
(cherry picked from commit ea221c08862666926e613f649359905400773d9c)

Always use the new added config for os_desc_config to fix cdev->
os_desc_config may miss set in case we restart usb gadget driver.
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit e8efb32e9b7a4fe45c7f21e86052c7f5bcdb6695)

Set the alert temperature = critical temperature - 20C, to avoid looping
the temperature at 85C
Signed-off-by: Ye Li <ye.li@nxp.com>

When enabling NAND boot, the ubi.mtd should be set to 6 because the
one mtdpart is added for tee.

Also the MFG_NAND_PARTITION is duplicated in mx6qsabreauto.h and
mx6sabre_common.h. We can remove it from mx6qsabreauto.h, since only
the sabreauto board have NAND.
Signed-off-by: Ye Li <ye.li@nxp.com>

dispmix & mipi phy power domain must be enabled before doing any
config for lcfif and dsi.
Signed-off-by: Bai Ping <ping.bai@nxp.com>

Add jailhouse boot env. run `jh_netboot` or `jh_mmcboot` to
boot Linux.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Add jailhouse boot env. Use `run jh_netboot` or `jh_mmcboot`
to boot Linux.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Adjust ARM SMC Calling Convention code for U-Boot:
  - Replace the license block with SPDX
  - Change path to asm-offsets.h
  - Define UNWIND() as no-op
  - Add Kconfig entry
  - Add asm-offsets
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
(cherry picked from commit c54bcf68)

Imports ARM SMC Calling Convention code from Linux 4.11-rc6.
The files have been copied as follows:

[Linux]                           [U-Boot]
arch/arm/kernel/smccc-call.S   -> arch/arm/cpu/armv7/smccc-call.S
arch/arm64/kernel/smccc-call.S -> arch/arm/cpu/armv8/smccc-call.S
arch/arm/include/asm/opcodes*  -> arch/arm/include/asm/opcodes*
include/linux/arm-smccc.h      -> include/linux/arm-smccc.h
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
(cherry picked from commit c2da86f39ed6cbccccc2736bdc421fd606734232)

Android build use different tool chain(gcc 4.9) with yocto(gcc 6.2),
'for' loop initial declarations are not supported in C90, define the
variable first before use it.

Test: build pass for imx8mm_evk.

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

We have add a kconfig for northwest mipi dsi driver in MLK-18945,
need to enable it in all mx7ulp evk defconfigs, otherwise they
will get build errors.
Signed-off-by: Ye Li <ye.li@nxp.com>

Refact the lpddr4 init flow on i.MX8MM EVK board. board level only need
to provide the necessary dram init related parameter.
Signed-off-by: Bai Ping <ping.bai@nxp.com>

the dram init is board related. But there is still some common
part can be reused on different board. The basic flow is common
for all the board. only the DDRC and DDR PHY config register setting
is different on different board. So extract the LPDDR4 init common
flow to make it more generic. baord level only need to provide
the DDRC and PHY config register parameter to the common code to finish
the dram init.

the same method can be use for DDR4. will be added later.
Signed-off-by: Bai Ping <ping.bai@nxp.com>

Move the SPL bss and malloc base to OCRAM 0x910000.
OCRAM_S will be reserved for dram low power purpose.
Signed-off-by: Bai Ping <ping.bai@nxp.com>

Add mipi display config CONFIG_IMX_NORTHWEST_MIPI_DSI for
evk_7ulp to align with bsp team.

Test: build pass for evk_7ulp.

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

According to RM, usdhc 100MHz pad setting need to set SRE(slew rate
field) to 0x01(Medium Frequency Slew Rate 100MHz), usdhc 200MHz pad
setting need to set SRE to 0x11(Max Frequency Slew Rate 200MHz).
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>