Skip to content

Commit

Permalink
xtensa: do not build variants directory
Browse files Browse the repository at this point in the history
None of arch/xtensa/variants/*/ has Makefile, so 'buildvar' is always
empty.

Perhaps, downstream variant code might be dropped in, but given the
fact that none of upstream variants builds anything in their variant
directory, I doubt this is needed.

Signed-off-by: Masahiro Yamada <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Max Filippov <[email protected]>
  • Loading branch information
masahir0y authored and jcmvbkbc committed Aug 11, 2021
1 parent ef71db4 commit c548584
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/xtensa/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))

KBUILD_DEFCONFIG := iss_defconfig

# Only build variant and/or platform if it includes a Makefile

buildvar := $(shell test -e $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/)
# Only build platform if it includes a Makefile
buildplf := $(shell test -e $(srctree)/arch/xtensa/platforms/$(PLATFORM)/Makefile && echo arch/xtensa/platforms/$(PLATFORM)/)

# Find libgcc.a
Expand All @@ -66,7 +64,7 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

head-y := arch/xtensa/kernel/head.o
core-y += arch/xtensa/kernel/ arch/xtensa/mm/
core-y += $(buildvar) $(buildplf)
core-y += $(buildplf)
core-y += arch/xtensa/boot/dts/

libs-y += arch/xtensa/lib/ $(LIBGCC)
Expand Down

0 comments on commit c548584

Please sign in to comment.