From 3d6a3c3b084105014d8c6b8a101e955ce19b1295 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Fri, 30 Oct 2020 17:28:25 +0200 Subject: apalis/colibri-imx8x: disable CONFIG_OF_EMBED When CONFIG_OF_EMBED=y, the buildinfo is calculated wrongly: /* Get imx-mkimage commit id. * The imx-mkimage puts the commit hash behind the end of u-boot.bin */ mkimage_commit = (char *)(ulong)(CONFIG_SYS_TEXT_BASE + end_ofs + fdt_totalsize(gd->fdt_blob)); temp = mkimage_commit + 8; *temp = '\0'; With this change BuildInfo is shown correctly: BuildInfo: - SCFW 732e719a, SECO-FW 376e3c15, IMX-MKIMAGE 6745ccdc, ATF 8565561 - U-Boot 2020.04-00209-ga532101923-dirty Related-by: ELB-3188 Signed-off-by: Igor Opaniuk --- configs/apalis-imx8x_defconfig | 1 - configs/colibri-imx8x_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/configs/apalis-imx8x_defconfig b/configs/apalis-imx8x_defconfig index 60579c2b38..ea51264268 100644 --- a/configs/apalis-imx8x_defconfig +++ b/configs/apalis-imx8x_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_UUID=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-apalis" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 35d01ee4e5..54f101bd36 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -36,7 +36,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_UUID=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -- cgit v1.2.3