On 24/02/2018 16:58, Stefano Babic wrote:

Hi Tom,

some fixes, please pull from u-boot-imx, thanks!

Two fixes (Jagan's and Fabio's) were missing, new PR includes them:

The following changes since commit 02b0895c215e252cff50d9edf53a972d2bbbfd30:

Merge git://git.denx.de/u-boot-sh (2018-02-17 16:06:59 -0500)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 0339086bd9b99ae354c26e8758d5bab51ef84a3a:

imx: spl: Partially revert "spl: eMMC/SD: Provide one __weak spl_boot_mode() function" (2018-02-24 19:33:32 +0100)

---------------------------------------------------------------- Breno Lima (2): imx: hab: Keep CAAM clock enabled after authenticating additional images arm: imx: hab: Define HAB_RVT_BASE according to the processor version

Fabio Estevam (2): mx6sabresd: Select the CONFIG_EFI_PARTITION option imx: spl: Partially revert "spl: eMMC/SD: Provide one __weak spl_boot_mode() function"

Jagan Teki (4): imx6ul: engicam: Drop isiot-mmc defconfig imx6: engicam: Drop SPL_EXT_SUPPORT imx6q: engicam: Use SPL_LOAD_FIT for MMC boards ARM: dts: i.MX6QDL: icore-rqs: Fix eMMC detection during SPL

Maxim Yu. Osipov (1): Revert "mx6: ddr: Allow changing REFSEL and REFR fields"

Stefano Babic (1): mx6: fix MAINTAINERS for Engicam i.CoreM6 1.5 MIPI

Utkarsh Gupta (3): imx: hab: Ensure the IVT DCD pointer is Null prior to calling HAB authenticate function. imx: hab: Check if CSF is valid before authenticating image imx: hab: Check if CSF contains deprecated commands

arch/arm/dts/Makefile | 1 - arch/arm/dts/imx6qdl-icore-rqs.dtsi | 2 ++ arch/arm/dts/imx6ul-isiot-mmc.dts | 50 -------------------------------------------- arch/arm/include/asm/mach-imx/hab.h | 27 +++++++++++++++++------- arch/arm/mach-imx/hab.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------- arch/arm/mach-imx/mx6/Kconfig | 1 - arch/arm/mach-imx/spl.c | 23 +++++++++++++++++++++ board/compulab/cm_fx6/spl.c | 2 -- board/engicam/imx6q/MAINTAINERS | 8 +++++++- board/engicam/imx6ul/MAINTAINERS | 1 - configs/imx6dl_icore_nand_defconfig | 47 ++++++++++++++++++++++++++++++++++++++++++ configs/{imx6ul_isiot_mmc_defconfig => imx6q_icore_nand_defconfig} | 23 ++++++++++++--------- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 3 ++- configs/mx6sabresd_defconfig | 1 + 18 files changed, 237 insertions(+), 179 deletions(-) delete mode 100644 arch/arm/dts/imx6ul-isiot-mmc.dts create mode 100644 configs/imx6dl_icore_nand_defconfig rename configs/{imx6ul_isiot_mmc_defconfig => imx6q_icore_nand_defconfig} (64%)