rockchip: mkimage: Use an existing macro instead of a decimal value
authorMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 18 Mar 2020 16:22:55 +0000 (17:22 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Thu, 26 Mar 2020 14:58:46 +0000 (22:58 +0800)
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@bootlin.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
tools/rkcommon.c

index c2382dfe5a1d02ead750a2b866aecaba8375916b..8f281f5901a4ab52c2b7f62d689eafdc6fc7b847 100644 (file)
@@ -307,11 +307,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;