diff options
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/cmd_sign.c | 2 | ||||
| -rw-r--r-- | futility/file_type_bios.c | 2 | ||||
| -rw-r--r-- | futility/file_type_rwsig.c | 4 | ||||
| -rw-r--r-- | futility/file_type_usbpd1.c | 2 | ||||
| -rw-r--r-- | futility/vb1_helper.c | 24 |
5 files changed, 17 insertions, 17 deletions
diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index 109287c9..c69f7124 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -223,7 +223,7 @@ int ft_sign_kern_preamble(const char *name, uint8_t *buf, uint32_t len, fprintf(stderr, "Unable to sign kernel blob\n"); return 1; } - VB2_DEBUG("vblock_size = 0x%" PRIx64 "\n", vblock_size); + VB2_DEBUG("vblock_size = %#x\n", vblock_size); if (sign_option.create_new_outfile) { /* Write out what we've been asked for */ diff --git a/futility/file_type_bios.c b/futility/file_type_bios.c index 9d45269c..7e805f50 100644 --- a/futility/file_type_bios.c +++ b/futility/file_type_bios.c @@ -467,7 +467,7 @@ int ft_sign_bios(const char *name, uint8_t *buf, uint32_t len, void *data) state.area[c].buf = buf + ah->area_offset; state.area[c].len = ah->area_size; - VB2_DEBUG("%s() examining FMAP area %d (%s)," + VB2_DEBUG("examining FMAP area %d (%s)," " offset=0x%08x len=0x%08x\n", c, ah_name, ah->area_offset, ah->area_size); diff --git a/futility/file_type_rwsig.c b/futility/file_type_rwsig.c index c5616e57..bcccb2dd 100644 --- a/futility/file_type_rwsig.c +++ b/futility/file_type_rwsig.c @@ -112,7 +112,7 @@ int ft_show_rwsig(const char *name, uint8_t *buf, uint32_t len, void *nuthin) sig_size = fmaparea->area_size; - VB2_DEBUG("Looking for signature at %#x (%#x)\n", + VB2_DEBUG("Looking for signature at %#tx (%#x)\n", (uint8_t*)sig - buf, sig_size); if (VB2_SUCCESS != vb21_verify_signature(sig, sig_size)) @@ -235,7 +235,7 @@ int ft_sign_rwsig(const char *name, uint8_t *buf, uint32_t len, void *nuthin) sig_size = fmaparea->area_size; - VB2_DEBUG("Looking for signature at %#x (%#x)\n", + VB2_DEBUG("Looking for signature at %#tx (%#x)\n", (uint8_t*)old_sig - buf, sig_size); data = fmap_find_by_name(buf, len, fmap, "EC_RW", diff --git a/futility/file_type_usbpd1.c b/futility/file_type_usbpd1.c index 80650413..42cb62cc 100644 --- a/futility/file_type_usbpd1.c +++ b/futility/file_type_usbpd1.c @@ -95,7 +95,7 @@ int ft_sign_usbpd1(const char *name, uint8_t *buf, uint32_t len, void *data) uint32_t rw_offset; uint32_t r; - VB2_DEBUG("%s(): name %s len 0x%08x (%d)\n", name, len, len); + VB2_DEBUG("name %s len %#.8x (%d)\n", name, len, len); /* Get image locations */ if (!parse_size_opts(len, &ro_size, &rw_size, &ro_offset, &rw_offset)) diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index 74391827..cdc39251 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -185,8 +185,8 @@ static int PickApartVmlinuz(uint8_t *kernel_buf, } kernel32_size = kernel_size - kernel32_start; - VB2_DEBUG(" kernel16_start=0x%" PRIx64 "\n", 0); - VB2_DEBUG(" kernel16_size=0x%" PRIx64 "\n", kernel32_start); + VB2_DEBUG(" kernel16_start=%#x\n", 0); + VB2_DEBUG(" kernel16_size=%#x\n", kernel32_start); /* Copy the original zeropage data from kernel_buf into * g_param_data, then tweak a few fields for our purposes */ @@ -221,8 +221,8 @@ static int PickApartVmlinuz(uint8_t *kernel_buf, break; } - VB2_DEBUG(" kernel32_start=0x%" PRIx64 "\n", kernel32_start); - VB2_DEBUG(" kernel32_size=0x%" PRIx64 "\n", kernel32_size); + VB2_DEBUG(" kernel32_start=%#x\n", kernel32_start); + VB2_DEBUG(" kernel32_size=%#x\n", kernel32_size); /* Keep just the 32-bit kernel. */ if (kernel32_size) { @@ -461,7 +461,7 @@ int WriteSomeParts(const char *outfile, FILE *f; /* Write the output file */ - VB2_DEBUG("writing %s with 0x%" PRIx64 ", 0x%" PRIx64 "\n", + VB2_DEBUG("writing %s with %#x, %#x\n", outfile, part1_size, part2_size); f = fopen(outfile, "wb"); @@ -674,7 +674,7 @@ uint8_t *CreateKernelBlob(uint8_t *vmlinuz_buf, uint32_t vmlinuz_size, * devices. */ g_kernel_blob_size = roundup(g_kernel_blob_size, CROS_ALIGN); - VB2_DEBUG("g_kernel_blob_size 0x%" PRIx64 "\n", g_kernel_blob_size); + VB2_DEBUG("g_kernel_blob_size %#x\n", g_kernel_blob_size); /* Allocate space for the blob. */ g_kernel_blob_data = malloc(g_kernel_blob_size); @@ -682,22 +682,22 @@ uint8_t *CreateKernelBlob(uint8_t *vmlinuz_buf, uint32_t vmlinuz_size, /* Assign the sub-pointers */ g_kernel_data = g_kernel_blob_data + now; - VB2_DEBUG("g_kernel_size 0x%" PRIx64 " ofs 0x%" PRIx64 "\n", + VB2_DEBUG("g_kernel_size %#x ofs %#x\n", g_kernel_size, now); now += roundup(g_kernel_size, CROS_ALIGN); g_config_data = g_kernel_blob_data + now; - VB2_DEBUG("g_config_size 0x%" PRIx64 " ofs 0x%" PRIx64 "\n", + VB2_DEBUG("g_config_size %#x ofs %#x\n", g_config_size, now); now += g_config_size; g_param_data = g_kernel_blob_data + now; - VB2_DEBUG("g_param_size 0x%" PRIx64 " ofs 0x%" PRIx64 "\n", + VB2_DEBUG("g_param_size %#x ofs %#x\n", g_param_size, now); now += g_param_size; g_bootloader_data = g_kernel_blob_data + now; - VB2_DEBUG("g_bootloader_size 0x%" PRIx64 " ofs 0x%" PRIx64 "\n", + VB2_DEBUG("g_bootloader_size %#x ofs %#x\n", g_bootloader_size, now); g_ondisk_bootloader_addr = kernel_body_load_address + now; VB2_DEBUG("g_ondisk_bootloader_addr 0x%" PRIx64 "\n", @@ -706,14 +706,14 @@ uint8_t *CreateKernelBlob(uint8_t *vmlinuz_buf, uint32_t vmlinuz_size, if (g_vmlinuz_header_size) { g_vmlinuz_header_data = g_kernel_blob_data + now; - VB2_DEBUG("g_vmlinuz_header_size 0x%" PRIx64 " ofs 0x%" PRIx64 "\n", + VB2_DEBUG("g_vmlinuz_header_size %#x ofs %#x\n", g_vmlinuz_header_size, now); g_ondisk_vmlinuz_header_addr = kernel_body_load_address + now; VB2_DEBUG("g_ondisk_vmlinuz_header_addr 0x%" PRIx64 "\n", g_ondisk_vmlinuz_header_addr); } - VB2_DEBUG("end of kern_blob at kern_blob+0x%" PRIx64 "\n", now); + VB2_DEBUG("end of kern_blob at kern_blob+%#x\n", now); /* Copy the kernel and params bits into the correct places */ if (0 != PickApartVmlinuz(vmlinuz_buf, vmlinuz_size, |