aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Gilbert <benjamin.gilbert@coreos.com>2018-01-23 21:06:31 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-25 06:46:30 -0500
commit7f55c733b6607d6bfc16057641f18280e587cca8 (patch)
tree0775169765596edcfe87cdfbcd0d0b953709d4ea
parent003948c54e5b5034a9bbb4923336f5aba125eae6 (diff)
firmware: Drop FIRMWARE_IN_KERNEL Kconfig option
It doesn't actually do anything. Merge its help text into EXTRA_FIRMWARE. Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware") Fixes: 0946b2fb38fd ("firmware: cleanup FIRMWARE_IN_KERNEL message") Signed-off-by: Benjamin Gilbert <benjamin.gilbert@coreos.com> Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--arch/arc/configs/axs101_defconfig1
-rw-r--r--arch/arc/configs/axs103_defconfig1
-rw-r--r--arch/arc/configs/axs103_smp_defconfig1
-rw-r--r--arch/arc/configs/haps_hs_defconfig1
-rw-r--r--arch/arc/configs/haps_hs_smp_defconfig1
-rw-r--r--arch/arc/configs/hsdk_defconfig1
-rw-r--r--arch/arc/configs/nsim_700_defconfig1
-rw-r--r--arch/arc/configs/nsim_hs_defconfig1
-rw-r--r--arch/arc/configs/nsim_hs_smp_defconfig1
-rw-r--r--arch/arc/configs/nsimosci_defconfig1
-rw-r--r--arch/arc/configs/nsimosci_hs_defconfig1
-rw-r--r--arch/arc/configs/nsimosci_hs_smp_defconfig1
-rw-r--r--arch/arc/configs/tb10x_defconfig1
-rw-r--r--arch/arc/configs/vdk_hs38_defconfig1
-rw-r--r--arch/arc/configs/vdk_hs38_smp_defconfig1
-rw-r--r--arch/arm/configs/cns3420vb_defconfig1
-rw-r--r--arch/arm/configs/magician_defconfig1
-rw-r--r--arch/arm/configs/mini2440_defconfig1
-rw-r--r--arch/arm/configs/mv78xx0_defconfig1
-rw-r--r--arch/arm/configs/mxs_defconfig1
-rw-r--r--arch/arm/configs/orion5x_defconfig1
-rw-r--r--arch/arm/configs/tegra_defconfig1
-rw-r--r--arch/arm/configs/vf610m4_defconfig1
-rw-r--r--arch/m68k/configs/amiga_defconfig1
-rw-r--r--arch/m68k/configs/apollo_defconfig1
-rw-r--r--arch/m68k/configs/atari_defconfig1
-rw-r--r--arch/m68k/configs/bvme6000_defconfig1
-rw-r--r--arch/m68k/configs/hp300_defconfig1
-rw-r--r--arch/m68k/configs/mac_defconfig1
-rw-r--r--arch/m68k/configs/multi_defconfig1
-rw-r--r--arch/m68k/configs/mvme147_defconfig1
-rw-r--r--arch/m68k/configs/mvme16x_defconfig1
-rw-r--r--arch/m68k/configs/q40_defconfig1
-rw-r--r--arch/m68k/configs/sun3_defconfig1
-rw-r--r--arch/m68k/configs/sun3x_defconfig1
-rw-r--r--arch/mips/configs/ar7_defconfig1
-rw-r--r--arch/mips/configs/ath25_defconfig1
-rw-r--r--arch/mips/configs/ath79_defconfig1
-rw-r--r--arch/mips/configs/pic32mzda_defconfig1
-rw-r--r--arch/mips/configs/qi_lb60_defconfig1
-rw-r--r--arch/mips/configs/rt305x_defconfig1
-rw-r--r--arch/mips/configs/xway_defconfig1
-rw-r--r--arch/mn10300/configs/asb2364_defconfig1
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig1
-rw-r--r--arch/powerpc/configs/mpc512x_defconfig1
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig1
-rw-r--r--arch/powerpc/configs/ps3_defconfig1
-rw-r--r--arch/powerpc/configs/wii_defconfig1
-rw-r--r--arch/s390/configs/zfcpdump_defconfig1
-rw-r--r--arch/sh/configs/polaris_defconfig1
-rw-r--r--arch/tile/configs/tilegx_defconfig1
-rw-r--r--arch/tile/configs/tilepro_defconfig1
-rw-r--r--drivers/base/Kconfig28
53 files changed, 5 insertions, 75 deletions
diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig
index ec7c849a5c8e..09f85154c5a4 100644
--- a/arch/arc/configs/axs101_defconfig
+++ b/arch/arc/configs/axs101_defconfig
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y
44CONFIG_DEVTMPFS=y 44CONFIG_DEVTMPFS=y
45# CONFIG_STANDALONE is not set 45# CONFIG_STANDALONE is not set
46# CONFIG_PREVENT_FIRMWARE_BUILD is not set 46# CONFIG_PREVENT_FIRMWARE_BUILD is not set
47# CONFIG_FIRMWARE_IN_KERNEL is not set
48CONFIG_SCSI=y 47CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 48CONFIG_BLK_DEV_SD=y
50CONFIG_NETDEVICES=y 49CONFIG_NETDEVICES=y
diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig
index 63d3cf69e0b0..09fed3ef22b6 100644
--- a/arch/arc/configs/axs103_defconfig
+++ b/arch/arc/configs/axs103_defconfig
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y
44CONFIG_DEVTMPFS=y 44CONFIG_DEVTMPFS=y
45# CONFIG_STANDALONE is not set 45# CONFIG_STANDALONE is not set
46# CONFIG_PREVENT_FIRMWARE_BUILD is not set 46# CONFIG_PREVENT_FIRMWARE_BUILD is not set
47# CONFIG_FIRMWARE_IN_KERNEL is not set
48CONFIG_BLK_DEV_LOOP=y 47CONFIG_BLK_DEV_LOOP=y
49CONFIG_SCSI=y 48CONFIG_SCSI=y
50CONFIG_BLK_DEV_SD=y 49CONFIG_BLK_DEV_SD=y
diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig
index f613ecac14a7..ea2f6d817d1a 100644
--- a/arch/arc/configs/axs103_smp_defconfig
+++ b/arch/arc/configs/axs103_smp_defconfig
@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y
45CONFIG_DEVTMPFS=y 45CONFIG_DEVTMPFS=y
46# CONFIG_STANDALONE is not set 46# CONFIG_STANDALONE is not set
47# CONFIG_PREVENT_FIRMWARE_BUILD is not set 47# CONFIG_PREVENT_FIRMWARE_BUILD is not set
48# CONFIG_FIRMWARE_IN_KERNEL is not set
49CONFIG_BLK_DEV_LOOP=y 48CONFIG_BLK_DEV_LOOP=y
50CONFIG_SCSI=y 49CONFIG_SCSI=y
51CONFIG_BLK_DEV_SD=y 50CONFIG_BLK_DEV_SD=y
diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig
index db04ea4dd2d9..ab231c040efe 100644
--- a/arch/arc/configs/haps_hs_defconfig
+++ b/arch/arc/configs/haps_hs_defconfig
@@ -40,7 +40,6 @@ CONFIG_INET=y
40CONFIG_DEVTMPFS=y 40CONFIG_DEVTMPFS=y
41# CONFIG_STANDALONE is not set 41# CONFIG_STANDALONE is not set
42# CONFIG_PREVENT_FIRMWARE_BUILD is not set 42# CONFIG_PREVENT_FIRMWARE_BUILD is not set
43# CONFIG_FIRMWARE_IN_KERNEL is not set
44# CONFIG_BLK_DEV is not set 43# CONFIG_BLK_DEV is not set
45CONFIG_NETDEVICES=y 44CONFIG_NETDEVICES=y
46# CONFIG_NET_VENDOR_ARC is not set 45# CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig
index 3507be2af6fe..cf449cbf440d 100644
--- a/arch/arc/configs/haps_hs_smp_defconfig
+++ b/arch/arc/configs/haps_hs_smp_defconfig
@@ -43,7 +43,6 @@ CONFIG_INET=y
43CONFIG_DEVTMPFS=y 43CONFIG_DEVTMPFS=y
44# CONFIG_STANDALONE is not set 44# CONFIG_STANDALONE is not set
45# CONFIG_PREVENT_FIRMWARE_BUILD is not set 45# CONFIG_PREVENT_FIRMWARE_BUILD is not set
46# CONFIG_FIRMWARE_IN_KERNEL is not set
47# CONFIG_BLK_DEV is not set 46# CONFIG_BLK_DEV is not set
48CONFIG_NETDEVICES=y 47CONFIG_NETDEVICES=y
49# CONFIG_NET_VENDOR_ARC is not set 48# CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig
index 7b8f8faf8a24..128d615d1ca7 100644
--- a/arch/arc/configs/hsdk_defconfig
+++ b/arch/arc/configs/hsdk_defconfig
@@ -32,7 +32,6 @@ CONFIG_INET=y
32CONFIG_DEVTMPFS=y 32CONFIG_DEVTMPFS=y
33# CONFIG_STANDALONE is not set 33# CONFIG_STANDALONE is not set
34# CONFIG_PREVENT_FIRMWARE_BUILD is not set 34# CONFIG_PREVENT_FIRMWARE_BUILD is not set
35# CONFIG_FIRMWARE_IN_KERNEL is not set
36CONFIG_SCSI=y 35CONFIG_SCSI=y
37CONFIG_BLK_DEV_SD=y 36CONFIG_BLK_DEV_SD=y
38CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig
index 6dff83a238b8..31c2c70b34a1 100644
--- a/arch/arc/configs/nsim_700_defconfig
+++ b/arch/arc/configs/nsim_700_defconfig
@@ -36,7 +36,6 @@ CONFIG_INET=y
36CONFIG_DEVTMPFS=y 36CONFIG_DEVTMPFS=y
37# CONFIG_STANDALONE is not set 37# CONFIG_STANDALONE is not set
38# CONFIG_PREVENT_FIRMWARE_BUILD is not set 38# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39# CONFIG_FIRMWARE_IN_KERNEL is not set
40# CONFIG_BLK_DEV is not set 39# CONFIG_BLK_DEV is not set
41CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
42CONFIG_ARC_EMAC=y 41CONFIG_ARC_EMAC=y
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig
index 31ee51b987e7..a578c721d50f 100644
--- a/arch/arc/configs/nsim_hs_defconfig
+++ b/arch/arc/configs/nsim_hs_defconfig
@@ -40,7 +40,6 @@ CONFIG_INET=y
40CONFIG_DEVTMPFS=y 40CONFIG_DEVTMPFS=y
41# CONFIG_STANDALONE is not set 41# CONFIG_STANDALONE is not set
42# CONFIG_PREVENT_FIRMWARE_BUILD is not set 42# CONFIG_PREVENT_FIRMWARE_BUILD is not set
43# CONFIG_FIRMWARE_IN_KERNEL is not set
44# CONFIG_BLK_DEV is not set 43# CONFIG_BLK_DEV is not set
45# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 44# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
46# CONFIG_INPUT_KEYBOARD is not set 45# CONFIG_INPUT_KEYBOARD is not set
diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig
index 8d3b1f67cae4..37d7395f3272 100644
--- a/arch/arc/configs/nsim_hs_smp_defconfig
+++ b/arch/arc/configs/nsim_hs_smp_defconfig
@@ -39,7 +39,6 @@ CONFIG_INET=y
39CONFIG_DEVTMPFS=y 39CONFIG_DEVTMPFS=y
40# CONFIG_STANDALONE is not set 40# CONFIG_STANDALONE is not set
41# CONFIG_PREVENT_FIRMWARE_BUILD is not set 41# CONFIG_PREVENT_FIRMWARE_BUILD is not set
42# CONFIG_FIRMWARE_IN_KERNEL is not set
43# CONFIG_BLK_DEV is not set 42# CONFIG_BLK_DEV is not set
44# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 43# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
45# CONFIG_INPUT_KEYBOARD is not set 44# CONFIG_INPUT_KEYBOARD is not set
diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig
index 6168ce2ac2ef..1e1470e2a7f0 100644
--- a/arch/arc/configs/nsimosci_defconfig
+++ b/arch/arc/configs/nsimosci_defconfig
@@ -35,7 +35,6 @@ CONFIG_INET=y
35CONFIG_DEVTMPFS=y 35CONFIG_DEVTMPFS=y
36# CONFIG_STANDALONE is not set 36# CONFIG_STANDALONE is not set
37# CONFIG_PREVENT_FIRMWARE_BUILD is not set 37# CONFIG_PREVENT_FIRMWARE_BUILD is not set
38# CONFIG_FIRMWARE_IN_KERNEL is not set
39# CONFIG_BLK_DEV is not set 38# CONFIG_BLK_DEV is not set
40CONFIG_NETDEVICES=y 39CONFIG_NETDEVICES=y
41CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y 40CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig
index a70bdeb2b3fd..084a6e42685b 100644
--- a/arch/arc/configs/nsimosci_hs_defconfig
+++ b/arch/arc/configs/nsimosci_hs_defconfig
@@ -36,7 +36,6 @@ CONFIG_INET=y
36CONFIG_DEVTMPFS=y 36CONFIG_DEVTMPFS=y
37# CONFIG_STANDALONE is not set 37# CONFIG_STANDALONE is not set
38# CONFIG_PREVENT_FIRMWARE_BUILD is not set 38# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39# CONFIG_FIRMWARE_IN_KERNEL is not set
40# CONFIG_BLK_DEV is not set 39# CONFIG_BLK_DEV is not set
41CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
42CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y 41CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig
index ef96406c446e..f36d47990415 100644
--- a/arch/arc/configs/nsimosci_hs_smp_defconfig
+++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
@@ -39,7 +39,6 @@ CONFIG_INET=y
39CONFIG_DEVTMPFS=y 39CONFIG_DEVTMPFS=y
40# CONFIG_STANDALONE is not set 40# CONFIG_STANDALONE is not set
41# CONFIG_PREVENT_FIRMWARE_BUILD is not set 41# CONFIG_PREVENT_FIRMWARE_BUILD is not set
42# CONFIG_FIRMWARE_IN_KERNEL is not set
43# CONFIG_BLK_DEV is not set 42# CONFIG_BLK_DEV is not set
44CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
45# CONFIG_NET_VENDOR_ARC is not set 44# CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig
index f30182549395..1aca2e8fd1ba 100644
--- a/arch/arc/configs/tb10x_defconfig
+++ b/arch/arc/configs/tb10x_defconfig
@@ -42,7 +42,6 @@ CONFIG_IP_MULTICAST=y
42# CONFIG_IPV6 is not set 42# CONFIG_IPV6 is not set
43# CONFIG_WIRELESS is not set 43# CONFIG_WIRELESS is not set
44CONFIG_DEVTMPFS=y 44CONFIG_DEVTMPFS=y
45# CONFIG_FIRMWARE_IN_KERNEL is not set
46CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
47# CONFIG_NET_CADENCE is not set 46# CONFIG_NET_CADENCE is not set
48# CONFIG_NET_VENDOR_BROADCOM is not set 47# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/arc/configs/vdk_hs38_defconfig b/arch/arc/configs/vdk_hs38_defconfig
index 4fcf4f2503f6..f629493929ea 100644
--- a/arch/arc/configs/vdk_hs38_defconfig
+++ b/arch/arc/configs/vdk_hs38_defconfig
@@ -31,7 +31,6 @@ CONFIG_DEVTMPFS=y
31CONFIG_DEVTMPFS_MOUNT=y 31CONFIG_DEVTMPFS_MOUNT=y
32# CONFIG_STANDALONE is not set 32# CONFIG_STANDALONE is not set
33# CONFIG_PREVENT_FIRMWARE_BUILD is not set 33# CONFIG_PREVENT_FIRMWARE_BUILD is not set
34# CONFIG_FIRMWARE_IN_KERNEL is not set
35CONFIG_MTD=y 34CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 35CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_BLOCK=y 36CONFIG_MTD_BLOCK=y
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
index 7b71464f6c2f..21f0ca26a05d 100644
--- a/arch/arc/configs/vdk_hs38_smp_defconfig
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
@@ -34,7 +34,6 @@ CONFIG_DEVTMPFS=y
34CONFIG_DEVTMPFS_MOUNT=y 34CONFIG_DEVTMPFS_MOUNT=y
35# CONFIG_STANDALONE is not set 35# CONFIG_STANDALONE is not set
36# CONFIG_PREVENT_FIRMWARE_BUILD is not set 36# CONFIG_PREVENT_FIRMWARE_BUILD is not set
37# CONFIG_FIRMWARE_IN_KERNEL is not set
38CONFIG_MTD=y 37CONFIG_MTD=y
39CONFIG_MTD_CMDLINE_PARTS=y 38CONFIG_MTD_CMDLINE_PARTS=y
40CONFIG_MTD_BLOCK=y 39CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig
index 63a953d855a6..c6dcd6e4f4e6 100644
--- a/arch/arm/configs/cns3420vb_defconfig
+++ b/arch/arm/configs/cns3420vb_defconfig
@@ -28,7 +28,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
28CONFIG_ZBOOT_ROM_BSS=0x0 28CONFIG_ZBOOT_ROM_BSS=0x0
29CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait" 29CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait"
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FIRMWARE_IN_KERNEL is not set
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index ec5674c229a3..de5be2fc7306 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -54,7 +54,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
54CONFIG_BT_HIDP=m 54CONFIG_BT_HIDP=m
55CONFIG_BT_HCIBTUSB=m 55CONFIG_BT_HCIBTUSB=m
56CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 56CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
57# CONFIG_FIRMWARE_IN_KERNEL is not set
58CONFIG_MTD=y 57CONFIG_MTD=y
59CONFIG_MTD_CMDLINE_PARTS=y 58CONFIG_MTD_CMDLINE_PARTS=y
60CONFIG_MTD_BLOCK=y 59CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig
index cf7dcb2c86e6..88ea02e7ba19 100644
--- a/arch/arm/configs/mini2440_defconfig
+++ b/arch/arm/configs/mini2440_defconfig
@@ -77,7 +77,6 @@ CONFIG_MAC80211=m
77CONFIG_MAC80211_MESH=y 77CONFIG_MAC80211_MESH=y
78CONFIG_MAC80211_LEDS=y 78CONFIG_MAC80211_LEDS=y
79CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 79CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
80# CONFIG_FIRMWARE_IN_KERNEL is not set
81CONFIG_CONNECTOR=m 80CONFIG_CONNECTOR=m
82CONFIG_MTD=y 81CONFIG_MTD=y
83CONFIG_MTD_CMDLINE_PARTS=y 82CONFIG_MTD_CMDLINE_PARTS=y
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig
index 752e2e74de5b..0448bd8075ac 100644
--- a/arch/arm/configs/mv78xx0_defconfig
+++ b/arch/arm/configs/mv78xx0_defconfig
@@ -37,7 +37,6 @@ CONFIG_IP_PNP_BOOTP=y
37# CONFIG_IPV6 is not set 37# CONFIG_IPV6 is not set
38CONFIG_NET_PKTGEN=m 38CONFIG_NET_PKTGEN=m
39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40# CONFIG_FIRMWARE_IN_KERNEL is not set
41CONFIG_MTD=y 40CONFIG_MTD=y
42CONFIG_MTD_CMDLINE_PARTS=y 41CONFIG_MTD_CMDLINE_PARTS=y
43CONFIG_MTD_BLOCK=y 42CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index e5822ab01b7d..bbfb6759447b 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -46,7 +46,6 @@ CONFIG_CAN_FLEXCAN=m
46# CONFIG_WIRELESS is not set 46# CONFIG_WIRELESS is not set
47CONFIG_DEVTMPFS=y 47CONFIG_DEVTMPFS=y
48CONFIG_DEVTMPFS_MOUNT=y 48CONFIG_DEVTMPFS_MOUNT=y
49# CONFIG_FIRMWARE_IN_KERNEL is not set
50CONFIG_MTD=y 49CONFIG_MTD=y
51CONFIG_MTD_CMDLINE_PARTS=y 50CONFIG_MTD_CMDLINE_PARTS=y
52CONFIG_MTD_BLOCK=y 51CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index b831baddae02..bf9046331f6e 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -60,7 +60,6 @@ CONFIG_IP_PNP_BOOTP=y
60CONFIG_NET_DSA=y 60CONFIG_NET_DSA=y
61CONFIG_NET_PKTGEN=m 61CONFIG_NET_PKTGEN=m
62CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 62CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
63# CONFIG_FIRMWARE_IN_KERNEL is not set
64CONFIG_MTD=y 63CONFIG_MTD=y
65CONFIG_MTD_CMDLINE_PARTS=y 64CONFIG_MTD_CMDLINE_PARTS=y
66CONFIG_MTD_BLOCK=y 65CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 6678f2929356..9dccd305132b 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -76,7 +76,6 @@ CONFIG_RFKILL_INPUT=y
76CONFIG_RFKILL_GPIO=y 76CONFIG_RFKILL_GPIO=y
77CONFIG_DEVTMPFS=y 77CONFIG_DEVTMPFS=y
78CONFIG_DEVTMPFS_MOUNT=y 78CONFIG_DEVTMPFS_MOUNT=y
79# CONFIG_FIRMWARE_IN_KERNEL is not set
80CONFIG_DMA_CMA=y 79CONFIG_DMA_CMA=y
81CONFIG_CMA_SIZE_MBYTES=64 80CONFIG_CMA_SIZE_MBYTES=64
82CONFIG_TEGRA_GMI=y 81CONFIG_TEGRA_GMI=y
diff --git a/arch/arm/configs/vf610m4_defconfig b/arch/arm/configs/vf610m4_defconfig
index b7ecb83a95b6..a89f035c3b01 100644
--- a/arch/arm/configs/vf610m4_defconfig
+++ b/arch/arm/configs/vf610m4_defconfig
@@ -23,7 +23,6 @@ CONFIG_BINFMT_SHARED_FLAT=y
23# CONFIG_UEVENT_HELPER is not set 23# CONFIG_UEVENT_HELPER is not set
24# CONFIG_STANDALONE is not set 24# CONFIG_STANDALONE is not set
25# CONFIG_PREVENT_FIRMWARE_BUILD is not set 25# CONFIG_PREVENT_FIRMWARE_BUILD is not set
26# CONFIG_FIRMWARE_IN_KERNEL is not set
27# CONFIG_ALLOW_DEV_COREDUMP is not set 26# CONFIG_ALLOW_DEV_COREDUMP is not set
28CONFIG_BLK_DEV_RAM=y 27CONFIG_BLK_DEV_RAM=y
29CONFIG_BLK_DEV_RAM_COUNT=4 28CONFIG_BLK_DEV_RAM_COUNT=4
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 5b5fa9831b4d..c911adf52b53 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -313,7 +313,6 @@ CONFIG_NET_DEVLINK=m
313# CONFIG_UEVENT_HELPER is not set 313# CONFIG_UEVENT_HELPER is not set
314CONFIG_DEVTMPFS=y 314CONFIG_DEVTMPFS=y
315CONFIG_DEVTMPFS_MOUNT=y 315CONFIG_DEVTMPFS_MOUNT=y
316# CONFIG_FIRMWARE_IN_KERNEL is not set
317CONFIG_TEST_ASYNC_DRIVER_PROBE=m 316CONFIG_TEST_ASYNC_DRIVER_PROBE=m
318CONFIG_CONNECTOR=m 317CONFIG_CONNECTOR=m
319CONFIG_PARPORT=m 318CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 72a7764b74ed..0e32b8566179 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
311# CONFIG_UEVENT_HELPER is not set 311# CONFIG_UEVENT_HELPER is not set
312CONFIG_DEVTMPFS=y 312CONFIG_DEVTMPFS=y
313CONFIG_DEVTMPFS_MOUNT=y 313CONFIG_DEVTMPFS_MOUNT=y
314# CONFIG_FIRMWARE_IN_KERNEL is not set
315CONFIG_TEST_ASYNC_DRIVER_PROBE=m 314CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316CONFIG_CONNECTOR=m 315CONFIG_CONNECTOR=m
317CONFIG_BLK_DEV_LOOP=y 316CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 884b43a2f0d9..e873c6f97f00 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
311# CONFIG_UEVENT_HELPER is not set 311# CONFIG_UEVENT_HELPER is not set
312CONFIG_DEVTMPFS=y 312CONFIG_DEVTMPFS=y
313CONFIG_DEVTMPFS_MOUNT=y 313CONFIG_DEVTMPFS_MOUNT=y
314# CONFIG_FIRMWARE_IN_KERNEL is not set
315CONFIG_TEST_ASYNC_DRIVER_PROBE=m 314CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316CONFIG_CONNECTOR=m 315CONFIG_CONNECTOR=m
317CONFIG_PARPORT=m 316CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index fcfa60d31499..7b42cc1c2e61 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
309# CONFIG_UEVENT_HELPER is not set 309# CONFIG_UEVENT_HELPER is not set
310CONFIG_DEVTMPFS=y 310CONFIG_DEVTMPFS=y
311CONFIG_DEVTMPFS_MOUNT=y 311CONFIG_DEVTMPFS_MOUNT=y
312# CONFIG_FIRMWARE_IN_KERNEL is not set
313CONFIG_TEST_ASYNC_DRIVER_PROBE=m 312CONFIG_TEST_ASYNC_DRIVER_PROBE=m
314CONFIG_CONNECTOR=m 313CONFIG_CONNECTOR=m
315CONFIG_BLK_DEV_LOOP=y 314CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 9d597bbbbbfe..9f4b83541c31 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
311# CONFIG_UEVENT_HELPER is not set 311# CONFIG_UEVENT_HELPER is not set
312CONFIG_DEVTMPFS=y 312CONFIG_DEVTMPFS=y
313CONFIG_DEVTMPFS_MOUNT=y 313CONFIG_DEVTMPFS_MOUNT=y
314# CONFIG_FIRMWARE_IN_KERNEL is not set
315CONFIG_TEST_ASYNC_DRIVER_PROBE=m 314CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316CONFIG_CONNECTOR=m 315CONFIG_CONNECTOR=m
317CONFIG_BLK_DEV_LOOP=y 316CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 45da20d1286c..64094bf74822 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -313,7 +313,6 @@ CONFIG_NET_DEVLINK=m
313# CONFIG_UEVENT_HELPER is not set 313# CONFIG_UEVENT_HELPER is not set
314CONFIG_DEVTMPFS=y 314CONFIG_DEVTMPFS=y
315CONFIG_DEVTMPFS_MOUNT=y 315CONFIG_DEVTMPFS_MOUNT=y
316# CONFIG_FIRMWARE_IN_KERNEL is not set
317CONFIG_TEST_ASYNC_DRIVER_PROBE=m 316CONFIG_TEST_ASYNC_DRIVER_PROBE=m
318CONFIG_CONNECTOR=m 317CONFIG_CONNECTOR=m
319CONFIG_BLK_DEV_SWIM=m 318CONFIG_BLK_DEV_SWIM=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index fda880c10861..9ae1f91ea690 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -323,7 +323,6 @@ CONFIG_NET_DEVLINK=m
323# CONFIG_UEVENT_HELPER is not set 323# CONFIG_UEVENT_HELPER is not set
324CONFIG_DEVTMPFS=y 324CONFIG_DEVTMPFS=y
325CONFIG_DEVTMPFS_MOUNT=y 325CONFIG_DEVTMPFS_MOUNT=y
326# CONFIG_FIRMWARE_IN_KERNEL is not set
327CONFIG_TEST_ASYNC_DRIVER_PROBE=m 326CONFIG_TEST_ASYNC_DRIVER_PROBE=m
328CONFIG_CONNECTOR=m 327CONFIG_CONNECTOR=m
329CONFIG_PARPORT=m 328CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 7d5e4863efec..31586b2f852e 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -308,7 +308,6 @@ CONFIG_NET_DEVLINK=m
308# CONFIG_UEVENT_HELPER is not set 308# CONFIG_UEVENT_HELPER is not set
309CONFIG_DEVTMPFS=y 309CONFIG_DEVTMPFS=y
310CONFIG_DEVTMPFS_MOUNT=y 310CONFIG_DEVTMPFS_MOUNT=y
311# CONFIG_FIRMWARE_IN_KERNEL is not set
312CONFIG_TEST_ASYNC_DRIVER_PROBE=m 311CONFIG_TEST_ASYNC_DRIVER_PROBE=m
313CONFIG_CONNECTOR=m 312CONFIG_CONNECTOR=m
314CONFIG_BLK_DEV_LOOP=y 313CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 7763b71a9c49..7fd5e2de8a50 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
309# CONFIG_UEVENT_HELPER is not set 309# CONFIG_UEVENT_HELPER is not set
310CONFIG_DEVTMPFS=y 310CONFIG_DEVTMPFS=y
311CONFIG_DEVTMPFS_MOUNT=y 311CONFIG_DEVTMPFS_MOUNT=y
312# CONFIG_FIRMWARE_IN_KERNEL is not set
313CONFIG_TEST_ASYNC_DRIVER_PROBE=m 312CONFIG_TEST_ASYNC_DRIVER_PROBE=m
314CONFIG_CONNECTOR=m 313CONFIG_CONNECTOR=m
315CONFIG_BLK_DEV_LOOP=y 314CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 17eaebfa3e19..0339309b5175 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
309# CONFIG_UEVENT_HELPER is not set 309# CONFIG_UEVENT_HELPER is not set
310CONFIG_DEVTMPFS=y 310CONFIG_DEVTMPFS=y
311CONFIG_DEVTMPFS_MOUNT=y 311CONFIG_DEVTMPFS_MOUNT=y
312# CONFIG_FIRMWARE_IN_KERNEL is not set
313CONFIG_TEST_ASYNC_DRIVER_PROBE=m 312CONFIG_TEST_ASYNC_DRIVER_PROBE=m
314CONFIG_CONNECTOR=m 313CONFIG_CONNECTOR=m
315CONFIG_PARPORT=m 314CONFIG_PARPORT=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index d1cb7a04ae1d..5aef62938f32 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
306# CONFIG_UEVENT_HELPER is not set 306# CONFIG_UEVENT_HELPER is not set
307CONFIG_DEVTMPFS=y 307CONFIG_DEVTMPFS=y
308CONFIG_DEVTMPFS_MOUNT=y 308CONFIG_DEVTMPFS_MOUNT=y
309# CONFIG_FIRMWARE_IN_KERNEL is not set
310CONFIG_TEST_ASYNC_DRIVER_PROBE=m 309CONFIG_TEST_ASYNC_DRIVER_PROBE=m
311CONFIG_CONNECTOR=m 310CONFIG_CONNECTOR=m
312CONFIG_BLK_DEV_LOOP=y 311CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index ea3a331c62d5..45df9a6559e5 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
306# CONFIG_UEVENT_HELPER is not set 306# CONFIG_UEVENT_HELPER is not set
307CONFIG_DEVTMPFS=y 307CONFIG_DEVTMPFS=y
308CONFIG_DEVTMPFS_MOUNT=y 308CONFIG_DEVTMPFS_MOUNT=y
309# CONFIG_FIRMWARE_IN_KERNEL is not set
310CONFIG_TEST_ASYNC_DRIVER_PROBE=m 309CONFIG_TEST_ASYNC_DRIVER_PROBE=m
311CONFIG_CONNECTOR=m 310CONFIG_CONNECTOR=m
312CONFIG_BLK_DEV_LOOP=y 311CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig
index 92fca3c42eac..5651f4d8f45c 100644
--- a/arch/mips/configs/ar7_defconfig
+++ b/arch/mips/configs/ar7_defconfig
@@ -82,7 +82,6 @@ CONFIG_MAC80211=m
82CONFIG_MAC80211_RC_PID=y 82CONFIG_MAC80211_RC_PID=y
83CONFIG_MAC80211_RC_DEFAULT_PID=y 83CONFIG_MAC80211_RC_DEFAULT_PID=y
84CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 84CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
85# CONFIG_FIRMWARE_IN_KERNEL is not set
86CONFIG_MTD=y 85CONFIG_MTD=y
87CONFIG_MTD_BLOCK=y 86CONFIG_MTD_BLOCK=y
88CONFIG_MTD_CFI=y 87CONFIG_MTD_CFI=y
diff --git a/arch/mips/configs/ath25_defconfig b/arch/mips/configs/ath25_defconfig
index 2c829950be17..b8d48038e74f 100644
--- a/arch/mips/configs/ath25_defconfig
+++ b/arch/mips/configs/ath25_defconfig
@@ -38,7 +38,6 @@ CONFIG_CFG80211=m
38CONFIG_MAC80211=m 38CONFIG_MAC80211=m
39CONFIG_MAC80211_DEBUGFS=y 39CONFIG_MAC80211_DEBUGFS=y
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41# CONFIG_FIRMWARE_IN_KERNEL is not set
42CONFIG_MTD=y 41CONFIG_MTD=y
43CONFIG_MTD_REDBOOT_PARTS=y 42CONFIG_MTD_REDBOOT_PARTS=y
44CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 43CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
diff --git a/arch/mips/configs/ath79_defconfig b/arch/mips/configs/ath79_defconfig
index 25ed914933e5..951c4231bdb8 100644
--- a/arch/mips/configs/ath79_defconfig
+++ b/arch/mips/configs/ath79_defconfig
@@ -39,7 +39,6 @@ CONFIG_CFG80211=m
39CONFIG_MAC80211=m 39CONFIG_MAC80211=m
40CONFIG_MAC80211_DEBUGFS=y 40CONFIG_MAC80211_DEBUGFS=y
41CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 41CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
42# CONFIG_FIRMWARE_IN_KERNEL is not set
43CONFIG_MTD=y 42CONFIG_MTD=y
44CONFIG_MTD_REDBOOT_PARTS=y 43CONFIG_MTD_REDBOOT_PARTS=y
45CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 44CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
diff --git a/arch/mips/configs/pic32mzda_defconfig b/arch/mips/configs/pic32mzda_defconfig
index 52192c632ae8..41190c2036e6 100644
--- a/arch/mips/configs/pic32mzda_defconfig
+++ b/arch/mips/configs/pic32mzda_defconfig
@@ -26,7 +26,6 @@ CONFIG_BINFMT_MISC=m
26# CONFIG_SUSPEND is not set 26# CONFIG_SUSPEND is not set
27CONFIG_DEVTMPFS=y 27CONFIG_DEVTMPFS=y
28CONFIG_DEVTMPFS_MOUNT=y 28CONFIG_DEVTMPFS_MOUNT=y
29# CONFIG_FIRMWARE_IN_KERNEL is not set
30# CONFIG_ALLOW_DEV_COREDUMP is not set 29# CONFIG_ALLOW_DEV_COREDUMP is not set
31CONFIG_BLK_DEV_LOOP=m 30CONFIG_BLK_DEV_LOOP=m
32CONFIG_SCSI=y 31CONFIG_SCSI=y
diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig
index 3f1333517405..3b02ff9a7c64 100644
--- a/arch/mips/configs/qi_lb60_defconfig
+++ b/arch/mips/configs/qi_lb60_defconfig
@@ -42,7 +42,6 @@ CONFIG_TCP_CONG_WESTWOOD=y
42# CONFIG_TCP_CONG_HTCP is not set 42# CONFIG_TCP_CONG_HTCP is not set
43# CONFIG_IPV6 is not set 43# CONFIG_IPV6 is not set
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45# CONFIG_FIRMWARE_IN_KERNEL is not set
46CONFIG_MTD=y 45CONFIG_MTD=y
47CONFIG_MTD_BLOCK=y 46CONFIG_MTD_BLOCK=y
48CONFIG_MTD_NAND=y 47CONFIG_MTD_NAND=y
diff --git a/arch/mips/configs/rt305x_defconfig b/arch/mips/configs/rt305x_defconfig
index c695b7b1c4ae..dbe6a4639d05 100644
--- a/arch/mips/configs/rt305x_defconfig
+++ b/arch/mips/configs/rt305x_defconfig
@@ -76,7 +76,6 @@ CONFIG_VLAN_8021Q=y
76CONFIG_NET_SCHED=y 76CONFIG_NET_SCHED=y
77CONFIG_HAMRADIO=y 77CONFIG_HAMRADIO=y
78CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 78CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
79# CONFIG_FIRMWARE_IN_KERNEL is not set
80CONFIG_MTD=y 79CONFIG_MTD=y
81CONFIG_MTD_CMDLINE_PARTS=y 80CONFIG_MTD_CMDLINE_PARTS=y
82CONFIG_MTD_BLOCK=y 81CONFIG_MTD_BLOCK=y
diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig
index 4365108bef77..fa750d501c11 100644
--- a/arch/mips/configs/xway_defconfig
+++ b/arch/mips/configs/xway_defconfig
@@ -75,7 +75,6 @@ CONFIG_VLAN_8021Q=y
75CONFIG_NET_SCHED=y 75CONFIG_NET_SCHED=y
76CONFIG_HAMRADIO=y 76CONFIG_HAMRADIO=y
77CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 77CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
78# CONFIG_FIRMWARE_IN_KERNEL is not set
79CONFIG_MTD=y 78CONFIG_MTD=y
80CONFIG_MTD_CMDLINE_PARTS=y 79CONFIG_MTD_CMDLINE_PARTS=y
81CONFIG_MTD_BLOCK=y 80CONFIG_MTD_BLOCK=y
diff --git a/arch/mn10300/configs/asb2364_defconfig b/arch/mn10300/configs/asb2364_defconfig
index b1d80cee97ee..a84c3153f22a 100644
--- a/arch/mn10300/configs/asb2364_defconfig
+++ b/arch/mn10300/configs/asb2364_defconfig
@@ -44,7 +44,6 @@ CONFIG_IPV6=y
44# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set 44# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
45# CONFIG_INET6_XFRM_MODE_TUNNEL is not set 45# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
46# CONFIG_INET6_XFRM_MODE_BEET is not set 46# CONFIG_INET6_XFRM_MODE_BEET is not set
47# CONFIG_FIRMWARE_IN_KERNEL is not set
48CONFIG_CONNECTOR=y 47CONFIG_CONNECTOR=y
49CONFIG_MTD=y 48CONFIG_MTD=y
50CONFIG_MTD_DEBUG=y 49CONFIG_MTD_DEBUG=y
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index b5c866073efd..6c02f53271cd 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -28,7 +28,6 @@ CONFIG_NETFILTER=y
28CONFIG_VLAN_8021Q=y 28CONFIG_VLAN_8021Q=y
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_STANDALONE is not set 30# CONFIG_STANDALONE is not set
31# CONFIG_FIRMWARE_IN_KERNEL is not set
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig
index 10be5773ad5d..c2b1c4404683 100644
--- a/arch/powerpc/configs/mpc512x_defconfig
+++ b/arch/powerpc/configs/mpc512x_defconfig
@@ -39,7 +39,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
39CONFIG_DEVTMPFS=y 39CONFIG_DEVTMPFS=y
40CONFIG_DEVTMPFS_MOUNT=y 40CONFIG_DEVTMPFS_MOUNT=y
41# CONFIG_PREVENT_FIRMWARE_BUILD is not set 41# CONFIG_PREVENT_FIRMWARE_BUILD is not set
42# CONFIG_FIRMWARE_IN_KERNEL is not set
43CONFIG_MTD=y 42CONFIG_MTD=y
44CONFIG_MTD_CMDLINE_PARTS=y 43CONFIG_MTD_CMDLINE_PARTS=y
45CONFIG_MTD_BLOCK=y 44CONFIG_MTD_BLOCK=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index da0e8d535eb8..7ee736f20774 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -347,7 +347,6 @@ CONFIG_MAC80211_DEBUGFS=y
347CONFIG_NET_9P=m 347CONFIG_NET_9P=m
348CONFIG_NET_9P_VIRTIO=m 348CONFIG_NET_9P_VIRTIO=m
349CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 349CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
350# CONFIG_FIRMWARE_IN_KERNEL is not set
351CONFIG_DEBUG_DEVRES=y 350CONFIG_DEBUG_DEVRES=y
352CONFIG_CONNECTOR=y 351CONFIG_CONNECTOR=y
353CONFIG_PARPORT=m 352CONFIG_PARPORT=m
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 2efa025bf483..187e2f7c12c8 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -64,7 +64,6 @@ CONFIG_CFG80211_WEXT=y
64CONFIG_MAC80211=m 64CONFIG_MAC80211=m
65# CONFIG_MAC80211_RC_MINSTREL is not set 65# CONFIG_MAC80211_RC_MINSTREL is not set
66CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 66CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
67# CONFIG_FIRMWARE_IN_KERNEL is not set
68CONFIG_BLK_DEV_LOOP=y 67CONFIG_BLK_DEV_LOOP=y
69CONFIG_BLK_DEV_RAM=y 68CONFIG_BLK_DEV_RAM=y
70CONFIG_BLK_DEV_RAM_SIZE=65535 69CONFIG_BLK_DEV_RAM_SIZE=65535
diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig
index 9c7400a19e9d..0b0f78823a1b 100644
--- a/arch/powerpc/configs/wii_defconfig
+++ b/arch/powerpc/configs/wii_defconfig
@@ -43,7 +43,6 @@ CONFIG_CFG80211=y
43CONFIG_MAC80211=y 43CONFIG_MAC80211=y
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45# CONFIG_STANDALONE is not set 45# CONFIG_STANDALONE is not set
46# CONFIG_FIRMWARE_IN_KERNEL is not set
47CONFIG_BLK_DEV_LOOP=y 46CONFIG_BLK_DEV_LOOP=y
48CONFIG_BLK_DEV_RAM=y 47CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_COUNT=2 48CONFIG_BLK_DEV_RAM_COUNT=2
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index 04e042edbab7..7dc7f58c4287 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -26,7 +26,6 @@ CONFIG_NET=y
26# CONFIG_IUCV is not set 26# CONFIG_IUCV is not set
27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28CONFIG_DEVTMPFS=y 28CONFIG_DEVTMPFS=y
29# CONFIG_FIRMWARE_IN_KERNEL is not set
30CONFIG_BLK_DEV_RAM=y 29CONFIG_BLK_DEV_RAM=y
31# CONFIG_BLK_DEV_XPRAM is not set 30# CONFIG_BLK_DEV_XPRAM is not set
32# CONFIG_DCSSBLK is not set 31# CONFIG_DCSSBLK is not set
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index 0a432b5f50e7..87641b7d6c4e 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_defconfig
@@ -38,7 +38,6 @@ CONFIG_IP_MULTICAST=y
38# CONFIG_INET_XFRM_MODE_BEET is not set 38# CONFIG_INET_XFRM_MODE_BEET is not set
39# CONFIG_IPV6 is not set 39# CONFIG_IPV6 is not set
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41# CONFIG_FIRMWARE_IN_KERNEL is not set
42CONFIG_MTD=y 41CONFIG_MTD=y
43CONFIG_MTD_CMDLINE_PARTS=y 42CONFIG_MTD_CMDLINE_PARTS=y
44CONFIG_MTD_BLOCK=y 43CONFIG_MTD_BLOCK=y
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 9f94435cc44f..357a4c271ad4 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -159,7 +159,6 @@ CONFIG_DNS_RESOLVER=y
159CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 159CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
160CONFIG_DEVTMPFS=y 160CONFIG_DEVTMPFS=y
161CONFIG_DEVTMPFS_MOUNT=y 161CONFIG_DEVTMPFS_MOUNT=y
162# CONFIG_FIRMWARE_IN_KERNEL is not set
163CONFIG_CONNECTOR=y 162CONFIG_CONNECTOR=y
164CONFIG_BLK_DEV_LOOP=y 163CONFIG_BLK_DEV_LOOP=y
165CONFIG_BLK_DEV_CRYPTOLOOP=m 164CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 1c5bd4f8ffca..da2858755fa1 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -289,7 +289,6 @@ CONFIG_DNS_RESOLVER=y
289CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 289CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
290CONFIG_DEVTMPFS=y 290CONFIG_DEVTMPFS=y
291CONFIG_DEVTMPFS_MOUNT=y 291CONFIG_DEVTMPFS_MOUNT=y
292# CONFIG_FIRMWARE_IN_KERNEL is not set
293CONFIG_CONNECTOR=y 292CONFIG_CONNECTOR=y
294CONFIG_BLK_DEV_LOOP=y 293CONFIG_BLK_DEV_LOOP=y
295CONFIG_BLK_DEV_CRYPTOLOOP=m 294CONFIG_BLK_DEV_CRYPTOLOOP=m
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index bdc87907d6a1..698db8549686 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -86,10 +86,9 @@ config FW_LOADER
86 require userspace firmware loading support, but a module built 86 require userspace firmware loading support, but a module built
87 out-of-tree does. 87 out-of-tree does.
88 88
89config FIRMWARE_IN_KERNEL 89config EXTRA_FIRMWARE
90 bool "Include in-kernel firmware blobs in kernel binary" 90 string "External firmware blobs to build into the kernel binary"
91 depends on FW_LOADER 91 depends on FW_LOADER
92 default y
93 help 92 help
94 Various drivers in the kernel source tree may require firmware, 93 Various drivers in the kernel source tree may require firmware,
95 which is generally available in your distribution's linux-firmware 94 which is generally available in your distribution's linux-firmware
@@ -99,23 +98,6 @@ config FIRMWARE_IN_KERNEL
99 /lib/firmware/ on your system, so they can be loaded by userspace 98 /lib/firmware/ on your system, so they can be loaded by userspace
100 helpers on request. 99 helpers on request.
101 100
102 Enabling this option will build each required firmware blob
103 specified by EXTRA_FIRMWARE into the kernel directly, where
104 request_firmware() will find them without having to call out to
105 userspace. This may be useful if your root file system requires a
106 device that uses such firmware and you do not wish to use an
107 initrd.
108
109 This single option controls the inclusion of firmware for
110 every driver that uses request_firmware(), which avoids a
111 proliferation of 'Include firmware for xxx device' options.
112
113 Say 'N' and let firmware be loaded from userspace.
114
115config EXTRA_FIRMWARE
116 string "External firmware blobs to build into the kernel binary"
117 depends on FW_LOADER
118 help
119 This option allows firmware to be built into the kernel for the case 101 This option allows firmware to be built into the kernel for the case
120 where the user either cannot or doesn't want to provide it from 102 where the user either cannot or doesn't want to provide it from
121 userspace at runtime (for example, when the firmware in question is 103 userspace at runtime (for example, when the firmware in question is
@@ -126,11 +108,11 @@ config EXTRA_FIRMWARE
126 firmware files -- the same names that appear in MODULE_FIRMWARE() 108 firmware files -- the same names that appear in MODULE_FIRMWARE()
127 and request_firmware() in the source. These files should exist under 109 and request_firmware() in the source. These files should exist under
128 the directory specified by the EXTRA_FIRMWARE_DIR option, which is 110 the directory specified by the EXTRA_FIRMWARE_DIR option, which is
129 by default the firmware subdirectory of the kernel source tree. 111 /lib/firmware by default.
130 112
131 For example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", copy 113 For example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", copy
132 the usb8388.bin file into the firmware directory, and build the kernel. 114 the usb8388.bin file into /lib/firmware, and build the kernel. Then
133 Then any request_firmware("usb8388.bin") will be satisfied internally 115 any request_firmware("usb8388.bin") will be satisfied internally
134 without needing to call out to userspace. 116 without needing to call out to userspace.
135 117
136 WARNING: If you include additional firmware files into your binary 118 WARNING: If you include additional firmware files into your binary
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-25 05:22:33 -0400