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

This change “firmware_loader: move firmware/ to drivers/base/firmware_loader/builtin/” in Linux kernel is authored by Masahiro Yamada <yamada.masahiro [at] socionext.com> on Fri Jan 11 18:52:00 2019 +0900.

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>

This Linux change may have been applied to various maintained Linux releases and you can find Linux releases including commit f96182e.

There are 86 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 Makefile                                        |  2 +-
 drivers/base/firmware_loader/Makefile           |  2 ++
 drivers/base/firmware_loader/builtin/.gitignore |  1 +
 drivers/base/firmware_loader/builtin/Makefile   | 40 +++++++++++++++++++++++++
 firmware/.gitignore                             |  1 -
 firmware/Makefile                               | 40 -------------------------
 6 files changed, 44 insertions(+), 42 deletions(-)
 create mode 100644 drivers/base/firmware_loader/builtin/.gitignore
 create mode 100644 drivers/base/firmware_loader/builtin/Makefile
 delete mode 100644 firmware/.gitignore
 delete mode 100644 firmware/Makefile

diff --git a/Makefile b/Makefile
index 499b968..a9b9369 100644
--- 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 5c7f422..0b2dfa6 100644
--- 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
index 00000000..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
index 00000000..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
index 9c8bdb9..00000000
--- a/firmware/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.gen.S
diff --git a/firmware/Makefile b/firmware/Makefile
deleted file mode 100644
index 37e5ae3..00000000
--- 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))

The commit for this change in Linux stable tree is f96182e (patch).

Leave a Reply

Your email address will not be published. Required fields are marked *