* [PATCH 1/3] scripts: remove unnecessary ihex2fw and check-lc_ctypes from .gitignore
@ 2018-12-21 3:12 Masahiro Yamada
2018-12-21 3:12 ` [PATCH 2/3] firmware: remove unnecessary patterns in .gitignore Masahiro Yamada
2018-12-21 3:12 ` [PATCH 3/3] firmware: rewrite Makefile Masahiro Yamada
0 siblings, 2 replies; 5+ messages in thread
From: Masahiro Yamada @ 2018-12-21 3:12 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, linux-kernel
Commit c512d2544c68 ("gitignore: ignore scripts/ihex2fw") was unneeded
because ihex2fw was generated in firmware/ instead of scripts/ at
that time. I guess it was accidentally added because ihex2fw.c was
pushed back and forth between those two directories according to
8b249b6856f1 ("fix modules_install via NFS") and 556b0f58bbcd (Revert
"fix modules_install via NFS"). Of course, you may cross file-moves
during git-bisect, but we do not generally add removed binaries to
the .gitignore file.
check-lc_ctype was removed by commit cb43fb5775df ("docs: remove
DocBook from the building system").
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/.gitignore | 2 --
1 file changed, 2 deletions(-)
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 12d302d..17f8cef 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -6,9 +6,7 @@ conmakehash
kallsyms
pnmtologo
unifdef
-ihex2fw
recordmcount
-check-lc_ctype
sortextable
asn1_compiler
extract-cert
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] firmware: remove unnecessary patterns in .gitignore
2018-12-21 3:12 [PATCH 1/3] scripts: remove unnecessary ihex2fw and check-lc_ctypes from .gitignore Masahiro Yamada
@ 2018-12-21 3:12 ` Masahiro Yamada
2018-12-21 3:12 ` [PATCH 3/3] firmware: rewrite Makefile Masahiro Yamada
1 sibling, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2018-12-21 3:12 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, linux-kernel
Commit df85b2d767aa ("firmware: Restore support for built-in firmware")
should not have restored this .gitignore blindly.
What git should ignore is merely *.gen.S now.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
firmware/.gitignore | 5 -----
1 file changed, 5 deletions(-)
diff --git a/firmware/.gitignore b/firmware/.gitignore
index d9c6901..9c8bdb9 100644
--- a/firmware/.gitignore
+++ b/firmware/.gitignore
@@ -1,6 +1 @@
*.gen.S
-*.fw
-*.bin
-*.csp
-*.dsp
-ihex2fw
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] firmware: rewrite Makefile
2018-12-21 3:12 [PATCH 1/3] scripts: remove unnecessary ihex2fw and check-lc_ctypes from .gitignore Masahiro Yamada
2018-12-21 3:12 ` [PATCH 2/3] firmware: remove unnecessary patterns in .gitignore Masahiro Yamada
@ 2018-12-21 3:12 ` Masahiro Yamada
2018-12-22 9:09 ` Masahiro Yamada
2018-12-24 15:21 ` Masahiro Yamada
1 sibling, 2 replies; 5+ messages in thread
From: Masahiro Yamada @ 2018-12-21 3:12 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, linux-kernel
Clean up the Makefile. Equivalent *.gen.S files are produced.
- Use filechk to remove ugly wordsize_deps
- Get FWNAME, FWSTR, ASM_WORD, ASM_ALIGN, and PROGBITS out of the
recipe for readability
- Move mkdir into the recipe
- Clean up generated directories by 'make clean'
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
For this patch to work correctly,
the following prerequisite is necessary:
https://patchwork.kernel.org/patch/10707461/
So, I will queue this series to kbuild tree.
BTW, my next plan is to move firmware/ to
more relevant place, for example,
drivers/base/firmware_loader/builtin.
firmware/Makefile | 89 ++++++++++++++++++++++---------------------------------
1 file changed, 35 insertions(+), 54 deletions(-)
diff --git a/firmware/Makefile b/firmware/Makefile
index 2964138..18d1c84 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,61 +1,42 @@
# SPDX-License-Identifier: GPL-2.0
-#
-# kbuild file for firmware/
-#
-# Create $(fwabs) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
+# Create $(fwdir) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
# leading /, it's relative to $(srctree).
fwdir := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE_DIR))
-fwabs := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
-
-fw-external-y := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE))
-
-quiet_cmd_fwbin = MK_FW $@
- cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)"; \
- FWSTR="$(subst /,_,$(subst .,_,$(subst -,_,$(patsubst \
- firmware/%.gen.S,%,$@))))"; \
- ASM_WORD=$(if $(CONFIG_64BIT),.quad,.long); \
- ASM_ALIGN=$(if $(CONFIG_64BIT),3,2); \
- PROGBITS=$(if $(CONFIG_ARM),%,@)progbits; \
- echo "/* Generated by firmware/Makefile */" > $@;\
- echo " .section .rodata" >>$@;\
- echo " .p2align $${ASM_ALIGN}" >>$@;\
- echo "_fw_$${FWSTR}_bin:" >>$@;\
- echo " .incbin \"$(2)\"" >>$@;\
- echo "_fw_end:" >>$@;\
- echo " .section .rodata.str,\"aMS\",$${PROGBITS},1" >>$@;\
- echo " .p2align $${ASM_ALIGN}" >>$@;\
- echo "_fw_$${FWSTR}_name:" >>$@;\
- echo " .string \"$$FWNAME\"" >>$@;\
- echo " .section .builtin_fw,\"a\",$${PROGBITS}" >>$@;\
- echo " .p2align $${ASM_ALIGN}" >>$@;\
- echo " $${ASM_WORD} _fw_$${FWSTR}_name" >>$@;\
- echo " $${ASM_WORD} _fw_$${FWSTR}_bin" >>$@;\
- echo " $${ASM_WORD} _fw_end - _fw_$${FWSTR}_bin" >>$@;
-
-# One of these files will change, or come into existence, whenever
-# the configuration changes between 32-bit and 64-bit. The .S files
-# need to change when that happens.
-wordsize_deps := $(wildcard include/config/64bit.h include/config/32bit.h \
- include/config/ppc32.h include/config/ppc64.h \
- include/config/superh32.h include/config/superh64.h \
- include/config/x86_32.h include/config/x86_64.h \
- firmware/Makefile)
-
-$(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \
- include/config/extra/firmware/dir.h
- $(call cmd,fwbin,$(fwabs)/$(patsubst $(obj)/%.gen.S,%,$@))
+fwdir := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
+
+obj-y := $(addsuffix .gen.o, $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE)))
+
+FWNAME = $(patsubst $(obj)/%.gen.S,%,$@)
+FWSTR = $(subst /,_,$(subst .,_,$(subst -,_,$(FWNAME))))
+ASM_WORD = $(if $(CONFIG_64BIT),.quad,.long)
+ASM_ALIGN = $(if $(CONFIG_64BIT),3,2)
+PROGBITS = $(if $(CONFIG_ARM),%,@)progbits
+
+filechk_fwbin = { \
+ echo "/* Generated by $(src)/Makefile */" ;\
+ echo " .section .rodata" ;\
+ echo " .p2align $(ASM_ALIGN)" ;\
+ echo "_fw_$(FWSTR)_bin:" ;\
+ echo " .incbin \"$(fwdir)/$(FWNAME)\"" ;\
+ echo "_fw_end:" ;\
+ echo " .section .rodata.str,\"aMS\",$(PROGBITS),1" ;\
+ echo " .p2align $(ASM_ALIGN)" ;\
+ echo "_fw_$(FWSTR)_name:" ;\
+ echo " .string \"$(FWNAME)\"" ;\
+ echo " .section .builtin_fw,\"a\",$(PROGBITS)" ;\
+ echo " .p2align $(ASM_ALIGN)" ;\
+ echo " $(ASM_WORD) _fw_$(FWSTR)_name" ;\
+ echo " $(ASM_WORD) _fw_$(FWSTR)_bin" ;\
+ echo " $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin" ;\
+}
+
+$(obj)/%.gen.S: FORCE
+ @mkdir -p $(dir $@)
+ $(call filechk,fwbin)
# The .o files depend on the binaries directly; the .S files don't.
-$(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/%
-
-obj-y += $(patsubst %,%.gen.o, $(fw-external-y))
-
-ifeq ($(KBUILD_SRC),)
-# Makefile.build only creates subdirectories for O= builds, but external
-# firmware might live outside the kernel source tree
-_dummy := $(foreach d,$(addprefix $(obj)/,$(dir $(fw-external-y))), $(shell [ -d $(d) ] || mkdir -p $(d)))
-endif
+$(addprefix $(obj)/, $(obj-y)): $(obj)/%.gen.o: $(fwdir)/%
-targets := $(patsubst $(obj)/%,%, \
- $(shell find $(obj) -name \*.gen.S 2>/dev/null))
+targets := $(shell cd $(obj) && find * -name '*.gen.S')
+clean-dirs := $(shell cd $(obj) && find * -maxdepth 0 -type d)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] firmware: rewrite Makefile
2018-12-21 3:12 ` [PATCH 3/3] firmware: rewrite Makefile Masahiro Yamada
@ 2018-12-22 9:09 ` Masahiro Yamada
2018-12-24 15:21 ` Masahiro Yamada
1 sibling, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2018-12-22 9:09 UTC (permalink / raw)
To: Linux Kbuild mailing list; +Cc: Linux Kernel Mailing List
On Fri, Dec 21, 2018 at 5:43 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Clean up the Makefile. Equivalent *.gen.S files are produced.
>
> - Use filechk to remove ugly wordsize_deps
>
> - Get FWNAME, FWSTR, ASM_WORD, ASM_ALIGN, and PROGBITS out of the
> recipe for readability
>
> - Move mkdir into the recipe
>
> - Clean up generated directories by 'make clean'
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> -targets := $(patsubst $(obj)/%,%, \
> - $(shell find $(obj) -name \*.gen.S 2>/dev/null))
> +targets := $(shell cd $(obj) && find * -name '*.gen.S')
> +clean-dirs := $(shell cd $(obj) && find * -maxdepth 0 -type d)
This 'find' emits a warning for out-of-tree build.
So, I will get it back to the original code.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] firmware: rewrite Makefile
2018-12-21 3:12 ` [PATCH 3/3] firmware: rewrite Makefile Masahiro Yamada
2018-12-22 9:09 ` Masahiro Yamada
@ 2018-12-24 15:21 ` Masahiro Yamada
1 sibling, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2018-12-24 15:21 UTC (permalink / raw)
To: Linux Kbuild mailing list; +Cc: Linux Kernel Mailing List
On Fri, Dec 21, 2018 at 5:43 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Clean up the Makefile. Equivalent *.gen.S files are produced.
>
> - Use filechk to remove ugly wordsize_deps
>
> - Get FWNAME, FWSTR, ASM_WORD, ASM_ALIGN, and PROGBITS out of the
> recipe for readability
>
> - Move mkdir into the recipe
>
> - Clean up generated directories by 'make clean'
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> For this patch to work correctly,
> the following prerequisite is necessary:
>
> https://patchwork.kernel.org/patch/10707461/
>
> So, I will queue this series to kbuild tree.
>
> BTW, my next plan is to move firmware/ to
> more relevant place, for example,
> drivers/base/firmware_loader/builtin.
>
>
> firmware/Makefile | 89 ++++++++++++++++++++++---------------------------------
> 1 file changed, 35 insertions(+), 54 deletions(-)
>
> diff --git a/firmware/Makefile b/firmware/Makefile
> index 2964138..18d1c84 100644
> --- a/firmware/Makefile
> +++ b/firmware/Makefile
> @@ -1,61 +1,42 @@
> # SPDX-License-Identifier: GPL-2.0
> -#
> -# kbuild file for firmware/
> -#
>
> -# Create $(fwabs) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
> +# Create $(fwdir) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
> # leading /, it's relative to $(srctree).
> fwdir := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE_DIR))
> -fwabs := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
> -
> -fw-external-y := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE))
> -
> -quiet_cmd_fwbin = MK_FW $@
> - cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)"; \
> - FWSTR="$(subst /,_,$(subst .,_,$(subst -,_,$(patsubst \
> - firmware/%.gen.S,%,$@))))"; \
> - ASM_WORD=$(if $(CONFIG_64BIT),.quad,.long); \
> - ASM_ALIGN=$(if $(CONFIG_64BIT),3,2); \
> - PROGBITS=$(if $(CONFIG_ARM),%,@)progbits; \
> - echo "/* Generated by firmware/Makefile */" > $@;\
> - echo " .section .rodata" >>$@;\
> - echo " .p2align $${ASM_ALIGN}" >>$@;\
> - echo "_fw_$${FWSTR}_bin:" >>$@;\
> - echo " .incbin \"$(2)\"" >>$@;\
> - echo "_fw_end:" >>$@;\
> - echo " .section .rodata.str,\"aMS\",$${PROGBITS},1" >>$@;\
> - echo " .p2align $${ASM_ALIGN}" >>$@;\
> - echo "_fw_$${FWSTR}_name:" >>$@;\
> - echo " .string \"$$FWNAME\"" >>$@;\
> - echo " .section .builtin_fw,\"a\",$${PROGBITS}" >>$@;\
> - echo " .p2align $${ASM_ALIGN}" >>$@;\
> - echo " $${ASM_WORD} _fw_$${FWSTR}_name" >>$@;\
> - echo " $${ASM_WORD} _fw_$${FWSTR}_bin" >>$@;\
> - echo " $${ASM_WORD} _fw_end - _fw_$${FWSTR}_bin" >>$@;
> -
> -# One of these files will change, or come into existence, whenever
> -# the configuration changes between 32-bit and 64-bit. The .S files
> -# need to change when that happens.
> -wordsize_deps := $(wildcard include/config/64bit.h include/config/32bit.h \
> - include/config/ppc32.h include/config/ppc64.h \
> - include/config/superh32.h include/config/superh64.h \
> - include/config/x86_32.h include/config/x86_64.h \
> - firmware/Makefile)
> -
> -$(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \
> - include/config/extra/firmware/dir.h
> - $(call cmd,fwbin,$(fwabs)/$(patsubst $(obj)/%.gen.S,%,$@))
> +fwdir := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
> +
> +obj-y := $(addsuffix .gen.o, $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE)))
> +
> +FWNAME = $(patsubst $(obj)/%.gen.S,%,$@)
> +FWSTR = $(subst /,_,$(subst .,_,$(subst -,_,$(FWNAME))))
> +ASM_WORD = $(if $(CONFIG_64BIT),.quad,.long)
> +ASM_ALIGN = $(if $(CONFIG_64BIT),3,2)
> +PROGBITS = $(if $(CONFIG_ARM),%,@)progbits
> +
> +filechk_fwbin = { \
> + echo "/* Generated by $(src)/Makefile */" ;\
> + echo " .section .rodata" ;\
> + echo " .p2align $(ASM_ALIGN)" ;\
> + echo "_fw_$(FWSTR)_bin:" ;\
> + echo " .incbin \"$(fwdir)/$(FWNAME)\"" ;\
> + echo "_fw_end:" ;\
> + echo " .section .rodata.str,\"aMS\",$(PROGBITS),1" ;\
> + echo " .p2align $(ASM_ALIGN)" ;\
> + echo "_fw_$(FWSTR)_name:" ;\
> + echo " .string \"$(FWNAME)\"" ;\
> + echo " .section .builtin_fw,\"a\",$(PROGBITS)" ;\
> + echo " .p2align $(ASM_ALIGN)" ;\
> + echo " $(ASM_WORD) _fw_$(FWSTR)_name" ;\
> + echo " $(ASM_WORD) _fw_$(FWSTR)_bin" ;\
> + echo " $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin" ;\
> +}
> +
> +$(obj)/%.gen.S: FORCE
> + @mkdir -p $(dir $@)
Removed this line because filechk creates the directory automatically.
Then, applied to linux-kbuild.
> + $(call filechk,fwbin)
>
> # The .o files depend on the binaries directly; the .S files don't.
> -$(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/%
> -
> -obj-y += $(patsubst %,%.gen.o, $(fw-external-y))
> -
> -ifeq ($(KBUILD_SRC),)
> -# Makefile.build only creates subdirectories for O= builds, but external
> -# firmware might live outside the kernel source tree
> -_dummy := $(foreach d,$(addprefix $(obj)/,$(dir $(fw-external-y))), $(shell [ -d $(d) ] || mkdir -p $(d)))
> -endif
> +$(addprefix $(obj)/, $(obj-y)): $(obj)/%.gen.o: $(fwdir)/%
>
> -targets := $(patsubst $(obj)/%,%, \
> - $(shell find $(obj) -name \*.gen.S 2>/dev/null))
> +targets := $(shell cd $(obj) && find * -name '*.gen.S')
> +clean-dirs := $(shell cd $(obj) && find * -maxdepth 0 -type d)
> --
> 2.7.4
>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-24 15:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-21 3:12 [PATCH 1/3] scripts: remove unnecessary ihex2fw and check-lc_ctypes from .gitignore Masahiro Yamada
2018-12-21 3:12 ` [PATCH 2/3] firmware: remove unnecessary patterns in .gitignore Masahiro Yamada
2018-12-21 3:12 ` [PATCH 3/3] firmware: rewrite Makefile Masahiro Yamada
2018-12-22 9:09 ` Masahiro Yamada
2018-12-24 15:21 ` Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.