diff options
| author | Tom Rini <[email protected]> | 2026-06-04 18:56:57 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-06-04 18:56:57 -0600 |
| commit | 75daa277941702bf58c88d65c0cb6ed962899d9e (patch) | |
| tree | 9a80bbb4f92755d148dd96b56981f4b6cad3dc7e /drivers | |
| parent | 74007f24a3aca13b70da6a2c098b830ad9e60804 (diff) | |
| parent | 0fba623e4fd421bbea6e44156ea15a135d08576d (diff) | |
Merge tag 'u-boot-imx-master-20260604' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/30353
- Fix RAM size calculation on verdin-imx95.
- Fix boot from SPI on i.MX8MM.
- Fix boot abort on kontron-sl-mx6ul.
- Fix the imx8 CPU market segment report.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpu/imx8_cpu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 785c299eca5..3473712a423 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -222,7 +222,7 @@ static int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) ret = snprintf(buf, size, "NXP i.MX%s Rev%s %s at %u MHz", plat->type, plat->rev, plat->name, plat->freq_mhz); - if (IS_ENABLED(CONFIG_IMX_TMU)) { + if (!IS_ENABLED(CONFIG_IMX8)) { /* imx8 does not have segment fuse */ switch (get_cpu_temp_grade(&minc, &maxc)) { case TEMP_AUTOMOTIVE: grade = "Automotive temperature grade"; @@ -231,7 +231,10 @@ static int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size) grade = "Industrial temperature grade"; break; case TEMP_EXTCOMMERCIAL: - grade = "Extended Consumer temperature grade"; + if (IS_ENABLED(CONFIG_ARCH_IMX9)) + grade = "Extended Industrial temperature grade"; + else + grade = "Extended Consumer temperature grade"; break; default: grade = "Consumer temperature grade"; |