2021-08-11 16:40:07

by Masahiro Yamada

Subject: [PATCH 3/4] xtensa: build platform directories unconditionally

All of arch/xtensa/platforms/*/ have Makefile. You do not need to
check the presence of Makefile.

Signed-off-by: Masahiro Yamada <[email protected]>
---

arch/xtensa/Makefile | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 3c0573fe6761..093e87b889be 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -32,8 +32,6 @@ platform-$(CONFIG_XTENSA_PLATFORM_XT2000) := xt2000
platform-$(CONFIG_XTENSA_PLATFORM_ISS) := iss
platform-$(CONFIG_XTENSA_PLATFORM_XTFPGA) := xtfpga

-PLATFORM = $(platform-y)
-
# temporarily until string.h is fixed
KBUILD_CFLAGS += -ffreestanding -D__linux__
KBUILD_CFLAGS += -pipe -mlongcalls -mtext-section-literals
@@ -55,16 +53,13 @@ KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))

KBUILD_DEFCONFIG := iss_defconfig

-# 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

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 += $(buildplf)
+core-y += arch/xtensa/platforms/$(platform-y)/
core-y += arch/xtensa/boot/dts/

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

2021-08-13 05:49:02

by Max Filippov

Subject: Re: [PATCH 3/4] xtensa: build platform directories unconditionally

On Wed, Aug 11, 2021 at 9:38 AM Masahiro Yamada <[email protected]> wrote:
>
> All of arch/xtensa/platforms/*/ have Makefile. You do not need to
> check the presence of Makefile.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> arch/xtensa/Makefile | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)

Thanks, applied to my xtensa tree.

--
Thanks.
-- Max