Hoi, and "merde", this should have been v3, and misses the changelog... v2: was: [PATCH v2 1/1] ARM: i.MX8M: smccc: fix firmware_atf check v3: redid patch with suggested common config switch regards Johannes ________________________________________ From: Johannes Schneider <johannes.schneider@xxxxxxxxxxxxxxxxxxxx> Sent: Thursday, January 12, 2023 07:07 To: barebox@xxxxxxxxxxxxxxxxxxx Cc: SCHNEIDER Johannes Subject: [PATCH v2] ARM: i.MX8M: smccc: allow SIP_BUILDINFO call on all imx8m variants By adding a common config switch, the imx8m_init code becomes generic for all board variants (and slightly less confusing). Signed-off-by: Johannes Schneider <johannes.schneider@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-imx/imx8m.c | 2 +- firmware/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/imx8m.c b/arch/arm/mach-imx/imx8m.c index 9758525b54..4399dc7dd5 100644 --- a/arch/arm/mach-imx/imx8m.c +++ b/arch/arm/mach-imx/imx8m.c @@ -61,7 +61,7 @@ static int imx8m_init(const char *cputypestr) pr_info("%s unique ID: %llx\n", cputypestr, imx8m_uid()); if (IS_ENABLED(CONFIG_ARM_SMCCC) && - IS_ENABLED(CONFIG_FIRMWARE_IMX8MQ_ATF)) { + IS_ENABLED(CONFIG_FIRMWARE_IMX8M_ATF)) { arm_smccc_smc(IMX_SIP_BUILDINFO, IMX_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0, 0, 0, 0, &res); diff --git a/firmware/Kconfig b/firmware/Kconfig index b4a6fd9137..d3e79b4ef5 100644 --- a/firmware/Kconfig +++ b/firmware/Kconfig @@ -14,15 +14,19 @@ config FIRMWARE_IMX_DDR4_PMU_TRAIN config FIRMWARE_IMX8MM_ATF bool + select FIRMWARE_IMX8M_ATF config FIRMWARE_IMX8MN_ATF bool + select FIRMWARE_IMX8M_ATF config FIRMWARE_IMX8MP_ATF bool + select FIRMWARE_IMX8M_ATF config FIRMWARE_IMX8MQ_ATF bool + select FIRMWARE_IMX8M_ATF config FIRMWARE_CCBV2_OPTEE bool -- 2.25.1