diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 2 | ||||
| -rw-r--r-- | lib/zlib/tf_gunzip.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index 9dfe46a2f..3c64d3caa 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -198,7 +198,7 @@ func zeromem_dczva * Check for M bit (MMU enabled) of the current SCTLR_EL(1|3) * register value and panic if the MMU is disabled. */ -#if defined(IMAGE_BL1) || defined(IMAGE_BL31) +#if defined(IMAGE_BL1) || defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) mrs tmp1, sctlr_el3 #else mrs tmp1, sctlr_el1 diff --git a/lib/zlib/tf_gunzip.c b/lib/zlib/tf_gunzip.c index f07c380a1..574d871b0 100644 --- a/lib/zlib/tf_gunzip.c +++ b/lib/zlib/tf_gunzip.c @@ -89,8 +89,8 @@ int gunzip(uintptr_t *in_buf, size_t in_len, uintptr_t *out_buf, ret = (zret == Z_MEM_ERROR) ? -ENOMEM : -EIO; } - VERBOSE("zlib: %d byte input\n", stream.total_in); - VERBOSE("zlib: %d byte output\n", stream.total_out); + VERBOSE("zlib: %lu byte input\n", stream.total_in); + VERBOSE("zlib: %lu byte output\n", stream.total_out); *in_buf = (uintptr_t)stream.next_in; *out_buf = (uintptr_t)stream.next_out; |