diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-04 12:21:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-04 12:21:45 -0400 |
| commit | e22b1a54942d9003b10564325a34e3cf767556ce (patch) | |
| tree | f244c37d0c1089b7e1858829e275be47f6f48ede /drivers/qe | |
| parent | 8889e984154f749047dc9ed3b4cd8b734dde66f2 (diff) | |
| parent | e16b604ecf5701cc0ab4437bccfd65468035740b (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/qe')
| -rw-r--r-- | drivers/qe/qe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 84e1433d9e..08620b23a7 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -313,9 +313,10 @@ static void qe_upload_microcode(const void *base, if (ucode->major || ucode->minor || ucode->revision) printf("QE: uploading microcode '%s' version %u.%u.%u\n", - ucode->id, ucode->major, ucode->minor, ucode->revision); + (char *)ucode->id, (u16)ucode->major, (u16)ucode->minor, + (u16)ucode->revision); else - printf("QE: uploading microcode '%s'\n", ucode->id); + printf("QE: uploading microcode '%s'\n", (char *)ucode->id); /* Use auto-increment */ out_be32(&qe_immr->iram.iadd, be32_to_cpu(ucode->iram_offset) | @@ -434,7 +435,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) * saved microcode information and put in the new. */ memset(&qe_firmware_info, 0, sizeof(qe_firmware_info)); - strcpy(qe_firmware_info.id, (char *)firmware->id); + strncpy(qe_firmware_info.id, (char *)firmware->id, 62); qe_firmware_info.extended_modes = firmware->extended_modes; memcpy(qe_firmware_info.vtraps, firmware->vtraps, sizeof(firmware->vtraps)); |