On Mon, Dec 05, 2022 at 02:30:33PM +0100, Ahmad Fatoum wrote: > We have 9 symbols beginning with ARCH_HAS, but only with HAS_ARCH. > Change it over for symmetry. No functional change. > > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > arch/arm/Kconfig | 2 +- > arch/kvx/Kconfig | 2 +- > arch/mips/Kconfig | 2 +- > arch/mips/lib/Makefile | 2 +- > arch/openrisc/Kconfig | 2 +- > arch/powerpc/Kconfig | 2 +- > arch/riscv/Kconfig | 2 +- > arch/riscv/lib/Makefile | 2 +- > arch/sandbox/Kconfig | 2 +- > arch/x86/Kconfig | 4 ++-- > common/Kconfig | 4 ++-- > 11 files changed, 13 insertions(+), 13 deletions(-) Applied, thanks Sascha > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 59fce0c601b4..759b29ee77e1 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -7,7 +7,7 @@ config ARM > select HAVE_CONFIGURABLE_TEXT_BASE if !RELOCATABLE > select HAVE_IMAGE_COMPRESSION > select HAVE_ARCH_KASAN > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > select ARM_OPTIMZED_STRING_FUNCTIONS if KASAN > default y > > diff --git a/arch/kvx/Kconfig b/arch/kvx/Kconfig > index 5e7ddeea1ce5..e18d02fffc11 100644 > --- a/arch/kvx/Kconfig > +++ b/arch/kvx/Kconfig > @@ -14,7 +14,7 @@ config KVX > select FLEXIBLE_BOOTARGS > select FITIMAGE > select GENERIC_FIND_NEXT_BIT > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > select HAS_CACHE > select HAS_DMA > select LIBFDT > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index be5a4ff30de9..70d85690dab9 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -302,7 +302,7 @@ choice > config 32BIT > bool "32-bit barebox" > depends on CPU_SUPPORTS_32BIT_KERNEL && SYS_SUPPORTS_32BIT_KERNEL > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > help > Select this option if you want to build a 32-bit barebox. > > diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile > index 1ef340202acf..00d72d0a1a0a 100644 > --- a/arch/mips/lib/Makefile > +++ b/arch/mips/lib/Makefile > @@ -10,7 +10,7 @@ obj-y += reloc.o > obj-y += sections.o > obj-y += shutdown.o > obj-y += dma-default.o > -obj-$(CONFIG_HAS_ARCH_SJLJ) += setjmp.o > +obj-$(CONFIG_ARCH_HAS_SJLJ) += setjmp.o > > obj-$(CONFIG_MIPS_OPTIMIZED_STRING_FUNCTIONS) += memcpy.o > obj-$(CONFIG_MIPS_OPTIMIZED_STRING_FUNCTIONS) += memset.o > diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig > index 34b24bec0858..4ae03b748c79 100644 > --- a/arch/openrisc/Kconfig > +++ b/arch/openrisc/Kconfig > @@ -6,7 +6,7 @@ config OPENRISC > select HAS_CACHE > select HAVE_CONFIGURABLE_MEMORY_LAYOUT > select GENERIC_FIND_NEXT_BIT > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > default y > > # not used > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 7525ecef4948..4ae6d423af15 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -8,7 +8,7 @@ config PPC > select HAS_CACHE > select GENERIC_FIND_NEXT_BIT > select OFTREE > - select HAS_ARCH_SJLJ > + select CONFIG_ARCH_HAS_SJLJ > default y > > choice > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 1190cd42723f..cd7f4abf5694 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -13,7 +13,7 @@ config RISCV > select HAVE_PBL_IMAGE > select HAVE_PBL_MULTI_IMAGES > select HAVE_IMAGE_COMPRESSION > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > select HAS_KALLSYMS > select RISCV_TIMER if RISCV_SBI > select HW_HAS_PCI > diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile > index f3db5320f751..693248080070 100644 > --- a/arch/riscv/lib/Makefile > +++ b/arch/riscv/lib/Makefile > @@ -4,7 +4,7 @@ extra-y += barebox.lds > > obj-y += dtb.o > obj-pbl-y += sections.o setupc.o reloc.o sections.o runtime-offset.o > -obj-$(CONFIG_HAS_ARCH_SJLJ) += setjmp.o longjmp.o > +obj-$(CONFIG_ARCH_HAS_SJLJ) += setjmp.o longjmp.o > obj-$(CONFIG_RISCV_OPTIMZED_STRING_FUNCTIONS) += memcpy.o memset.o memmove.o > obj-$(CONFIG_RISCV_SBI) += sbi.o > obj-$(CONFIG_CMD_RISCV_CPUINFO) += cpuinfo.o > diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig > index d3889fcac03c..366a1d0b5228 100644 > --- a/arch/sandbox/Kconfig > +++ b/arch/sandbox/Kconfig > @@ -15,7 +15,7 @@ config SANDBOX > select PARTITION_DISK > select ARCH_HAS_STACK_DUMP if ASAN > select GENERIC_FIND_NEXT_BIT > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > select HAS_ASM_DEBUG_LL > default y > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 5e2e26cd6e5b..bd6a94bd0b0e 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -26,12 +26,12 @@ config 64BIT > config X86_32 > def_bool y > depends on !64BIT > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > > config X86_64 > def_bool y > depends on 64BIT > - select HAS_ARCH_SJLJ > + select ARCH_HAS_SJLJ > > endmenu > > diff --git a/common/Kconfig b/common/Kconfig > index fb2bf4968310..19cd79311016 100644 > --- a/common/Kconfig > +++ b/common/Kconfig > @@ -27,7 +27,7 @@ config HAS_DMA > Drivers that depend on a DMA implementation can depend on this > config, so that you don't get a compilation error. > > -config HAS_ARCH_SJLJ > +config ARCH_HAS_SJLJ > bool > help > Architecture has support implemented for setjmp()/longjmp()/initjmp() > @@ -1004,7 +1004,7 @@ config POLLER > config BTHREAD > bool "barebox co-operative (green) thread infrastructure" > select HAS_SCHED > - depends on HAS_ARCH_SJLJ > + depends on ARCH_HAS_SJLJ > help > barebox threads are lightweight cooperative (green) threads that are > scheduled within delay loops and the console idle to asynchronously > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
