Add different defconfigs.
Enable Trustzone.
Update env to runtime boot OP-TEE.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Add defconfigs.
Enable Trustzone.
Update env to runtime boot OP-TEE.
To 6QP AUTO, TZASC not enabled now.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

To i.MX6/7, the high 32M is reserved for OP-TEE case.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

considering the boot binary/kernel size becomes larger, increase the
boot and kernel partition size and accordingly change the offset when
reading data.
Also changed the extra Android misc partition size to 8M which is block
size aligned.
Signed-off-by: Han Xu <han.xu@nxp.com>

Implement wdog reset in SPL stage.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

Add configs to open lock/unlock feature for evk_6sl and sabresd_7d.

Change-Id: I18f8917df06290efb553b10c9bbdaeb145f8a423
Signed-off-by: ji.luo <ji.luo@nxp.com>

Android needs to use USBOTG port on MEK base board for fastboot (USB device mode).
Add relevant node to DTS and update configurations to enable the port in android build.
Signed-off-by: Ye Li <ye.li@nxp.com>

When booting from flexspi, the mmcpart variable is not defined because
the CONFIG_SYS_MMC_IMG_LOAD_PART binds to SD/eMMC boot image only. This cause we
fails to load kernel image from SD after booting from flexspi.
Signed-off-by: Ye Li <ye.li@nxp.com>

When M4 images (m4_0 and m4_1) are included into flash.bin, the bin size exceeds
the 1.2MB, which cause overlay with u-boot environment area.
To fix the issue, we change the u-boot environment offset to 4MB for SD and FlexSPI,
and align this for all i.MX8 platforms (i.MX8QM/QXP/MQ).
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

uboot will have below error log when verify boot.img
avb_util.c:199: ERROR: Failed to allocate memory.

the default size of malloc is 36M. But we need to load boot.img
with malloc addr. enlarge the size of malloc to 64M.

Change-Id: I64d0403b0cc970128cdfd1eafe7a4680a92f7c25
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>

add macro which support A/B boot and AVB.
change CONFIG_ANDROID_THINGS_SUPPORT to CONFIG_ANDROID_AB_SUPPORT

Change-Id: I08688e7b19ec7b8d71c7adcd298ae2ccc1e309c3
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>

Pass bootloader metrics (nBLL, nBLE, KD, KL, AVB, ODT, SW)
to kernel by kernel cmdline.

Change-Id: Ibabff6844be86d028548d1ad697d948ef20590f3
Signed-off-by: ji.luo <ji.luo@nxp.com>

Secure Storage service in Trusty OS will compute
the encrypted mmc frame and the rpmb proxy inject the frame
to driver directly. So that need to export RPMB related
interface for Secure Storage proxy use.

Change-Id: I7f69831a20a440f597d323b610fa615fd4344d05
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

The lib provided ql-tipc communication channel with
Trusty OS.
Also the AVB, Keymaster and SecureStorage service
tipc client implement in this lib.

Change-Id: I0ab1ec9ee1b6f272b960c2e944008283c2c9249a
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

This function is replaced by AVB, we don't need the
CONFIG_FSL_BOOTCTL anymore.

Change-Id: Ib418a4ec565e2a098f0a0ce574710317619bbebe
Signed-off-by: ji.luo <ji.luo@nxp.com>

Add boot from QSPI configs for i.mx8qxp mek
Reviewed-by: Frank Li <frank.li@nxp.com>
Signed-off-by: Han Xu <han.xu@nxp.com>

Remove NAND partitions definitions in .h file.
Remove NAND related bcb operations.

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

Enlarge uboot entry and ENV offset, to leave space for TEE when using
fit.
Signed-off-by: Peng Fan <peng.fan@nxp.com>

If board_fit_config_name_match() doesn't match any configuration node,
then use the default one (if provided).
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
(cherry picked from commit 02035d00)

Support SPL FIT. Uboot text base are also modified, because spl
will load fit to address before text base of uboot.

According to new ATF request, modified the SPL stack/bss to OCRAM_S
space.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Some of the functions within spl_fit will be used for non spl purposes.
Instead of duplicating functions simply break the functions to be reused
into its own file.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Only add the new define to image.h, otherwise we see breakage
due to massive include leakage into host tools in some cases]
Signed-off-by: Tom Rini <trini@konsulko.com>
(cherry picked from commit 3863f840)

Add FASTBOOT_PARTITION_TEE definition for normal Android, this
will fix the build error in u-boot.

Change-Id: I7800e8370fbabe01d6d25e0a9f2b9e4578a805b0
Signed-off-by: ji.luo <ji.luo@nxp.com>

Fix CONFIG_BOOTDELAY redefine error for imx6ul-spriot board.

Change-Id: I949b6b815f9232e88cf72be853c8fca6f544b155
Signed-off-by: ji.luo <ji.luo@nxp.com>

On the imx7d, the bootloader currently in use resides on physical partition
boot0, and is currently referenced and hard coded as "bootloader".  But
this conflicts with the new bootloader_a and bootloader_b in the gpt, so
that "fastboot flash bootloader ..." flashes to bootloader_a or b. With this
fix boot0 can instead by explicitly referenced as
"fastboot flash bootloader0 ...".

