| Message ID | 20190312103802.22544-2-thierry.reding@gmail.com |
|---|---|
| State | Accepted |
| Commit | 0c425ae4b735d13bdc5f6cc1b7cef2ba130b5c4e |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | [U-Boot,1/3] vsprintf: Support phys_addr_t specifier unconditionally | expand |
On Tue, 12 Mar 2019 at 04:38, Thierry Reding <thierry.reding@gmail.com> wrote: > > From: Thierry Reding <treding@nvidia.com> > > If 64-bit physical addresses support is enabled, make sure the sandox > defines the correct types for phys_addr_t and phys_size_t. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > arch/sandbox/include/asm/types.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > Applied to u-boot-dm, thanks!
diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index 7cd56b41474f..c1a5d2af8285 100644 --- a/arch/sandbox/include/asm/types.h +++ b/arch/sandbox/include/asm/types.h @@ -18,21 +18,21 @@ typedef unsigned short umode_t; /* * Number of bits in a C 'long' on this architecture. */ -#ifdef CONFIG_PHYS64 +#ifdef CONFIG_PHYS_64BIT #define BITS_PER_LONG 64 -#else /* CONFIG_PHYS64 */ +#else /* CONFIG_PHYS_64BIT */ #define BITS_PER_LONG 32 -#endif /* CONFIG_PHYS64 */ +#endif /* CONFIG_PHYS_64BIT */ -#ifdef CONFIG_PHYS64 +#ifdef CONFIG_PHYS_64BIT typedef unsigned long long dma_addr_t; typedef u64 phys_addr_t; typedef u64 phys_size_t; -#else /* CONFIG_PHYS64 */ +#else /* CONFIG_PHYS_64BIT */ typedef unsigned long dma_addr_t; typedef u32 phys_addr_t; typedef u32 phys_size_t; -#endif /* CONFIG_PHYS64 */ +#endif /* CONFIG_PHYS_64BIT */ #endif /* __KERNEL__ */