diff options
| author | Peng Fan <peng.fan@nxp.com> | 2017-12-04 15:29:20 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2017-12-04 15:59:09 +0800 |
| commit | df89948806c38e38119767a67ef0e18f24ac886b (patch) | |
| tree | 046fbeb653a49b13f15062e9c58d6131ed854e24 | |
| parent | 696326cba50890331370e18ef41a7f63293def8f (diff) | |
MLK-17050 imx8m: print out atf commit
Print out atf commit in U-Boot.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | arch/arm/cpu/armv8/imx8m/soc.c | 28 | ||||
| -rw-r--r-- | configs/imx8mq_evk_defconfig | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/imx8m/soc.c b/arch/arm/cpu/armv8/imx8m/soc.c index 5b17b3363c..28ecd59d4f 100644 --- a/arch/arm/cpu/armv8/imx8m/soc.c +++ b/arch/arm/cpu/armv8/imx8m/soc.c @@ -15,6 +15,7 @@ #include <errno.h> #include <fdt_support.h> #include <fsl_wdog.h> +#include <generated/version_autogenerated.h> DECLARE_GLOBAL_DATA_PTR; @@ -551,3 +552,30 @@ void reset_cpu(ulong addr) */ } } + +#if defined(CONFIG_ARCH_MISC_INIT) +#define FSL_SIP_BUILDINFO 0xC2000003 +#define FSL_SIP_BUILDINFO_GET_COMMITHASH 0x00 +static void acquire_buildinfo(void) +{ + uint64_t atf_commit = 0; + + /* Get ARM Trusted Firmware commit id */ + atf_commit = call_imx_sip(FSL_SIP_BUILDINFO, + FSL_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0); + if (atf_commit == 0xffffffff) { + debug("ATF does not support build info\n"); + atf_commit = 0x30; /* Display 0, 0 ascii is 0x30 */ + } + + printf("\n BuildInfo:\n - ATF %s\n - %s\n\n", (char *)&atf_commit, + U_BOOT_VERSION); +} + +int arch_misc_init(void) +{ + acquire_buildinfo(); + + return 0; +} +#endif diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index ef1be74d88..f1ca4b298c 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_IMX8M=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_IMX8MQ_EVK=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg" +CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_OF_LIBFDT=y |