diff options
-rw-r--r-- | arch/x86/include/asm/global_data.h | 10 | ||||
-rw-r--r-- | arch/x86/include/asm/io.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/types.h | 4 | ||||
-rw-r--r-- | arch/x86/lib/board.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 39df699ccdc..14653d525ff 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -78,12 +78,12 @@ extern gd_t *gd; #define GD_RELOC_ADDR 10 #define GD_START_ADDR_SP 11 #define GD_RAM_SIZE 12 -#define GD_RESET_STATUS 13 -#define GD_BLOB 14 -#define GD_JT 15 -#define GD_ENV_BUF 16 +#define GD_RESET_STATUS 14 +#define GD_BLOB 15 +#define GD_JT 16 +#define GD_ENV_BUF 17 -#define GD_SIZE 24 +#define GD_SIZE 25 /* * Global Data Flags diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 8e93e2be948..38b83ad1320 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -220,7 +220,7 @@ static inline void sync(void) static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) { - return (void *)paddr; + return (void *)(uintptr_t)paddr; } /* @@ -233,7 +233,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) static inline phys_addr_t virt_to_phys(void * vaddr) { - return (phys_addr_t)(vaddr); + return (phys_addr_t)(uintptr_t)(vaddr); } #endif diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index 9a40e383eb3..e9fde88f7d4 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -45,8 +45,8 @@ typedef unsigned long long u64; typedef u32 dma_addr_t; -typedef unsigned long phys_addr_t; -typedef unsigned long phys_size_t; +typedef unsigned long long phys_addr_t; +typedef unsigned long long phys_size_t; #endif /* __KERNEL__ */ diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index a480ac0513d..31a4de22e47 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -197,7 +197,7 @@ static int calculate_relocation_address(void) ulong rel_offset; /* Calculate destination RAM Address and relocation offset */ - dest_addr = (void *)gd->ram_size; + dest_addr = (void *)(uintptr_t)gd->ram_size; dest_addr -= (bss_end - text_start); rel_offset = dest_addr - text_start; |