diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-06 20:47:40 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-10 20:48:17 -0400 |
| commit | dee37fc99d945eb96f0f501d17833cbb05798ad3 (patch) | |
| tree | 3ebe9b7ac68003faf3a9cccd54b42a80895561e0 /arch/x86 | |
| parent | 3747bdbb2bb83a3bb2e7bd823856de4f4908f711 (diff) | |
| download | u-boot-dee37fc99d945eb96f0f501d17833cbb05798ad3.tar.gz | |
Remove <inttypes.h> includes and PRI* usages in printf() entirely
In int-ll64.h, we always use the following typedefs:
typedef unsigned int u32;
typedef unsigned long uintptr_t;
typedef unsigned long long u64;
This does not need to match to the compiler's <inttypes.h>.
Do not include it.
The use of PRI* makes the code super-ugly. You can simply use
"l" for printing uintptr_t, "ll" for u64, and no modifier for u32.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/lib/relocate.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 050f9d07c2..ed10755d9c 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -15,7 +15,6 @@ */ #include <common.h> -#include <inttypes.h> #include <relocate.h> #include <asm/u-boot-x86.h> #include <asm/sections.h> @@ -70,8 +69,7 @@ static void do_elf_reloc_fixups64(unsigned int text_base, uintptr_t size, *offset_ptr_ram = gd->reloc_off + re_src->r_addend; } else { - debug(" %p: %lx: rom reloc %lx, ram %p, value %lx, limit %" - PRIXPTR "\n", + debug(" %p: %lx: rom reloc %lx, ram %p, value %lx, limit %lX\n", re_src, (ulong)re_src->r_info, (ulong)re_src->r_offset, offset_ptr_ram, (ulong)*offset_ptr_ram, text_base + size); @@ -109,11 +107,9 @@ static void do_elf_reloc_fixups32(unsigned int text_base, uintptr_t size, *offset_ptr_ram <= text_base + size) { *offset_ptr_ram += gd->reloc_off; } else { - debug(" %p: rom reloc %x, ram %p, value %x," - " limit %" PRIXPTR "\n", re_src, - re_src->r_offset, offset_ptr_ram, - *offset_ptr_ram, - text_base + size); + debug(" %p: rom reloc %x, ram %p, value %x, limit %lX\n", + re_src, re_src->r_offset, offset_ptr_ram, + *offset_ptr_ram, text_base + size); } } else { debug(" %p: rom reloc %x, last %p\n", re_src, |