[PATCH 1/3] kbuild: parameterize the .o part of suffix-search

public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/3] kbuild: parameterize the .o part of suffix-search
@ 2021-05-02 18:09 Masahiro Yamada
  2021-05-02 18:09 ` [PATCH 2/3] kbuild: refactor fdtoverlay rule Masahiro Yamada
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-02 18:09 UTC (permalink / raw)
  To: linux-kbuild; +Cc: Rob Herring, Masahiro Yamada, Michal Marek, linux-kernel

The suffix-search macro hard-codes the suffix, '.o'.

Make it a parameter so that the multi-search and real-search macros
can be reused for foo-dtbs syntax introduced by commit 15d16d6dadf6
("kbuild: Add generic rule to apply fdtoverlay").

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/Makefile.lib | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 64daf37e874b..88b446ed6532 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -44,19 +44,22 @@ else
 obj-y		:= $(filter-out %/, $(obj-y))
 endif
 
-# Expand $(foo-objs) $(foo-y) by calling $(call suffix-search,foo.o,-objs -y)
-suffix-search = $(strip $(foreach s, $2, $($(1:.o=$s))))
+# Expand $(foo-objs) $(foo-y) etc. by replacing their individuals
+suffix-search = $(strip $(foreach s, $3, $($(1:%$(strip $2)=%$s))))
+# List composite targets that are constructed by combining other targets
+multi-search = $(sort $(foreach m, $1, $(if $(call suffix-search, $m, $2, $3 -), $m)))
+# List primitive targets that are compiled from source files
+real-search = $(foreach m, $1, $(if $(call suffix-search, $m, $2, $3 -), $(call suffix-search, $m, $2, $3), $m))
+
 # If $(foo-objs), $(foo-y), $(foo-m), or $(foo-) exists, foo.o is a composite object
-multi-search = $(sort $(foreach m, $1, $(if $(call suffix-search, $m, $2 -), $m)))
-multi-obj-y := $(call multi-search,$(obj-y),-objs -y)
-multi-obj-m := $(call multi-search,$(obj-m),-objs -y -m)
+multi-obj-y := $(call multi-search, $(obj-y), .o, -objs -y)
+multi-obj-m := $(call multi-search, $(obj-m), .o, -objs -y -m)
 multi-obj-ym := $(multi-obj-y) $(multi-obj-m)
 
 # Replace multi-part objects by their individual parts,
 # including built-in.a from subdirectories
-real-search = $(foreach m, $1, $(if $(call suffix-search, $m, $2 -), $(call suffix-search, $m, $2), $m))
-real-obj-y := $(call real-search, $(obj-y),-objs -y)
-real-obj-m := $(call real-search, $(obj-m),-objs -y -m)
+real-obj-y := $(call real-search, $(obj-y), .o, -objs -y)
+real-obj-m := $(call real-search, $(obj-m), .o, -objs -y -m)
 
 always-y += $(always-m)
 
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/3] kbuild: refactor fdtoverlay rule
  2021-05-02 18:09 [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada
@ 2021-05-02 18:09 ` Masahiro Yamada
  2021-05-02 18:09 ` [PATCH 3/3] kbuild: refactor modname-multi by using suffix-search Masahiro Yamada
  2021-05-05 17:51 ` [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada
  2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-02 18:09 UTC (permalink / raw)
  To: linux-kbuild; +Cc: Rob Herring, Masahiro Yamada, Michal Marek, linux-kernel

Rename overlay-y to multi-dtb-y, which is a consistent name with
multi-obj-y. Also, use multi-search to avoid code duplication.

Introduce real-dtb-y, which is a consistent name with real-obj-y,
to contain primitive blobs compiled from *.dts. This is used to
calculate the list of *.dt.yaml files.

Set -@ to base DTB without using $(eval ).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/Makefile.build |  2 +-
 scripts/Makefile.lib   | 33 +++++++++++++++------------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 5e39b0517186..949f723efe53 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -354,7 +354,7 @@ $(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE
 
 targets += $(filter-out $(subdir-builtin), $(real-obj-y))
 targets += $(filter-out $(subdir-modorder), $(real-obj-m))
-targets += $(lib-y) $(always-y) $(MAKECMDGOALS)
+targets += $(real-dtb-y) $(lib-y) $(always-y) $(MAKECMDGOALS)
 
 # Linker scripts preprocessor (.lds.S -> .lds)
 # ---------------------------------------------------------------------------
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 88b446ed6532..0da58af8d192 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -78,24 +78,18 @@ always-y += $(userprogs-always-y) $(userprogs-always-m)
 # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
 dtb-$(CONFIG_OF_ALL_DTBS)       += $(dtb-)
 
-# List all dtbs to be generated by fdtoverlay
-overlay-y := $(foreach m,$(dtb-y), $(if $(strip $($(m:.dtb=-dtbs))),$(m),))
-
-# Generate symbols for the base files so overlays can be applied to them.
-$(foreach m,$(overlay-y), $(eval DTC_FLAGS_$(basename $(firstword $($(m:.dtb=-dtbs)))) += -@))
-
-# Add base dtb and overlay dtbo
-dtb-y += $(foreach m,$(overlay-y), $($(m:.dtb=-dtbs)))
+# Composite DTB (i.e. DTB constructed by overlay)
+multi-dtb-y := $(call multi-search, $(dtb-y), .dtb, -dtbs)
+# Primitive DTB compiled from *.dts
+real-dtb-y := $(call real-search, $(dtb-y), .dtb, -dtbs)
+# Base DTB that overlay is applied onto (each first word of $(*-dtbs) expansion)
+base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, .dtb, -dtbs)))
 
 always-y			+= $(dtb-y)
 
 ifneq ($(CHECK_DTBS),)
