[PATCH 4/4] xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild
From: Masahiro Yamada
Date: Wed Aug 11 2021 - 12:38:29 EST
Use obj-y to clean up Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---
arch/xtensa/Kbuild | 1 +
arch/xtensa/Makefile | 3 ---
arch/xtensa/platforms/Makefile | 4 ++++
3 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 arch/xtensa/platforms/Makefile
diff --git a/arch/xtensa/Kbuild b/arch/xtensa/Kbuild
index a4e40e534e6a..fd12f61745ba 100644
--- a/arch/xtensa/Kbuild
+++ b/arch/xtensa/Kbuild
@@ -1 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
+obj-y += kernel/ mm/ platforms/ boot/dts/
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 093e87b889be..96714ef7c89e 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -58,9 +58,6 @@ KBUILD_DEFCONFIG := iss_defconfig
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 += arch/xtensa/platforms/$(platform-y)/
-core-y += arch/xtensa/boot/dts/
libs-y += arch/xtensa/lib/ $(LIBGCC)
diff --git a/arch/xtensa/platforms/Makefile b/arch/xtensa/platforms/Makefile
new file mode 100644
index 000000000000..e2e7e0726979
--- /dev/null
+++ b/arch/xtensa/platforms/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_XTENSA_PLATFORM_XT2000) += xt2000/
+obj-$(CONFIG_XTENSA_PLATFORM_ISS) += iss/
+obj-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += xtfpga/
--
2.30.2