firmware_loader: move firmware/ to drivers/base/firmware_loader/builtin/

Currently, the 'firmware' directory only contains a single Makefile
to embed extra firmware into the kernel.

Move it to the more relevant place.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Makefile b/Makefile
index 499b9681099543269ce97aa6935f7acc3ac98ab2..a9b9369b4bdda768fec38f6c069751cc3511c544 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -583,7 +583,7 @@ export KBUILD_MODULES KBUILD_BUILTIN
 ifeq ($(KBUILD_EXTMOD),)
 # Objects we will link into vmlinux / subdirs we need to visit
 init-y         := init/
-drivers-y      := drivers/ sound/ firmware/
+drivers-y      := drivers/ sound/
 net-y          := net/
 libs-y         := lib/
 core-y         := usr/

diff --git a/drivers/base/firmware_loader/Makefile b/drivers/base/firmware_loader/Makefile
index 5c7f422f7528670a7969187579bf2a576b948906..0b2dfa6259c91f721671e506e9b6e0f4ce794722 100644 (file)
--- a/drivers/base/firmware_loader/Makefile
+++ b/drivers/base/firmware_loader/Makefile
@@ -5,3 +5,5 @@ obj-$(CONFIG_FW_LOADER_USER_HELPER) += fallback_table.o
 obj-$(CONFIG_FW_LOADER)        += firmware_class.o
 firmware_class-objs := main.o
 firmware_class-$(CONFIG_FW_LOADER_USER_HELPER) += fallback.o
+
+obj-y += builtin/

diff --git a/drivers/base/firmware_loader/builtin/.gitignore b/drivers/base/firmware_loader/builtin/.gitignore
new file mode 100644 (file)
index 0000000..9c8bdb9
--- /dev/null
+++ b/drivers/base/firmware_loader/builtin/.gitignore
@@ -0,0 +1 @@
+*.gen.S

diff --git a/drivers/base/firmware_loader/builtin/Makefile b/drivers/base/firmware_loader/builtin/Makefile
new file mode 100644 (file)
index 0000000..37e5ae3
--- /dev/null
+++ b/drivers/base/firmware_loader/builtin/Makefile
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0
+
+# 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))
+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
+       $(call filechk,fwbin)
+
+# The .o files depend on the binaries directly; the .S files don't.
+$(addprefix $(obj)/, $(obj-y)): $(obj)/%.gen.o: $(fwdir)/%
+
+targets := $(patsubst $(obj)/%,%, \
+                                $(shell find $(obj) -name \*.gen.S 2>/dev/null))

diff --git a/firmware/.gitignore b/firmware/.gitignore
deleted file mode 100644 (file)
index 9c8bdb9..0000000
--- a/firmware/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.gen.S

diff --git a/firmware/Makefile b/firmware/Makefile
deleted file mode 100644 (file)
index 37e5ae3..0000000
--- a/firmware/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-# 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))
-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
-       $(call filechk,fwbin)
-
-# The .o files depend on the binaries directly; the .S files don't.
-$(addprefix $(obj)/, $(obj-y)): $(obj)/%.gen.o: $(fwdir)/%
-
-targets := $(patsubst $(obj)/%,%, \
-                                $(shell find $(obj) -name \*.gen.S 2>/dev/null))