diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-01-11 18:52:00 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-22 10:23:18 +0100 |
| commit | f96182e959a41e35df0adae9ae09a49ff8a618a8 (patch) | |
| tree | e33c62be09a5f40812c888bc7d5722b9aaa81515 | |
| parent | 91f382a46822c7a2913e6fabb2b882cc0f23144a (diff) | |
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | drivers/base/firmware_loader/Makefile | 2 | ||||
| -rw-r--r-- | drivers/base/firmware_loader/builtin/.gitignore (renamed from firmware/.gitignore) | 0 | ||||
| -rw-r--r-- | drivers/base/firmware_loader/builtin/Makefile (renamed from firmware/Makefile) | 0 |
4 files changed, 3 insertions, 1 deletions
@@ -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 5c7f422f7528..0b2dfa6259c9 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/firmware/.gitignore b/drivers/base/firmware_loader/builtin/.gitignore index 9c8bdb9fdcc3..9c8bdb9fdcc3 100644 --- a/firmware/.gitignore +++ b/drivers/base/firmware_loader/builtin/.gitignore diff --git a/firmware/Makefile b/drivers/base/firmware_loader/builtin/Makefile index 37e5ae387400..37e5ae387400 100644 --- a/firmware/Makefile +++ b/drivers/base/firmware_loader/builtin/Makefile |