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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
pointlessone · Jan 22, 2019 · f96182e · f96182e
1 parent 91f382a
commit f96182e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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/firmware/.gitignore → ...s/base/firmware_loader/builtin/.gitignore b/firmware/.gitignore → ...s/base/firmware_loader/builtin/.gitignore
diff --git a/firmware/Makefile → ...ers/base/firmware_loader/builtin/Makefile b/firmware/Makefile → ...ers/base/firmware_loader/builtin/Makefile