Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-03 10:17:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'u-boot-imx-master-20241115' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

Browse source 
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/23373

- Fix a missing break for CMD_DCD_SKIP reported by Coverty on imx8image.
- Fix i.MX thermal threshold regression.
This commit is contained in:
Tom Rini 2024-11-15 13:10:36 -06:00
commit c04999d999
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-imx/fdt.c
View file

@ -115,7 +115,7 @@ int fixup_thermal_trips(void *blob, const char *name)
temp = 0; temp = 0;
if (!strcmp(type, "critical")) if (!strcmp(type, "critical"))
temp = 1000 * (maxc - 5); temp = 1000 * maxc;
else if (!strcmp(type, "passive")) else if (!strcmp(type, "passive"))
temp = 1000 * (maxc - 10); temp = 1000 * (maxc - 10);
if (temp) { if (temp) {

1
tools/imx8image.c
View file

@ -93,6 +93,7 @@ static void parse_cfg_cmd(image_t *param_stack, int32_t cmd, char *token,
case CMD_DCD_SKIP: case CMD_DCD_SKIP:
if (!strncmp("true", token, 4)) if (!strncmp("true", token, 4))
dcd_skip = true; dcd_skip = true;
break;
case CMD_FUSE_VERSION: case CMD_FUSE_VERSION:
fuse_version = (uint8_t)(strtoll(token, NULL, 0) & 0xFF); fuse_version = (uint8_t)(strtoll(token, NULL, 0) & 0xFF);
break; break;