diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/types.h | 38 | ||||
| -rw-r--r-- | arch/x86/lib/relocate.c | 12 |
2 files changed, 6 insertions, 44 deletions
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index a47e581fe3..ba50001560 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -1,49 +1,15 @@ #ifndef __ASM_I386_TYPES_H #define __ASM_I386_TYPES_H -typedef unsigned short umode_t; - -/* - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the - * header files exported to user space - */ +#include <asm-generic/int-ll64.h> -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) -__extension__ typedef __signed__ long long __s64; -__extension__ typedef unsigned long long __u64; -#endif +typedef unsigned short umode_t; /* * These aren't exported outside the kernel to avoid name space clashes */ #ifdef __KERNEL__ -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -#if !defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__) -typedef signed long long s64; -typedef unsigned long long u64; -#else -typedef __INT64_TYPE__ s64; -typedef __UINT64_TYPE__ u64; -#endif - #if CONFIG_IS_ENABLED(X86_64) #define BITS_PER_LONG 64 #else 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, |