Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4d4de2adc74a5cd1b1f2cb8dd122e02cd5b97252

Authored by Peng Fan
Committed by Ye Li
1 parent 32943c7d81
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

MLK-17050 imx8m: print out atf commit 

Print out atf commit in U-Boot.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit df89948806c38e38119767a67ef0e18f24ac886b)
(cherry picked from commit 3a17aa1659fbfe675b74ada60a481d93bb557cdc)
(cherry picked from commit 60780b360889a4366159d342dd7e197faf0d1ca2)

Showing 5 changed files with 32 additions and 0 deletions Side-by-side Diff

arch/arm/mach-imx/imx8m/soc.c
Diff comments   View file @ 4d4de2a
... ... @@ -20,6 +20,7 @@
20 20 #include <fdt_support.h>
21 21 #include <fsl_wdog.h>
22 22 #include <imx_sip.h>
  23 +#include <generated/version_autogenerated.h>
23 24  
24 25 DECLARE_GLOBAL_DATA_PTR;
25 26  
... ... @@ -458,6 +459,33 @@
458 459 * spin for .5 seconds before reset
459 460 */
460 461 }
  462 +}
  463 +#endif
  464 +
  465 +#if defined(CONFIG_ARCH_MISC_INIT)
  466 +#define FSL_SIP_BUILDINFO 0xC2000003
  467 +#define FSL_SIP_BUILDINFO_GET_COMMITHASH 0x00
  468 +static void acquire_buildinfo(void)
  469 +{
  470 + uint64_t atf_commit = 0;
  471 +
  472 + /* Get ARM Trusted Firmware commit id */
  473 + atf_commit = call_imx_sip(FSL_SIP_BUILDINFO,
  474 + FSL_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0);
  475 + if (atf_commit == 0xffffffff) {
  476 + debug("ATF does not support build info\n");
  477 + atf_commit = 0x30; /* Display 0, 0 ascii is 0x30 */
  478 + }
  479 +
  480 + printf("\n BuildInfo:\n - ATF %s\n - %s\n\n", (char *)&atf_commit,
  481 + U_BOOT_VERSION);
  482 +}
  483 +
  484 +int arch_misc_init(void)
  485 +{
  486 + acquire_buildinfo();
  487 +
  488 + return 0;
461 489 }
462 490 #endif
configs/imx8mm_evk_defconfig
Diff comments   View file @ 4d4de2a
... ... @@ -14,6 +14,7 @@
14 14 CONFIG_ENV_OFFSET=0x400000
15 15 CONFIG_DM_GPIO=y
16 16 CONFIG_TARGET_IMX8MM_EVK=y
  17 +CONFIG_ARCH_MISC_INIT=y
17 18 CONFIG_SPL_MMC_SUPPORT=y
18 19 CONFIG_SPL_SERIAL_SUPPORT=y
19 20 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/imx8mn_ddr4_evk_defconfig
Diff comments   View file @ 4d4de2a
... ... @@ -14,6 +14,7 @@
14 14 CONFIG_ENV_OFFSET=0x400000
15 15 CONFIG_DM_GPIO=y
16 16 CONFIG_TARGET_IMX8MN_EVK=y
  17 +CONFIG_ARCH_MISC_INIT=y
17 18 CONFIG_SPL_MMC_SUPPORT=y
18 19 CONFIG_SPL_SERIAL_SUPPORT=y
19 20 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/imx8mp_evk_defconfig
Diff comments   View file @ 4d4de2a
... ... @@ -14,6 +14,7 @@
14 14 CONFIG_ENV_OFFSET=0x400000
15 15 CONFIG_DM_GPIO=y
16 16 CONFIG_TARGET_IMX8MP_EVK=y
  17 +CONFIG_ARCH_MISC_INIT=y
17 18 CONFIG_SPL_MMC_SUPPORT=y
18 19 CONFIG_SPL_SERIAL_SUPPORT=y
19 20 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/imx8mq_evk_defconfig
Diff comments   View file @ 4d4de2a
... ... @@ -8,6 +8,7 @@
8 8 CONFIG_DM_GPIO=y
9 9 CONFIG_TARGET_IMX8MQ_EVK=y
10 10 CONFIG_SPL_SERIAL_SUPPORT=y
  11 +CONFIG_ARCH_MISC_INIT=y
11 12 CONFIG_SPL=y
12 13 CONFIG_CSF_SIZE=0x2000
13 14 CONFIG_SPL_TEXT_BASE=0x7E1000