| Message ID | 1414186751-3061-2-git-send-email-andreas.devel@googlemail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Friday, October 24, 2014 at 11:39:10 PM, andreas.devel@googlemail.com wrote: > From: Andreas Bießmann <andreas.devel@googlemail.com> > > socfpgaimage utilizes htole32 and friends, unfortunately these functions > are not available on darwin. Fix it by using the cpu_to_le32 and friends > defined in compiler.h as other parts in mkimage do. > > This patch fixes the following error: > ---8<--- > HOSTCC tools/socfpgaimage.o > tools/socfpgaimage.c:77:22: warning: implicit declaration of function > 'htole32' is invalid in C99 [-Wimplicit-function-declaration] > header.validation = htole32(VALIDATION_WORD); > ^ > tools/socfpgaimage.c:80:22: warning: implicit declaration of function > 'htole16' is invalid in C99 [-Wimplicit-function-declaration] > header.length_u32 = htole16(length_bytes/4); > ^ > tools/socfpgaimage.c:95:6: warning: implicit declaration of function > 'le32toh' is invalid in C99 [-Wimplicit-function-declaration] if > (le32toh(header.validation) != VALIDATION_WORD) > ^ > tools/socfpgaimage.c:97:6: warning: implicit declaration of function > 'le16toh' is invalid in C99 [-Wimplicit-function-declaration] if > (le16toh(header.checksum) != hdr_checksum(&header)) > ^ > 4 warnings generated. > ... > HOSTLD tools/dumpimage > Undefined symbols for architecture x86_64: > "_htole16", referenced from: > _socfpgaimage_set_header in socfpgaimage.o > "_htole32", referenced from: > _socfpgaimage_set_header in socfpgaimage.o > "_le16toh", referenced from: > _verify_buffer in socfpgaimage.o > "_le32toh", referenced from: > _verify_buffer in socfpgaimage.o > ld: symbol(s) not found for architecture x86_64 > --->8--- > > Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Acked-by: Marek Vasut <marex@denx.de> Best regards, Marek Vasut
diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 396d8a5..917873e 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -74,12 +74,12 @@ static uint16_t hdr_checksum(struct socfpga_header *header) static void build_header(uint8_t *buf, uint8_t version, uint8_t flags, uint16_t length_bytes) { - header.validation = htole32(VALIDATION_WORD); + header.validation = cpu_to_le32(VALIDATION_WORD); header.version = version; header.flags = flags; - header.length_u32 = htole16(length_bytes/4); + header.length_u32 = cpu_to_le16(length_bytes/4); header.zero = 0; - header.checksum = htole16(hdr_checksum(&header)); + header.checksum = cpu_to_le16(hdr_checksum(&header)); memcpy(buf, &header, sizeof(header)); } @@ -92,12 +92,12 @@ static int verify_header(const uint8_t *buf) { memcpy(&header, buf, sizeof(header)); - if (le32toh(header.validation) != VALIDATION_WORD) + if (le32_to_cpu(header.validation) != VALIDATION_WORD) return -1; - if (le16toh(header.checksum) != hdr_checksum(&header)) + if (le16_to_cpu(header.checksum) != hdr_checksum(&header)) return -1; - return le16toh(header.length_u32) * 4; + return le16_to_cpu(header.length_u32) * 4; } /* Sign the buffer and return the signed buffer size */ @@ -116,7 +116,7 @@ static int sign_buffer(uint8_t *buf, /* Calculate and apply the CRC */ calc_crc = ~pbl_crc32(0, (char *)buf, len); - *((uint32_t *)(buf + len)) = htole32(calc_crc); + *((uint32_t *)(buf + len)) = cpu_to_le32(calc_crc); if (!pad_64k) return len + 4; @@ -150,7 +150,7 @@ static int verify_buffer(const uint8_t *buf) calc_crc = ~pbl_crc32(0, (const char *)buf, len); - buf_crc = le32toh(*((uint32_t *)(buf + len))); + buf_crc = le32_to_cpu(*((uint32_t *)(buf + len))); if (buf_crc != calc_crc) { fprintf(stderr, "CRC32 does not match (%08x != %08x)\n",