Commit c425c546 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Max Filippov
Browse files

xtensa: move CONFIG_CPU_*_ENDIAN defines to Kconfig 



Move the definition of CONFIG_CPU_*_ENDIAN to Kconfig, the best place
for CONFIG options.

I slightly simplified the test code. You can use the -P option to suppress
linemarker generation. The grep command is unneeded.

  $ echo __XTENSA_EB__ | xtensa-linux-gcc -E -
  # 1 "<stdin>"
  # 1 "<built-in>"
  # 1 "<command-line>"
  # 1 "<stdin>"
  1

  $ echo __XTENSA_EB__ | xtensa-linux-gcc -E -P -
  1

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Message-Id: <20210313122342.69995-1-masahiroy@kernel.org>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 9aa44cd2

arch/xtensa/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ config KASAN_SHADOW_OFFSET 
	hex

	default 0x6e400000



config CPU_BIG_ENDIAN

	def_bool $(success,test "$(shell,echo __XTENSA_EB__ | $(CC) -E -P -)" = 1)



config CPU_LITTLE_ENDIAN

	def_bool !CPU_BIG_ENDIAN



menu "Processor type and features"



choice

arch/xtensa/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -52,14 +52,7 @@ ifneq ($(CONFIG_LD_NO_RELAX),) 
KBUILD_LDFLAGS := --no-relax

endif



ifeq ($(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)

CHECKFLAGS += -D__XTENSA_EB__

KBUILD_CPPFLAGS += -DCONFIG_CPU_BIG_ENDIAN

endif

ifeq ($(shell echo __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)

CHECKFLAGS += -D__XTENSA_EL__

KBUILD_CPPFLAGS += -DCONFIG_CPU_LITTLE_ENDIAN

endif

CHECKFLAGS += -D$(if $(CONFIG_CPU_BIG_ENDIAN),__XTENSA_EB__,__XTENSA_EL__)



vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))

plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))

arch/xtensa/boot/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
KBUILD_CFLAGS	+= -fno-builtin -Iarch/$(ARCH)/boot/include

HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include



BIG_ENDIAN	:= $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#")



export BIG_ENDIAN



subdir-y	:= lib

targets		+= vmlinux.bin vmlinux.bin.gz

targets		+= uImage xipImage

arch/xtensa/boot/boot-elf/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -4,11 +4,7 @@ 
# for more details.

#



ifeq ($(BIG_ENDIAN),1)

OBJCOPY_ARGS    := -O elf32-xtensa-be

else

OBJCOPY_ARGS    := -O elf32-xtensa-le

endif

OBJCOPY_ARGS := -O $(if $(CONFIG_CPU_BIG_ENDIAN),elf32-xtensa-be,elf32-xtensa-le)



export OBJCOPY_ARGS

export CPPFLAGS_boot.lds += -P -C

arch/xtensa/boot/boot-redboot/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -4,11 +4,7 @@ 
# for more details.

#



ifeq ($(BIG_ENDIAN),1)

OBJCOPY_ARGS 	:= -O elf32-xtensa-be

else

OBJCOPY_ARGS 	:= -O elf32-xtensa-le

endif

OBJCOPY_ARGS := -O $(if $(CONFIG_CPU_BIG_ENDIAN),elf32-xtensa-be,elf32-xtensa-le)



LD_ARGS	= -T $(srctree)/$(obj)/boot.ld