"bootloader0" is currently the only bootloader on the system, but
once a/b bootloading is implemented it is going to be a more SPL-like
that loads either bootloader_a or bootloader_b.

Test: manually verified flashing bootloader0, bootloader, and bootloader_a
      and bootloader_b.

Change-Id: I03a85289f80cdf5f1b80dc07a962a143c6a351e1

Change-Id: I6ab29f86df748d173954400d534f1fb3c990f5b9
Signed-off-by: ji.luo <ji.luo@nxp.com>

This patch did:
1.Hard code the permanent attribute into u-boot.
2.Store first 112 bits of sha256(permanent attribute) hash into fuse.
(CONFIG_AVB_FUSE was removed because it's an irreversible operation)
3.Implement platform-specific operations defined in avb_atx_ops.h.

Change-Id: I65de9860e7c5ca1f7ebfbd87300faee0ccacaac3
Signed-off-by: ji.luo <ji.luo@nxp.com>

Duplicate defconfig for pico-imx6ul
by picosom-imx6ul-trusty_defconfig.

Change-Id: I559124e8e94eb40f943e0c4d68b9a6da821c6f41
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
(cherry picked from commit f019c752e4ac1ab210b9a09a00d48a6eaf3fefb3)

Change-Id: I8f5b69043a63034ab53d5926de0469a29132659f
Signed-off-by: ji.luo <ji.luo@nxp.com>

Change-Id: Iee122d36d83bc6e1ae007fb2f2053c6e9e7fc2a2
Signed-off-by: ji.luo <ji.luo@nxp.com>

RPMB keyblob stored in the last block of boot1
partition of MMC1. It will be load into
CAAM SEC_RAM and format into "keyslot" package.

This is enabled on pico7d and iopb6ul.

Change-Id: I5d9ab12e7d14945ebd8f926e20bed19b02e65009
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

Change-Id: I0aa12c5092953804e724c0534f2e81abd9ee47d5
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

Use trusty_os_init to load Trusty OS from CONFIG_TRUSTY_OS_ENTRY
before u-boot ready.

Add "tos" partition following the Android bootloader requirement.

Change-Id: I294df0ea1b44ffd12135a8325a73d1ac9399b5f5
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>

Add build config, dts and board codes for i.MX8QM MEK board. Supported
peripherals: UART, eMMC/SD, ENET, I2C, USB TYPEC DFP mode, flexspi.

DTS is ported from kernel commit a4fff857ea5f0a6513b943e0b0b842d5008785f1,
and enable more peripherals.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

The HS400 ES (Enhanced Strobe) has been added. This patch addes support
for HS400 for eMMC 5.0 devices. It needs tuning at HS200 to synchronize
command response.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Add HS400 ES mode support.

The flow is same as mmc_select_hs400es in kernel drivers/mmc/core/mmc.c.
With HS400 ES, there is no tuning needed.

With Toshiba 32GB Automotive eMMC5.1 on 8QXP ARM2 board, speed test:
'time mmc read 0x90000000 0 0x200000' shows that speed is 282MB/s.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Enable the USB3.0 XHCI driver to support host mode on MEK board.
The USB3.0 typec on MEK board uses PTN5110 TCPC as cc logic and power control. Different like
the device on ARM2 board, this IC needs driver to control and get status through I2C bus.

In this patch, we simply call the TCPC API to set to DFP mode, check the CC status for SS MUX select
and enable source VBUS power. When the USB host is shutdown, disable the VBUS power.
Signed-off-by: Ye Li <ye.li@nxp.com>

Export the board_name and board_rev for these boards:
- 8MQ EVK
- 8QM ARM2
- 8QXP ARM2
- 8QXP MEK

These two variables are used by an autotest u-boot script,
to request the needed BSP files.
Signed-off-by: Adrian Negreanu <adrian.negreanu@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Since we have many software running on QM/QXP, it is better to print their
commit ids in u-boot to know their versions.

This patch enables the CONFIG_ARCH_MISC_INIT. In arch_misc_init to gets the
commit ids for SCFW and ATF via their APIs and get the commit for imx-mkimage
at the end of u-boot.bin loading address.

Once the commit ids are acquired, show them in console like:
    BuildInfo: SCFW 45c567e8, IMX-MKIMAGE cc994971, ATF 0a9efa7

and set them to environment variables like:
    commit_atf=0a9efa7
    commit_mkimage=cc994971
    commit_scfw=45c567e8

If old software are running which does not support provide commit it, the patch
use 0 instead.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

The MEK board has two display ports, we enable the LVDS0 as default display. User
needs to connect miniSAS LVDS to HDMI card on the CPU board and set "panel" env variable
to "IT6263" to enable the display.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

i.MX6/7 uses fdt_addr while all i.MX8/8M uses fdtaddr, this causes
the env is inconsistent for the autotest u-boot scripts. So rename
the fdtaddr to fdt_addr.
Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>