Bug: 79093530
Test: iMX7D U-Boot has CONFIG_BOOTDELAY=3
Change-Id: I31fbe88ef522a3d05510d810a14eb7f628cb479b

Bug: 78601846
Test: Boots with new boot image layout.
Change-Id: I7c2cc7f62ad58756d76ef0d83ca6729fea9c07e9

In bootloader stage, the keymaster need to be
configured by some parameters. Then it will
be available in Android userspace.

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

As u-boot use no SMP so not care shareable cache.
But the Trusty OS will check the memory attr for
inner shareable.
So add the flag to mark the memory to be inner
shareable for ARMv7 only.

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

Refine ql-tipc Makefile to pass the u-boot
build which use uboot.mk.

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

Update to commit bb39a2b12dce8b6c9df9012faf231648de795e6d

List of changes:

bb39a2b ql-tipc: Support ATAP operations from bootloader
62b8d61 ql-tipc: Move serialization code to keymaster_serializable
8283307 avoid dead loop if tipc is closed by peer
cf3f7f5 [ql-tipc] Refactor U-boot rpmb_storage_send
4b1d74d Make logging more readable

Test: build + manual TIPC tests

Change-Id: Ib2c0e7a4a8313b6e62c1fe4f58b923c0c2d3f695

When running fastboot reboot bootloder, fastboot fails to kick of the
USB transmit of OKAY back to the host. Rearranged the code to match that of
cb_reboot, where it performs the reset in the completion routine.

Bug: 74613660
Test: Ran "fastboot reboot bootloader" and no longer see the FAILED message.
Change-Id: I827a4e5b9f478da2343486f46710e959a5fc22a1

This CL disables u-boot logo. U-boot logo screen appears at very short
time duration (lesser than 2.5 secs) and it is hard to make u-boot
screen configurable.

Bug: 74301019
Test: no u-boot logo seen
Change-Id: I52e0fe637e78bcd2c74adcca7fe59231a8449928

Change-Id: Ia8bb6634aa00d7a5dc59a7a33845613155543eaa
Signed-off-by: Chen Guoyin <guoyin.chen@nxp.com>

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

Enlarge CONFIG_SYS_CBSIZE to 2048 Bytes because kernel
cmdline is large than 1024 Bytes.

Test: Entire  kernel cmdline was print out by console.

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

Disable inclusion of unused EFI loader as this is the cause of
the build race condition.

Bug: 73019385

Change-Id: Ie2f9ce6492c768c88f89e80262c1feb03750e0c5

Load kernel.dtb from oem_bootloader root, or fall
back to default behavior if that doesn't work.
oem_bootloader should be ext2 or ext4.

Bug: 72662957
Test: U-Boot loads modified dtb from
      oem_bootloader, or loads original dtb if
      kernel.dtb doesn't exist or oem_bootloader
      isn't formatted

Change-Id: Ic93b572a482e85726e2fa0792997348c855f41a1

This patch add support for iot_imx8mq.

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

Set SMC fuse mechanism as default for QX/QM configs to enable
writing to fuses by default.
Signed-off-by: Teo Hall <teo.hall@nxp.com>

Modify the fuse subsystem to add a SMC call
for writing/reading to the OTP memory.
Signed-off-by: Teo Hall <teo.hall@nxp.com>

Make the u-boot config file name start with "imx" instead of "mx".

Change-Id: Ifd5a5cef88f8f6e52afc9aed28b5a33c65cc52af
Signed-off-by: yong.zhang <yong.zhang_2@nxp.com>

Enable the SPL SDP for iMX8MM EVK. So that when booting from USB serial
download mode, the SPL will enter SDP to download FIT image from USB host
(uuu tool) and boot into FIT image.

The SDP driver needs larger malloc pool size, so extend the SPL malloc pool
to 12KB and reduce the SPL BSS MAX to 4KB because BSS actual size is about 1KB.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit deb9c2bbebc4958ff35157159f68272ce1746143)

Since we don't support DM in SPL, undefine the DM USB in SPL build,
so it can use non-DM USB driver.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 1e02825ab852f31111b875af9b84f82a974df64c)

The SPL SDP is configured as BOOT_DEVICE_BOARD, so when booting from
USB, change its type to BOOT_DEVICE_BOARD, so we can use SDP.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 433032d7d672d4aa18d1399ffaa9449f00bc7d09)

Current SDP only supports to boot legacy image(raw). Add support to
boot FIT image.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 2c7b640aefe7e807248c9f5e35e2f8c76a8e23d9)

The SDP protocol contains multiple 32bit pointers. Add a helper function
to get a valid pointer from these values and use it.

This fixes the following warnings:

drivers/usb/gadget/f_sdp.c: In function ‘sdp_rx_data_complete’:
drivers/usb/gadget/f_sdp.c:347:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
   memcpy((void *)sdp->dnl_address, req->buf + 1, datalen);
          ^
