ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 07:46:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

firmware-utils: mkmerakifw-old: Add le32 support

Browse Source 
mkmerakifw-old was created for the z1 which uses the AR9344 SoC with
be32 addressing. The MX64/MX65 devices use the same header style, however
these boards use a BCM NSP SoC with le32 addressing.

Since we may be booting initramfs images with this header, which may be
of any size, within reason, board->imagelen is set to 0. The kernel
image shoule be limited in the image Makefile.

Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Matthew Hagan 2021-08-05 22:24:40 +00:00 committed by Rafał Miłecki
parent f55f1dbaad
commit 6f39649555
1 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
tools/firmware-utils/src/mkmerakifw-old.c
View File

@ -44,6 +44,7 @@ struct board_info {
uint32_t imagelen; uint32_t imagelen;
uint32_t load_addr; uint32_t load_addr;
uint32_t entry; uint32_t entry;
bool le32;
}; };
/* /*
@ -62,7 +63,16 @@ static const struct board_info boards[] = {
.magic = 0x4d495053, .magic = 0x4d495053,
.imagelen = 0x007e0000, .imagelen = 0x007e0000,
.load_addr = 0x80060000, .load_addr = 0x80060000,
.entry = 0x80060000 .entry = 0x80060000,
.le32 = 0,
}, {
.id = "mx64",
.description = "Meraki MX64/MX65",
.magic = 0x4d495053,
.imagelen = 0x00000000,
.load_addr = 0x60008000,
.entry = 0x60008000,
.le32 = 1,
}, { }, {
/* terminating entry */ /* terminating entry */
} }
@ -123,9 +133,11 @@ static void usage(int status)
exit(status); exit(status);
} }
static void writel(unsigned char *buf, size_t offset, uint32_t value) static void writel(unsigned char *buf, size_t offset, uint32_t value, bool le32)
{ {
value = htonl(value); if (!le32)
value = htonl(value);
memcpy(buf + offset, &value, sizeof(uint32_t)); memcpy(buf + offset, &value, sizeof(uint32_t));
} }
@ -201,21 +213,25 @@ static inline uint32_t crc32_accumulate_8(const uint32_t crc, const uint8_t ch)
return crc32_table[(crc ^ ch) & 0xff] ^ (crc >> 8); return crc32_table[(crc ^ ch) & 0xff] ^ (crc >> 8);
} }
static void crc32_csum(uint8_t *buf, const size_t len) static void crc32_csum(uint8_t *buf, const size_t len, bool le32)
{ {
int j, k, l, m;
uint32_t crc; uint32_t crc;
size_t i; size_t i;
crc = ~0; crc = ~0;
k = le32 * 3;
l = le32 * -2 + 1;
for (i = 0; i < len; i += 4) { for (i = 0; i < len; i += 4) {
crc = crc32_accumulate_8(crc, buf[i + 3]); for (j = 3; j >= 0; j -= 1) {
crc = crc32_accumulate_8(crc, buf[i + 2]); m = (j - k) * l;
crc = crc32_accumulate_8(crc, buf[i + 1]); crc = crc32_accumulate_8(crc, buf[i + m]);
crc = crc32_accumulate_8(crc, buf[i]); }
} }
crc = ~crc; crc = ~crc;
writel(buf, HDR_OFF_CHECKSUM, crc); writel(buf, HDR_OFF_CHECKSUM, crc, le32);
} }
@ -229,11 +245,14 @@ static int meraki_build_hdr(const struct board_info *board, const size_t klen,
size_t rc; size_t rc;
buflen = board->imagelen; buflen = board->imagelen;
kspace = buflen - HDR_LENGTH;
if (klen > kspace) { if (buflen > 0) {
ERR("kernel file is too big - max size: 0x%08lX\n", kspace); kspace = buflen - HDR_LENGTH;
return EXIT_FAILURE;
if (klen > kspace) {
ERR("kernel file is too big - max size: 0x%08lX\n", kspace);
return EXIT_FAILURE;
}
} }
/* If requested, resize buffer to remove padding */ /* If requested, resize buffer to remove padding */
@ -253,23 +272,23 @@ static int meraki_build_hdr(const struct board_info *board, const size_t klen,
fread(kernel, klen, 1, in); fread(kernel, klen, 1, in);
/* Write magic values and filler */ /* Write magic values and filler */
writel(buf, HDR_OFF_MAGIC1, board->magic); writel(buf, HDR_OFF_MAGIC1, board->magic, board->le32);
writel(buf, HDR_OFF_FILLER0, 0); writel(buf, HDR_OFF_FILLER0, 0, board->le32);
writel(buf, HDR_OFF_FILLER1, 0); writel(buf, HDR_OFF_FILLER1, 0, board->le32);
writel(buf, HDR_OFF_FILLER2, 0); writel(buf, HDR_OFF_FILLER2, 0, board->le32);
/* Write load and kernel entry point address */ /* Write load and kernel entry point address */
writel(buf, HDR_OFF_LOAD_ADDR, board->load_addr); writel(buf, HDR_OFF_LOAD_ADDR, board->load_addr, board->le32);
writel(buf, HDR_OFF_ENTRY, board->entry); writel(buf, HDR_OFF_ENTRY, board->entry, board->le32);
/* Write header and image length */ /* Write header and image length */
writel(buf, HDR_OFF_IMAGELEN, klen); writel(buf, HDR_OFF_IMAGELEN, klen, board->le32);
/* this gets replaced later, after the checksum has been calculated */ /* this gets replaced later, after the checksum has been calculated */
writel(buf, HDR_OFF_CHECKSUM, 0); writel(buf, HDR_OFF_CHECKSUM, 0, board->le32);
/* Write checksum */ /* Write checksum */
crc32_csum(buf, klen + HDR_LENGTH); crc32_csum(buf, klen + HDR_LENGTH, board->le32);
rc = fwrite(buf, buflen, 1, out); rc = fwrite(buf, buflen, 1, out);