Skip to content

Commit b38923a

Browse files
committed
Merge tag 'firmware_removal-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull firmware removal from Greg KH: "Many many years ago (at the kernel summit in Boston), we all came to the agreement that the firmware/ tree should be dropped from the kernel, and everyone use the linux-firmware package instead. For some minor reason, David Woodhouse didn't send the pull request at that point in time, and everyone forgot about this. The topic came up in the hallway track at the Plumbers conference this week, so here's a single patch that drops the whole firmware tree. The last firmware update was back in 2013, and all distros have been using linux-firmware instead since at least that year, if not before. The only commits to that directory since 2013 was some kbuild fixups for various build tool issues. So lets finally drop this, we don't need to lug them around in the kernel source tree anymore, especially as no one wants or uses them. This has passed build testing with 0-day, I don't think it made it into linux-next this week, but I figured it was good to get in before 4.14-rc1 was out" * tag 'firmware_removal-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: firmware: delete in-kernel firmware
2 parents 866a30e + 5620a0d commit b38923a

153 files changed

Lines changed: 1 addition & 129170 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
562562

563563
# Objects we will link into vmlinux / subdirs we need to visit
564564
init-y := init/
565-
drivers-y := drivers/ sound/ firmware/
565+
drivers-y := drivers/ sound/
566566
net-y := net/
567567
libs-y := lib/
568568
core-y := usr/
@@ -1128,16 +1128,6 @@ headerdep:
11281128
$(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \
11291129
$(srctree)/scripts/headerdep.pl -I$(srctree)/include
11301130

1131-
# ---------------------------------------------------------------------------
1132-
# Firmware install
1133-
INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware
1134-
export INSTALL_FW_PATH
1135-
1136-
PHONY += firmware_install
1137-
firmware_install:
1138-
@mkdir -p $(objtree)/firmware
1139-
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_install
1140-
11411131
# ---------------------------------------------------------------------------
11421132
# Kernel headers
11431133

@@ -1216,7 +1206,6 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
12161206
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
12171207
@$(kecho) ' Building modules, stage 2.';
12181208
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
1219-
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
12201209

12211210
modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
12221211
$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
@@ -1252,7 +1241,6 @@ _modinst_:
12521241
# boot script depmod is the master version.
12531242
PHONY += _modinst_post
12541243
_modinst_post: _modinst_
1255-
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst
12561244
$(call cmd,depmod)
12571245

12581246
ifeq ($(CONFIG_MODULE_SIG), y)
@@ -1375,8 +1363,6 @@ help:
13751363
@echo '* vmlinux - Build the bare kernel'
13761364
@echo '* modules - Build all modules'
13771365
@echo ' modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'
1378-
@echo ' firmware_install- Install all firmware to INSTALL_FW_PATH'
1379-
@echo ' (default: $$(INSTALL_MOD_PATH)/lib/firmware)'
13801366
@echo ' dir/ - Build all files in dir and below'
13811367
@echo ' dir/file.[ois] - Build specified target only'
13821368
@echo ' dir/file.ll - Build the LLVM assembly file'

firmware/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)