diff options
| author | Tom Rini <[email protected]> | 2023-07-28 10:13:46 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-07-28 10:13:46 -0400 |
| commit | 012174e8c1a4cbc2162c2dafe26ef791356b6944 (patch) | |
| tree | 217cab38d6ca582bde5e2c0ba0f3e223437bba5a /cmd | |
| parent | 67957176a258d4288740acd2a18097d5b4ecf080 (diff) | |
| parent | 94da929b933668c4b9ece7d56a2a2bb5543198c9 (diff) | |
Merge tag 'u-boot-rockchip-20230728' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Enable pcie support for rk3568;
- Add boards:
rk3399: Radxa ROCK 4SE;
rk3328: Orange Pi R1 Plus, Orange Pi R1 Plus LTS
rk3568: FriendlyARM NanoPi R5S/R5C, Hardkernel ODROID-M1
rk3588: Edgeble Neu6B
- support OP-TEE with binman;
- support Winbond SPI flash;
- rk3588 usbdp phy support;
- dts and config updates for different boards;
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ini.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/ini.c b/cmd/ini.c index 81dfc4c4e83..35de2373e60 100644 --- a/cmd/ini.c +++ b/cmd/ini.c @@ -89,7 +89,7 @@ static char *memgets(char *str, int num, char **mem, size_t *memsize) end = *mem + *memsize; newline = 0; } - len = min((end - *mem) + newline, num); + len = min((int)(end - *mem) + newline, num); memcpy(str, *mem, len); if (len < num) str[len] = '\0'; |