-# Don't run schema checks for dtbs created by fdtoverlay as they don't
-# have corresponding dts files.
-dt-yaml-y := $(filter-out $(overlay-y),$(dtb-y))
-
-always-y += $(patsubst %.dtb,%.dt.yaml, $(dt-yaml-y))
-always-y += $(patsubst %.dtbo,%.dt.yaml, $(dt-yaml-y))
+always-y += $(patsubst %.dtb,%.dt.yaml, $(real-dtb-y))
+always-y += $(patsubst %.dtbo,%.dt.yaml, $(real-dtb-y))
 endif
 
 # Add subdir path
@@ -108,6 +102,8 @@ lib-y		:= $(addprefix $(obj)/,$(lib-y))
 real-obj-y	:= $(addprefix $(obj)/,$(real-obj-y))
 real-obj-m	:= $(addprefix $(obj)/,$(real-obj-m))
 multi-obj-m	:= $(addprefix $(obj)/, $(multi-obj-m))
+multi-dtb-y	:= $(addprefix $(obj)/, $(multi-dtb-y))
+real-dtb-y	:= $(addprefix $(obj)/, $(real-dtb-y))
 subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))
 
 # Finds the multi-part object the current object will be linked into.
@@ -322,6 +318,9 @@ endif
 
 DTC_FLAGS += $(DTC_FLAGS_$(basetarget))
 
+# Set -@ if the target is a base DTB that overlay is applied onto
+DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@)
+
 # Generate an assembly file to wrap the output of the device tree compiler
 quiet_cmd_dt_S_dtb= DTB     $@
 cmd_dt_S_dtb=						\
@@ -353,14 +352,12 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
 $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE
 	$(call if_changed_dep,dtc)
 
-overlay-y := $(addprefix $(obj)/, $(overlay-y))
-
 quiet_cmd_fdtoverlay = DTOVL   $@
       cmd_fdtoverlay = $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(real-prereqs)
 
-$(overlay-y): FORCE
+$(multi-dtb-y): FORCE
 	$(call if_changed,fdtoverlay)
