Message ID | 20200318162255.26796-1-miquel.raynal@bootlin.com |
---|---|
State | Accepted |
Commit | e5a405583f5ce9576c5084a178622e2fdd49cb23 |
Headers | show |
Series | rockchip: mkimage: Use an existing macro instead of a decimal value | expand |
On 2020/3/19 ??12:22, Miquel Raynal wrote: > Depending on the SoC, a header of four characters is prepended to the > image. There is already a macro defining the number of characters: > RK_SPL_HDR_SIZE, so use it instead of hardcoding "4". > > Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > tools/rkcommon.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/rkcommon.c b/tools/rkcommon.c > index 0d908daee80..a80899e2806 100644 > --- a/tools/rkcommon.c > +++ b/tools/rkcommon.c > @@ -246,11 +246,13 @@ static int rkcommon_parse_header(const void *buf, struct header0_info *header0, > rkcommon_offset_to_spi(hdr1_offset)); > > for (i = 0; i < ARRAY_SIZE(spl_infos); i++) { > - if (!memcmp(&hdr1_sdmmc->magic, spl_infos[i].spl_hdr, 4)) { > + if (!memcmp(&hdr1_sdmmc->magic, spl_infos[i].spl_hdr, > + RK_SPL_HDR_SIZE)) { > if (spl_info) > *spl_info = &spl_infos[i]; > return IH_TYPE_RKSD; > - } else if (!memcmp(&hdr1_spi->magic, spl_infos[i].spl_hdr, 4)) { > + } else if (!memcmp(&hdr1_spi->magic, spl_infos[i].spl_hdr, > + RK_SPL_HDR_SIZE)) { > if (spl_info) > *spl_info = &spl_infos[i]; > return IH_TYPE_RKSPI;
diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 0d908daee80..a80899e2806 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -246,11 +246,13 @@ static int rkcommon_parse_header(const void *buf, struct header0_info *header0, rkcommon_offset_to_spi(hdr1_offset)); for (i = 0; i < ARRAY_SIZE(spl_infos); i++) { - if (!memcmp(&hdr1_sdmmc->magic, spl_infos[i].spl_hdr, 4)) { + if (!memcmp(&hdr1_sdmmc->magic, spl_infos[i].spl_hdr, + RK_SPL_HDR_SIZE)) { if (spl_info) *spl_info = &spl_infos[i]; return IH_TYPE_RKSD; - } else if (!memcmp(&hdr1_spi->magic, spl_infos[i].spl_hdr, 4)) { + } else if (!memcmp(&hdr1_spi->magic, spl_infos[i].spl_hdr, + RK_SPL_HDR_SIZE)) { if (spl_info) *spl_info = &spl_infos[i]; return IH_TYPE_RKSPI;
Depending on the SoC, a header of four characters is prepended to the image. There is already a macro defining the number of characters: RK_SPL_HDR_SIZE, so use it instead of hardcoding "4". Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com> --- tools/rkcommon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)