diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-07-02 17:25:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-07-14 20:28:08 +0200 |
| commit | e4f2c9e565b492ac4e008c3f72795e9f7e821662 (patch) | |
| tree | 797a29bee9b91e183a301bbafe2263826beab61f /arch/sandbox | |
| parent | 96f20140348c76cfba7f32191bc700c9b5c607f2 (diff) | |
| download | barebox-e4f2c9e565b492ac4e008c3f72795e9f7e821662.tar.gz barebox-e4f2c9e565b492ac4e008c3f72795e9f7e821662.tar.xz | |
sandbox: specify sizeof(dma_addr_t) == sizeof(phys_addr_t) == 8 on 64BIT
sizeof(dma_addr_t) == 8 shouldn't introduce any functional change, because
we can't have DMA on sandbox. For now it suppresses benign warnings about
mismatched pointer and integer sizes when some headers are included.
sizeof(phys_addr_t) == 8 was already the case on systems with
__x86_64__. As CONFIG_64BIT now is set according to the bitness
of the compiler, we can migrate this fully to Kconfig.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/Kconfig | 5 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/elf.h | 1 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/types.h | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 3f10709021..40e04919d2 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -24,6 +24,9 @@ config SANDBOX_UNWIND select ARCH_HAS_STACK_DUMP depends on UBSAN || KASAN +config PHYS_ADDR_T_64BIT + bool + config CC_IS_64BIT def_bool $(success,$(srctree)/scripts/gcc-64bitptr.sh $(CC)) @@ -34,6 +37,8 @@ config 64BIT bool default n if SANDBOX_LINUX_I386 default CC_IS_64BIT + select ARCH_DMA_ADDR_T_64BIT + select PHYS_ADDR_T_64BIT config SANDBOX_LINUX_I386 bool "32-bit x86 barebox" if CC_HAS_LINUX_I386_SUPPORT diff --git a/arch/sandbox/include/asm/elf.h b/arch/sandbox/include/asm/elf.h index 3939336ccb..e71a60aeb9 100644 --- a/arch/sandbox/include/asm/elf.h +++ b/arch/sandbox/include/asm/elf.h @@ -3,7 +3,6 @@ #if __SIZEOF_POINTER__ == 8 #define ELF_CLASS ELFCLASS64 -#define CONFIG_PHYS_ADDR_T_64BIT #else #define ELF_CLASS ELFCLASS32 #endif diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index 3e4a8f7ba3..28046670f4 100644 --- a/arch/sandbox/include/asm/types.h +++ b/arch/sandbox/include/asm/types.h @@ -10,12 +10,6 @@ */ #define INTERNAL_SIZE_T unsigned long -/* - * This is a Kconfig variable in the Kernel, but we want to detect - * this during compile time, so we set it here. - */ -#define CONFIG_PHYS_ADDR_T_64BIT - #endif #endif |