drivers/usb/gadget/f_sdp.c: In function ‘sdp_jump_imxheader’:
drivers/usb/gadget/f_sdp.c:625:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
  entry = (void *)headerv2->entry;
          ^
drivers/usb/gadget/f_sdp.c: In function ‘sdp_handle_in_ep’:
drivers/usb/gadget/f_sdp.c:668:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
   memcpy(&data[1], (void *)sdp_func->dnl_address, datalen);
                    ^
drivers/usb/gadget/f_sdp.c:679:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
   status = sdp_jump_imxheader((void *)sdp_func->jmp_address);
                               ^
Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit a64a614d)

Cosmetic change.
Signed-off-by: Andre Heider <a.heider@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
(cherry picked from commit 24ccd0c8)

This prevents board resets when calling sdp command on boards which have a watchdog.
Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Stefan Agner <stefan.agner@toradex.com>
(cherry picked from commit 8171dac0)

Instead of having every board file to add its own g_dnl_bind_fixup()
implementation, move it to the common imx6 SPL code.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
(cherry picked from commit 511db3bf)

Document the U-Boot Serial Download Protocol implementation and
some typical use cases.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
(cherry picked from commit f9c39d95)

Add USB serial download protocol support to SPL. If the SoC started
in recovery mode the SPL will immediately switch to SDP and wait for
further downloads/commands from the host side.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
(cherry picked from commit a3774c1c)

Add a new command to start USB Serial Download Protocol (SDP)
state machine.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit 2f005695)

Support U-Boot images in SPL so that u-boot.img files can be
directly downloaded and executed. Furthermore support U-Boot
scripts download and execution in full U-Boot so that custom
recovery actions can be downloaded from the host in a third
step.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Stefano Babic <sbabic@denx.de>
(cherry picked from commit ccd7a4d2)

Add SDP (Serial Downloader Protocol) implementation for U-Boot. The
protocol is used in NXP SoC's boot ROM and allows to download program
images. Beside that, it can also be used to read/write registers and
download complete Device Configuration Data (DCD) sets. This basic
implementation supports downloading images with the imx header format
reading and writing registers.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
(cherry picked from commit 5661f08a)

Move the imximage.h header file to a common location so we can make
use of it from U-Boot too.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Reviewed-by: Łukasz Majewski <lukma@denx.de>
(cherry picked from commit 4e76c077)

When calculate the temperature in millicelsius, the tenths are
handled incorrectly.
Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>

Since the DRC_0 thermal is disabled by SCFW, we should use SC_R_SYSTEM for
CPU thermal. Update the resources table to align with kernel.
Signed-off-by: Ye Li <ye.li@nxp.com>

Add SPL/u-boot board codes and DDR4 settings for iMX8MM DDR4 validation board.
DDR overnight stress test is passed.

Supported modules:
    SD/eMMC, I2C, ENET, Flexspi, UART and USB.

Build config:
    imx8mm_ddr4_val_defconfig
Signed-off-by: Ye Li <ye.li@nxp.com>

Add a DTS file for iMX8MM DDR4 validation board whose design is similar
as iMX8MM EVK.
Signed-off-by: Ye Li <ye.li@nxp.com>

The DRAM PLL generates clock to both DRAM controller & PHY, from 166.7MHz to 800MHz.
So it can't be used when we need lower DDR frequency.
The DRAM PHY supports a bypass mode to allow lower frequency operation from DDR-50 to
DDR-666. In this mode, the PLL inside PHY is disabled, the PHY clock is provided externally
as BypassPclk which is generated from dram_alt_clk_root.

We add APIs for this bypass mode, to support frequencies for DDR-100, DDR-250 and DDR-400,
which are needed when training DDR4.
Signed-off-by: Ye Li <ye.li@nxp.com>

Enable TZASC functionality.
Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Acked-by : Jacky Bai <ping.bai@nxp.com>

Because the Xen u-boot is using OTG port not typec port, the CONFIG_FASTBOOT_USB_DEV
should set to 0 not 1. Otherwise the fastboot will fail.

Remove duplicated "/dts-v1/;" from Xen DTB.
Signed-off-by: Ye Li <ye.li@nxp.com>

Remove the undef of CONFIG_FASTBOOT_USB_DEV from header file and set it
to 1 in defconfig. So no matter what parameter is used for "fastboot"
command, it always use USB typec port.
Signed-off-by: Ye Li <ye.li@nxp.com>

Fix build warning below:

cmd/fastboot.c: In function ‘do_fastboot’:
cmd/fastboot.c:19:8: warning: variable ‘usb_controller’ set but not used [-Wunused-but-set-variable]
char *usb_controller;
Signed-off-by: Ye Li <ye.li@nxp.com>