diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-06 14:47:40 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-09-11 03:48:17 +0300 |
commit | dee37fc99d945eb96f0f501d17833cbb05798ad3 (patch) | |
tree | 3ebe9b7ac68003faf3a9cccd54b42a80895561e0 /lib/efi_loader | |
parent | 3747bdbb2bb83a3bb2e7bd823856de4f4908f711 (diff) | |
download | u-boot-dee37fc99d945eb96f0f501d17833cbb05798ad3.tar.xz |
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 'lib/efi_loader')
-rw-r--r-- | lib/efi_loader/efi_boottime.c | 7 | ||||
-rw-r--r-- | lib/efi_loader/efi_device_path.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_disk.c | 7 | ||||
-rw-r--r-- | lib/efi_loader/efi_gop.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_memory.c | 3 | ||||
-rw-r--r-- | lib/efi_loader/efi_net.c | 1 | ||||
-rw-r--r-- | lib/efi_loader/efi_smbios.c | 1 |
7 files changed, 7 insertions, 14 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 3935e4f1ce..ca61e1ad41 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -13,7 +13,6 @@ #include <linux/libfdt_env.h> #include <u-boot/crc.h> #include <bootm.h> -#include <inttypes.h> #include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; @@ -338,7 +337,7 @@ static efi_status_t EFIAPI efi_free_pages_ext(uint64_t memory, { efi_status_t r; - EFI_ENTRY("%" PRIx64 ", 0x%zx", memory, pages); + EFI_ENTRY("%llx, 0x%zx", memory, pages); r = efi_free_pages(memory, pages); return EFI_EXIT(r); } @@ -789,7 +788,7 @@ static efi_status_t EFIAPI efi_set_timer_ext(struct efi_event *event, enum efi_timer_delay type, uint64_t trigger_time) { - EFI_ENTRY("%p, %d, %" PRIx64, event, type, trigger_time); + EFI_ENTRY("%p, %d, %llx", event, type, trigger_time); return EFI_EXIT(efi_set_timer(event, type, trigger_time)); } @@ -1961,7 +1960,7 @@ static efi_status_t EFIAPI efi_set_watchdog_timer(unsigned long timeout, unsigned long data_size, uint16_t *watchdog_data) { - EFI_ENTRY("%ld, 0x%" PRIx64 ", %ld, %p", timeout, watchdog_code, + EFI_ENTRY("%ld, 0x%llx, %ld, %p", timeout, watchdog_code, data_size, watchdog_data); return EFI_EXIT(efi_set_watchdog(timeout)); } diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 6040bcff19..9d776a6d99 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -13,7 +13,6 @@ #include <usb.h> #include <mmc.h> #include <efi_loader.h> -#include <inttypes.h> #include <part.h> /* template END node: */ diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 5c6ec5258c..13fcc1b471 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -9,7 +9,6 @@ #include <blk.h> #include <dm.h> #include <efi_loader.h> -#include <inttypes.h> #include <part.h> #include <malloc.h> @@ -66,7 +65,7 @@ static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this, blocks = buffer_size / blksz; lba += diskobj->offset; - debug("EFI: %s:%d blocks=%x lba=%"PRIx64" blksz=%x dir=%d\n", __func__, + debug("EFI: %s:%d blocks=%x lba=%llx blksz=%x dir=%d\n", __func__, __LINE__, blocks, lba, blksz, direction); /* We only support full block access */ @@ -111,7 +110,7 @@ static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this, real_buffer = efi_bounce_buffer; #endif - EFI_ENTRY("%p, %x, %" PRIx64 ", %zx, %p", this, media_id, lba, + EFI_ENTRY("%p, %x, %llx, %zx, %p", this, media_id, lba, buffer_size, buffer); r = efi_disk_rw_blocks(this, media_id, lba, buffer_size, real_buffer, @@ -146,7 +145,7 @@ static efi_status_t EFIAPI efi_disk_write_blocks(struct efi_block_io *this, real_buffer = efi_bounce_buffer; #endif - EFI_ENTRY("%p, %x, %" PRIx64 ", %zx, %p", this, media_id, lba, + EFI_ENTRY("%p, %x, %llx, %zx, %p", this, media_id, lba, buffer_size, buffer); /* Populate bounce buffer if necessary */ diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 3a36bbcbfa..a4aa9bcf61 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -8,7 +8,6 @@ #include <common.h> #include <dm.h> #include <efi_loader.h> -#include <inttypes.h> #include <lcd.h> #include <malloc.h> #include <video.h> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index e2b40aa85b..0ac4ff554b 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -7,7 +7,6 @@ #include <common.h> #include <efi_loader.h> -#include <inttypes.h> #include <malloc.h> #include <mapmem.h> #include <watchdog.h> @@ -159,7 +158,7 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, bool carve_again; uint64_t carved_pages = 0; - debug("%s: 0x%" PRIx64 " 0x%" PRIx64 " %d %s\n", __func__, + debug("%s: 0x%llx 0x%llx %d %s\n", __func__, start, pages, memory_type, overlap_only_ram ? "yes" : "no"); if (memory_type >= EFI_MAX_MEMORY_TYPE) diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index 5a3d7be86c..034d0d2ed0 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -7,7 +7,6 @@ #include <common.h> #include <efi_loader.h> -#include <inttypes.h> #include <lcd.h> #include <malloc.h> diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 932f7582ec..38e42fa243 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -7,7 +7,6 @@ #include <common.h> #include <efi_loader.h> -#include <inttypes.h> #include <smbios.h> static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID; |