-$(call multi_depend, $(overlay-y), .dtb, -dtbs)
+$(call multi_depend, $(multi-dtb-y), .dtb, -dtbs)
 
 DT_CHECKER ?= dt-validate
 DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),,-m)
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 3/3] kbuild: refactor modname-multi by using suffix-search
  2021-05-02 18:09 [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada
  2021-05-02 18:09 ` [PATCH 2/3] kbuild: refactor fdtoverlay rule Masahiro Yamada
@ 2021-05-02 18:09 ` Masahiro Yamada
  2021-05-05 17:51 ` [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada
  2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-02 18:09 UTC (permalink / raw)
  To: linux-kbuild; +Cc: Rob Herring, Masahiro Yamada, Michal Marek, linux-kernel

Improve the readability slightly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 0da58af8d192..865a5d4bdf1a 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -109,7 +109,7 @@ subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))
 # Finds the multi-part object the current object will be linked into.
 # If the object belongs to two or more multi-part objects, list them all.
 modname-multi = $(sort $(foreach m,$(multi-obj-ym),\
-		$(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=))))
+		$(if $(filter $*.o, $(call suffix-search, $m, .o, -objs -y -m)),$(m:.o=))))
 
 __modname = $(if $(modname-multi),$(modname-multi),$(basetarget))
 
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/3] kbuild: parameterize the .o part of suffix-search
  2021-05-02 18:09 [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada
  2021-05-02 18:09 ` [PATCH 2/3] kbuild: refactor fdtoverlay rule Masahiro Yamada
  2021-05-02 18:09 ` [PATCH 3/3] kbuild: refactor modname-multi by using suffix-search Masahiro Yamada
@ 2021-05-05 17:51 ` Masahiro Yamada
  2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-05-05 17:51 UTC (permalink / raw)
  To: Linux Kbuild mailing list
  Cc: Rob Herring, Michal Marek, Linux Kernel Mailing List

On Mon, May 3, 2021 at 3:10 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The suffix-search macro hard-codes the suffix, '.o'.
>
> Make it a parameter so that the multi-search and real-search macros
> can be reused for foo-dtbs syntax introduced by commit 15d16d6dadf6
> ("kbuild: Add generic rule to apply fdtoverlay").
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---


Applied to linux-kbuild.


>  scripts/Makefile.lib | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 64daf37e874b..88b446ed6532 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -44,19 +44,22 @@ else
>  obj-y          := $(filter-out %/, $(obj-y))
>  endif
>
> -# Expand $(foo-objs) $(foo-y) by calling $(call suffix-search,foo.o,-objs -y)
> -suffix-search = $(strip $(foreach s, $2, $($(1:.o=$s))))
> +# Expand $(foo-objs) $(foo-y) etc. by replacing their individuals
> +suffix-search = $(strip $(foreach s, $3, $($(1:%$(strip $2)=%$s))))
> +# List composite targets that are constructed by combining other targets
> +multi-search = $(sort $(foreach m, $1, $(if $(call suffix-search, $m, $2, $3 -), $m)))
> +# List primitive targets that are compiled from source files
> +real-search = $(foreach m, $1, $(if $(call suffix-search, $m, $2, $3 -), $(call suffix-search, $m, $2, $3), $m))
> +
>  # If $(foo-objs), $(foo-y), $(foo-m), or $(foo-) exists, foo.o is a composite object
> -multi-search = $(sort $(foreach m, $1, $(if $(call suffix-search, $m, $2 -), $m)))
> -multi-obj-y := $(call multi-search,$(obj-y),-objs -y)
> -multi-obj-m := $(call multi-search,$(obj-m),-objs -y -m)
> +multi-obj-y := $(call multi-search, $(obj-y), .o, -objs -y)
> +multi-obj-m := $(call multi-search, $(obj-m), .o, -objs -y -m)
>  multi-obj-ym := $(multi-obj-y) $(multi-obj-m)
>
>  # Replace multi-part objects by their individual parts,
>  # including built-in.a from subdirectories
> -real-search = $(foreach m, $1, $(if $(call suffix-search, $m, $2 -), $(call suffix-search, $m, $2), $m))
> -real-obj-y := $(call real-search, $(obj-y),-objs -y)
> -real-obj-m := $(call real-search, $(obj-m),-objs -y -m)
> +real-obj-y := $(call real-search, $(obj-y), .o, -objs -y)
> +real-obj-m := $(call real-search, $(obj-m), .o, -objs -y -m)
>
>  always-y += $(always-m)
>
> --
> 2.27.0
>


-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-05-05 17:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-02 18:09 [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada
2021-05-02 18:09 ` [PATCH 2/3] kbuild: refactor fdtoverlay rule Masahiro Yamada
2021-05-02 18:09 ` [PATCH 3/3] kbuild: refactor modname-multi by using suffix-search Masahiro Yamada
2021-05-05 17:51 ` [PATCH 1/3] kbuild: parameterize the .o part of suffix-search Masahiro Yamada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox