On Wed, Jun 07, 2023 at 05:31:51PM +0200, Ahmad Fatoum wrote: > We use CONFIG_CPU_V8 and CONFIG_CPU_64 interchangeably in barebox, > because we don't yet support any SoCs with ARMv9 and because we always > target the A64 instruction set on ARMv8 processors. > > In the Makefile where we have decisions dependent on whether we are > compiling for 64-bit or not, we should rather use CONFIG_CPU_64 though, > because the same options would likely be applicable to ARMv9 as well. > > Given that the follow-up commit will introduce a number of > CONFIG_CPU_32, let's replace the CONFIG_CPU_V8 symbols with > CONFIG_CPU_64 for symmetry. No functional change. > > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > arch/arm/Makefile | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) Applied, thanks Sascha > > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index 35ebc70f44e2..926af7387f7f 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -4,7 +4,7 @@ KBUILD_DEFCONFIG := multi_v8_defconfig > > KBUILD_CPPFLAGS += -D__ARM__ -fno-strict-aliasing > # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: > -ifeq ($(CONFIG_CPU_V8),y) > +ifeq ($(CONFIG_CPU_64),y) > KBUILD_CPPFLAGS +=$(call cc-option,-maarch64,) > else > KBUILD_CPPFLAGS +=$(call cc-option,-marm,) > @@ -27,14 +27,14 @@ endif > # at least some of the code would be executed with MMU off, lets be > # conservative and instruct the compiler not to generate any unaligned > # accesses > -ifneq ($(CONFIG_CPU_V8),y) > +ifneq ($(CONFIG_CPU_64),y) > KBUILD_CFLAGS += -mno-unaligned-access > else > KBUILD_CFLAGS += -mstrict-align > endif > > # Prevent use of floating point and Advanced SIMD registers. > -ifeq ($(CONFIG_CPU_V8),y) > +ifeq ($(CONFIG_CPU_64),y) > KBUILD_CFLAGS += -mgeneral-regs-only > endif > > @@ -54,7 +54,7 @@ tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi > tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi > tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale > > -ifeq ($(CONFIG_CPU_V8), y) > +ifeq ($(CONFIG_CPU_64), y) > CFLAGS_ABI :=-mabi=lp64 > else > ifeq ($(CONFIG_AEABI),y) > @@ -75,7 +75,7 @@ CFLAGS_THUMB2 :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN) > AFLAGS_THUMB2 :=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb > endif > > -ifeq ($(CONFIG_CPU_V8), y) > +ifeq ($(CONFIG_CPU_64), y) > KBUILD_CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) > KBUILD_AFLAGS += -include asm/unified.h > export S64_32 = 64 > @@ -197,7 +197,7 @@ common-y += arch/arm/boards/ $(MACH) > common-y += arch/arm/cpu/ > common-y += arch/arm/crypto/ > > -ifeq ($(CONFIG_CPU_V8), y) > +ifeq ($(CONFIG_CPU_64), y) > common-y += arch/arm/lib64/ > else > common-y += arch/arm/lib32/ > @@ -205,7 +205,7 @@ endif > > common-$(CONFIG_OFTREE) += arch/arm/dts/ > > -ifeq ($(CONFIG_CPU_V8), y) > +ifeq ($(CONFIG_CPU_64), y) > lds-y := arch/arm/lib64/barebox.lds > else > lds-y := arch/arm/lib32/barebox.lds > -- > 2.39.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 |
