2021-08-11 16:49:14

by Masahiro Yamada

Subject: [PATCH] microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild

Use obj-y to clean up Makefile.

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

arch/microblaze/Kbuild | 4 ++++
arch/microblaze/Makefile | 5 -----
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/microblaze/Kbuild b/arch/microblaze/Kbuild
index a4e40e534e6a..a1c597889319 100644
--- a/arch/microblaze/Kbuild
+++ b/arch/microblaze/Kbuild
@@ -1 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
+obj-y += kernel/
+obj-y += mm/
+obj-$(CONFIG_PCI) += pci/
+obj-y += boot/dts/
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 6d4af39e3890..9adc6b6434df 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -50,17 +50,12 @@ KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2)

head-y := arch/microblaze/kernel/head.o
libs-y += arch/microblaze/lib/
-core-y += arch/microblaze/kernel/
-core-y += arch/microblaze/mm/
-core-$(CONFIG_PCI) += arch/microblaze/pci/

boot := arch/microblaze/boot

# Are we making a simpleImage.<boardname> target? If so, crack out the boardname
DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS)))

-core-y += $(boot)/dts/
-
export DTB

all: linux.bin
--
2.30.2

2021-08-25 10:14:11

by Michal Simek

Subject: Re: [PATCH] microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild

On 8/11/21 6:45 PM, Masahiro Yamada wrote:
> Use obj-y to clean up Makefile.
>
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> arch/microblaze/Kbuild | 4 ++++
> arch/microblaze/Makefile | 5 -----
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/microblaze/Kbuild b/arch/microblaze/Kbuild
> index a4e40e534e6a..a1c597889319 100644
> --- a/arch/microblaze/Kbuild
> +++ b/arch/microblaze/Kbuild
> @@ -1 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0-only
> +obj-y += kernel/
> +obj-y += mm/
> +obj-$(CONFIG_PCI) += pci/
> +obj-y += boot/dts/
> diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
> index 6d4af39e3890..9adc6b6434df 100644
> --- a/arch/microblaze/Makefile
> +++ b/arch/microblaze/Makefile
> @@ -50,17 +50,12 @@ KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2)
>
> head-y := arch/microblaze/kernel/head.o
> libs-y += arch/microblaze/lib/
> -core-y += arch/microblaze/kernel/
> -core-y += arch/microblaze/mm/
> -core-$(CONFIG_PCI) += arch/microblaze/pci/
>
> boot := arch/microblaze/boot
>
> # Are we making a simpleImage.<boardname> target? If so, crack out the boardname
> DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS)))
>
> -core-y += $(boot)/dts/
> -
> export DTB
>
> all: linux.bin
>

Applied.
M

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs