Other arch-specific features are exposed in Kconfig too, so do here likewise. Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx> --- arch/arm/Kconfig | 1 + arch/arm/include/asm/barebox.h | 4 ---- arch/mips/Kconfig | 1 + arch/mips/include/asm/barebox.h | 2 -- include/abort.h | 2 +- lib/Kconfig | 3 +++ 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 95ec2d9079ca..b227bb78b64f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -417,6 +417,7 @@ config ARM_OPTIMZED_STRING_FUNCTIONS increase your binary size. config ARM_EXCEPTIONS + select ARCH_HAS_DATA_ABORT_MASK bool "enable arm exception handling support" default y diff --git a/arch/arm/include/asm/barebox.h b/arch/arm/include/asm/barebox.h index 38d3a0943e18..c1b56432ccfc 100644 --- a/arch/arm/include/asm/barebox.h +++ b/arch/arm/include/asm/barebox.h @@ -1,8 +1,4 @@ #ifndef _BAREBOX_H_ #define _BAREBOX_H_ 1 -#ifdef CONFIG_ARM_EXCEPTIONS -#define ARCH_HAS_DATA_ABORT_MASK -#endif - #endif /* _BAREBOX_H_ */ diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 728295d486a6..1395ad4c6f01 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -10,6 +10,7 @@ config MIPS select HAVE_CONFIGURABLE_TEXT_BASE select HAVE_PBL_MULTI_IMAGES select HAS_DMA + select ARCH_HAS_DATA_ABORT_MASK select ELF default y diff --git a/arch/mips/include/asm/barebox.h b/arch/mips/include/asm/barebox.h index 2d13ee932f20..4c68e3f8354d 100644 --- a/arch/mips/include/asm/barebox.h +++ b/arch/mips/include/asm/barebox.h @@ -3,6 +3,4 @@ #ifndef _ASM_MIPS_BAREBOX_H_ #define _ASM_MIPS_BAREBOX_H_ -#define ARCH_HAS_DATA_ABORT_MASK - #endif /* _ASM_MIPS_BAREBOX_H_ */ diff --git a/include/abort.h b/include/abort.h index 326467c25f70..3eb7986f41c4 100644 --- a/include/abort.h +++ b/include/abort.h @@ -3,7 +3,7 @@ #include <asm/barebox.h> -#if defined ARCH_HAS_DATA_ABORT_MASK && !defined __PBL__ +#if defined CONFIG_ARCH_HAS_DATA_ABORT_MASK && !defined __PBL__ /* * data_abort_mask - ignore data aborts diff --git a/lib/Kconfig b/lib/Kconfig index 53289e696509..b64885ac93ef 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -168,4 +168,7 @@ config BLOBGEN config ARCH_HAS_STACK_DUMP bool +config ARCH_HAS_DATA_ABORT_MASK + bool + endmenu -- 2.20.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
