Skip to content

Commit 7f55c73

Browse files
bgilbertgregkh
authored andcommitted
firmware: Drop FIRMWARE_IN_KERNEL Kconfig option
It doesn't actually do anything. Merge its help text into EXTRA_FIRMWARE. Fixes: 5620a0d ("firmware: delete in-kernel firmware") Fixes: 0946b2f ("firmware: cleanup FIRMWARE_IN_KERNEL message") Signed-off-by: Benjamin Gilbert <[email protected]> Signed-off-by: Robin H. Johnson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 003948c commit 7f55c73

Some content is hidden

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

53 files changed

+5
-75
lines changed

arch/arc/configs/axs101_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y
4444
CONFIG_DEVTMPFS=y
4545
# CONFIG_STANDALONE is not set
4646
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
47-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4847
CONFIG_SCSI=y
4948
CONFIG_BLK_DEV_SD=y
5049
CONFIG_NETDEVICES=y

arch/arc/configs/axs103_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y
4444
CONFIG_DEVTMPFS=y
4545
# CONFIG_STANDALONE is not set
4646
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
47-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4847
CONFIG_BLK_DEV_LOOP=y
4948
CONFIG_SCSI=y
5049
CONFIG_BLK_DEV_SD=y

arch/arc/configs/axs103_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ CONFIG_IP_PNP_RARP=y
4545
CONFIG_DEVTMPFS=y
4646
# CONFIG_STANDALONE is not set
4747
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
48-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4948
CONFIG_BLK_DEV_LOOP=y
5049
CONFIG_SCSI=y
5150
CONFIG_BLK_DEV_SD=y

arch/arc/configs/haps_hs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ CONFIG_INET=y
4040
CONFIG_DEVTMPFS=y
4141
# CONFIG_STANDALONE is not set
4242
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
43-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4443
# CONFIG_BLK_DEV is not set
4544
CONFIG_NETDEVICES=y
4645
# CONFIG_NET_VENDOR_ARC is not set

arch/arc/configs/haps_hs_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ CONFIG_INET=y
4343
CONFIG_DEVTMPFS=y
4444
# CONFIG_STANDALONE is not set
4545
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
46-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4746
# CONFIG_BLK_DEV is not set
4847
CONFIG_NETDEVICES=y
4948
# CONFIG_NET_VENDOR_ARC is not set

arch/arc/configs/hsdk_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ CONFIG_INET=y
3232
CONFIG_DEVTMPFS=y
3333
# CONFIG_STANDALONE is not set
3434
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
35-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3635
CONFIG_SCSI=y
3736
CONFIG_BLK_DEV_SD=y
3837
CONFIG_NETDEVICES=y

arch/arc/configs/nsim_700_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CONFIG_INET=y
3636
CONFIG_DEVTMPFS=y
3737
# CONFIG_STANDALONE is not set
3838
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4039
# CONFIG_BLK_DEV is not set
4140
CONFIG_NETDEVICES=y
4241
CONFIG_ARC_EMAC=y

arch/arc/configs/nsim_hs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ CONFIG_INET=y
4040
CONFIG_DEVTMPFS=y
4141
# CONFIG_STANDALONE is not set
4242
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
43-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4443
# CONFIG_BLK_DEV is not set
4544
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
4645
# CONFIG_INPUT_KEYBOARD is not set

arch/arc/configs/nsim_hs_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ CONFIG_INET=y
3939
CONFIG_DEVTMPFS=y
4040
# CONFIG_STANDALONE is not set
4141
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
42-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4342
# CONFIG_BLK_DEV is not set
4443
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
4544
# CONFIG_INPUT_KEYBOARD is not set

arch/arc/configs/nsimosci_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ CONFIG_INET=y
3535
CONFIG_DEVTMPFS=y
3636
# CONFIG_STANDALONE is not set
3737
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
38-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3938
# CONFIG_BLK_DEV is not set
4039
CONFIG_NETDEVICES=y
4140
CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y

arch/arc/configs/nsimosci_hs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CONFIG_INET=y
3636
CONFIG_DEVTMPFS=y
3737
# CONFIG_STANDALONE is not set
3838
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
39-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4039
# CONFIG_BLK_DEV is not set
4140
CONFIG_NETDEVICES=y
4241
CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=y

arch/arc/configs/nsimosci_hs_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ CONFIG_INET=y
3939
CONFIG_DEVTMPFS=y
4040
# CONFIG_STANDALONE is not set
4141
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
42-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4342
# CONFIG_BLK_DEV is not set
4443
CONFIG_NETDEVICES=y
4544
# CONFIG_NET_VENDOR_ARC is not set

arch/arc/configs/tb10x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ CONFIG_IP_MULTICAST=y
4242
# CONFIG_IPV6 is not set
4343
# CONFIG_WIRELESS is not set
4444
CONFIG_DEVTMPFS=y
45-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4645
CONFIG_NETDEVICES=y
4746
# CONFIG_NET_CADENCE is not set
4847
# CONFIG_NET_VENDOR_BROADCOM is not set

arch/arc/configs/vdk_hs38_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CONFIG_DEVTMPFS=y
3131
CONFIG_DEVTMPFS_MOUNT=y
3232
# CONFIG_STANDALONE is not set
3333
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
34-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3534
CONFIG_MTD=y
3635
CONFIG_MTD_CMDLINE_PARTS=y
3736
CONFIG_MTD_BLOCK=y

arch/arc/configs/vdk_hs38_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ CONFIG_DEVTMPFS=y
3434
CONFIG_DEVTMPFS_MOUNT=y
3535
# CONFIG_STANDALONE is not set
3636
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
37-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3837
CONFIG_MTD=y
3938
CONFIG_MTD_CMDLINE_PARTS=y
4039
CONFIG_MTD_BLOCK=y

arch/arm/configs/cns3420vb_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
2828
CONFIG_ZBOOT_ROM_BSS=0x0
2929
CONFIG_CMDLINE="console=ttyS0,38400 mem=128M root=/dev/mmcblk0p1 ro rootwait"
3030
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3231
CONFIG_MTD=y
3332
CONFIG_MTD_CMDLINE_PARTS=y
3433
CONFIG_MTD_BLOCK=y

arch/arm/configs/magician_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
5454
CONFIG_BT_HIDP=m
5555
CONFIG_BT_HCIBTUSB=m
5656
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
57-
# CONFIG_FIRMWARE_IN_KERNEL is not set
5857
CONFIG_MTD=y
5958
CONFIG_MTD_CMDLINE_PARTS=y
6059
CONFIG_MTD_BLOCK=y

arch/arm/configs/mini2440_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ CONFIG_MAC80211=m
7777
CONFIG_MAC80211_MESH=y
7878
CONFIG_MAC80211_LEDS=y
7979
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
80-
# CONFIG_FIRMWARE_IN_KERNEL is not set
8180
CONFIG_CONNECTOR=m
8281
CONFIG_MTD=y
8382
CONFIG_MTD_CMDLINE_PARTS=y

arch/arm/configs/mv78xx0_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ CONFIG_IP_PNP_BOOTP=y
3737
# CONFIG_IPV6 is not set
3838
CONFIG_NET_PKTGEN=m
3939
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4140
CONFIG_MTD=y
4241
CONFIG_MTD_CMDLINE_PARTS=y
4342
CONFIG_MTD_BLOCK=y

arch/arm/configs/mxs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ CONFIG_CAN_FLEXCAN=m
4646
# CONFIG_WIRELESS is not set
4747
CONFIG_DEVTMPFS=y
4848
CONFIG_DEVTMPFS_MOUNT=y
49-
# CONFIG_FIRMWARE_IN_KERNEL is not set
5049
CONFIG_MTD=y
5150
CONFIG_MTD_CMDLINE_PARTS=y
5251
CONFIG_MTD_BLOCK=y

arch/arm/configs/orion5x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ CONFIG_IP_PNP_BOOTP=y
6060
CONFIG_NET_DSA=y
6161
CONFIG_NET_PKTGEN=m
6262
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
63-
# CONFIG_FIRMWARE_IN_KERNEL is not set
6463
CONFIG_MTD=y
6564
CONFIG_MTD_CMDLINE_PARTS=y
6665
CONFIG_MTD_BLOCK=y

arch/arm/configs/tegra_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ CONFIG_RFKILL_INPUT=y
7676
CONFIG_RFKILL_GPIO=y
7777
CONFIG_DEVTMPFS=y
7878
CONFIG_DEVTMPFS_MOUNT=y
79-
# CONFIG_FIRMWARE_IN_KERNEL is not set
8079
CONFIG_DMA_CMA=y
8180
CONFIG_CMA_SIZE_MBYTES=64
8281
CONFIG_TEGRA_GMI=y

arch/arm/configs/vf610m4_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ CONFIG_BINFMT_SHARED_FLAT=y
2323
# CONFIG_UEVENT_HELPER is not set
2424
# CONFIG_STANDALONE is not set
2525
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
26-
# CONFIG_FIRMWARE_IN_KERNEL is not set
2726
# CONFIG_ALLOW_DEV_COREDUMP is not set
2827
CONFIG_BLK_DEV_RAM=y
2928
CONFIG_BLK_DEV_RAM_COUNT=4

arch/m68k/configs/amiga_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ CONFIG_NET_DEVLINK=m
313313
# CONFIG_UEVENT_HELPER is not set
314314
CONFIG_DEVTMPFS=y
315315
CONFIG_DEVTMPFS_MOUNT=y
316-
# CONFIG_FIRMWARE_IN_KERNEL is not set
317316
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
318317
CONFIG_CONNECTOR=m
319318
CONFIG_PARPORT=m

arch/m68k/configs/apollo_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
311311
# CONFIG_UEVENT_HELPER is not set
312312
CONFIG_DEVTMPFS=y
313313
CONFIG_DEVTMPFS_MOUNT=y
314-
# CONFIG_FIRMWARE_IN_KERNEL is not set
315314
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316315
CONFIG_CONNECTOR=m
317316
CONFIG_BLK_DEV_LOOP=y

arch/m68k/configs/atari_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
311311
# CONFIG_UEVENT_HELPER is not set
312312
CONFIG_DEVTMPFS=y
313313
CONFIG_DEVTMPFS_MOUNT=y
314-
# CONFIG_FIRMWARE_IN_KERNEL is not set
315314
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316315
CONFIG_CONNECTOR=m
317316
CONFIG_PARPORT=m

arch/m68k/configs/bvme6000_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
309309
# CONFIG_UEVENT_HELPER is not set
310310
CONFIG_DEVTMPFS=y
311311
CONFIG_DEVTMPFS_MOUNT=y
312-
# CONFIG_FIRMWARE_IN_KERNEL is not set
313312
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
314313
CONFIG_CONNECTOR=m
315314
CONFIG_BLK_DEV_LOOP=y

arch/m68k/configs/hp300_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ CONFIG_NET_DEVLINK=m
311311
# CONFIG_UEVENT_HELPER is not set
312312
CONFIG_DEVTMPFS=y
313313
CONFIG_DEVTMPFS_MOUNT=y
314-
# CONFIG_FIRMWARE_IN_KERNEL is not set
315314
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
316315
CONFIG_CONNECTOR=m
317316
CONFIG_BLK_DEV_LOOP=y

arch/m68k/configs/mac_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ CONFIG_NET_DEVLINK=m
313313
# CONFIG_UEVENT_HELPER is not set
314314
CONFIG_DEVTMPFS=y
315315
CONFIG_DEVTMPFS_MOUNT=y
316-
# CONFIG_FIRMWARE_IN_KERNEL is not set
317316
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
318317
CONFIG_CONNECTOR=m
319318
CONFIG_BLK_DEV_SWIM=m

arch/m68k/configs/multi_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ CONFIG_NET_DEVLINK=m
323323
# CONFIG_UEVENT_HELPER is not set
324324
CONFIG_DEVTMPFS=y
325325
CONFIG_DEVTMPFS_MOUNT=y
326-
# CONFIG_FIRMWARE_IN_KERNEL is not set
327326
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
328327
CONFIG_CONNECTOR=m
329328
CONFIG_PARPORT=m

arch/m68k/configs/mvme147_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ CONFIG_NET_DEVLINK=m
308308
# CONFIG_UEVENT_HELPER is not set
309309
CONFIG_DEVTMPFS=y
310310
CONFIG_DEVTMPFS_MOUNT=y
311-
# CONFIG_FIRMWARE_IN_KERNEL is not set
312311
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
313312
CONFIG_CONNECTOR=m
314313
CONFIG_BLK_DEV_LOOP=y

arch/m68k/configs/mvme16x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
309309
# CONFIG_UEVENT_HELPER is not set
310310
CONFIG_DEVTMPFS=y
311311
CONFIG_DEVTMPFS_MOUNT=y
312-
# CONFIG_FIRMWARE_IN_KERNEL is not set
313312
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
314313
CONFIG_CONNECTOR=m
315314
CONFIG_BLK_DEV_LOOP=y

arch/m68k/configs/q40_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ CONFIG_NET_DEVLINK=m
309309
# CONFIG_UEVENT_HELPER is not set
310310
CONFIG_DEVTMPFS=y
311311
CONFIG_DEVTMPFS_MOUNT=y
312-
# CONFIG_FIRMWARE_IN_KERNEL is not set
313312
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
314313
CONFIG_CONNECTOR=m
315314
CONFIG_PARPORT=m

arch/m68k/configs/sun3_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
306306
# CONFIG_UEVENT_HELPER is not set
307307
CONFIG_DEVTMPFS=y
308308
CONFIG_DEVTMPFS_MOUNT=y
309-
# CONFIG_FIRMWARE_IN_KERNEL is not set
310309
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
311310
CONFIG_CONNECTOR=m
312311
CONFIG_BLK_DEV_LOOP=y

arch/m68k/configs/sun3x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ CONFIG_NET_DEVLINK=m
306306
# CONFIG_UEVENT_HELPER is not set
307307
CONFIG_DEVTMPFS=y
308308
CONFIG_DEVTMPFS_MOUNT=y
309-
# CONFIG_FIRMWARE_IN_KERNEL is not set
310309
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
311310
CONFIG_CONNECTOR=m
312311
CONFIG_BLK_DEV_LOOP=y

arch/mips/configs/ar7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ CONFIG_MAC80211=m
8282
CONFIG_MAC80211_RC_PID=y
8383
CONFIG_MAC80211_RC_DEFAULT_PID=y
8484
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
85-
# CONFIG_FIRMWARE_IN_KERNEL is not set
8685
CONFIG_MTD=y
8786
CONFIG_MTD_BLOCK=y
8887
CONFIG_MTD_CFI=y

arch/mips/configs/ath25_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_CFG80211=m
3838
CONFIG_MAC80211=m
3939
CONFIG_MAC80211_DEBUGFS=y
4040
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4241
CONFIG_MTD=y
4342
CONFIG_MTD_REDBOOT_PARTS=y
4443
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2

arch/mips/configs/ath79_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ CONFIG_CFG80211=m
3939
CONFIG_MAC80211=m
4040
CONFIG_MAC80211_DEBUGFS=y
4141
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
42-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4342
CONFIG_MTD=y
4443
CONFIG_MTD_REDBOOT_PARTS=y
4544
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2

arch/mips/configs/pic32mzda_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ CONFIG_BINFMT_MISC=m
2626
# CONFIG_SUSPEND is not set
2727
CONFIG_DEVTMPFS=y
2828
CONFIG_DEVTMPFS_MOUNT=y
29-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3029
# CONFIG_ALLOW_DEV_COREDUMP is not set
3130
CONFIG_BLK_DEV_LOOP=m
3231
CONFIG_SCSI=y

arch/mips/configs/qi_lb60_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ CONFIG_TCP_CONG_WESTWOOD=y
4242
# CONFIG_TCP_CONG_HTCP is not set
4343
# CONFIG_IPV6 is not set
4444
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4645
CONFIG_MTD=y
4746
CONFIG_MTD_BLOCK=y
4847
CONFIG_MTD_NAND=y

arch/mips/configs/rt305x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ CONFIG_VLAN_8021Q=y
7676
CONFIG_NET_SCHED=y
7777
CONFIG_HAMRADIO=y
7878
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
79-
# CONFIG_FIRMWARE_IN_KERNEL is not set
8079
CONFIG_MTD=y
8180
CONFIG_MTD_CMDLINE_PARTS=y
8281
CONFIG_MTD_BLOCK=y

arch/mips/configs/xway_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ CONFIG_VLAN_8021Q=y
7575
CONFIG_NET_SCHED=y
7676
CONFIG_HAMRADIO=y
7777
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
78-
# CONFIG_FIRMWARE_IN_KERNEL is not set
7978
CONFIG_MTD=y
8079
CONFIG_MTD_CMDLINE_PARTS=y
8180
CONFIG_MTD_BLOCK=y

arch/mn10300/configs/asb2364_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ CONFIG_IPV6=y
4444
# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
4545
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
4646
# CONFIG_INET6_XFRM_MODE_BEET is not set
47-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4847
CONFIG_CONNECTOR=y
4948
CONFIG_MTD=y
5049
CONFIG_MTD_DEBUG=y

arch/powerpc/configs/44x/warp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_NETFILTER=y
2828
CONFIG_VLAN_8021Q=y
2929
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
3030
# CONFIG_STANDALONE is not set
31-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3231
CONFIG_MTD=y
3332
CONFIG_MTD_CMDLINE_PARTS=y
3433
CONFIG_MTD_BLOCK=y

arch/powerpc/configs/mpc512x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
3939
CONFIG_DEVTMPFS=y
4040
CONFIG_DEVTMPFS_MOUNT=y
4141
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
42-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4342
CONFIG_MTD=y
4443
CONFIG_MTD_CMDLINE_PARTS=y
4544
CONFIG_MTD_BLOCK=y

arch/powerpc/configs/ppc6xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ CONFIG_MAC80211_DEBUGFS=y
347347
CONFIG_NET_9P=m
348348
CONFIG_NET_9P_VIRTIO=m
349349
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
350-
# CONFIG_FIRMWARE_IN_KERNEL is not set
351350
CONFIG_DEBUG_DEVRES=y
352351
CONFIG_CONNECTOR=y
353352
CONFIG_PARPORT=m

arch/powerpc/configs/ps3_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ CONFIG_CFG80211_WEXT=y
6464
CONFIG_MAC80211=m
6565
# CONFIG_MAC80211_RC_MINSTREL is not set
6666
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
67-
# CONFIG_FIRMWARE_IN_KERNEL is not set
6867
CONFIG_BLK_DEV_LOOP=y
6968
CONFIG_BLK_DEV_RAM=y
7069
CONFIG_BLK_DEV_RAM_SIZE=65535

arch/powerpc/configs/wii_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ CONFIG_CFG80211=y
4343
CONFIG_MAC80211=y
4444
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
4545
# CONFIG_STANDALONE is not set
46-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4746
CONFIG_BLK_DEV_LOOP=y
4847
CONFIG_BLK_DEV_RAM=y
4948
CONFIG_BLK_DEV_RAM_COUNT=2

arch/s390/configs/zfcpdump_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ CONFIG_NET=y
2626
# CONFIG_IUCV is not set
2727
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
2828
CONFIG_DEVTMPFS=y
29-
# CONFIG_FIRMWARE_IN_KERNEL is not set
3029
CONFIG_BLK_DEV_RAM=y
3130
# CONFIG_BLK_DEV_XPRAM is not set
3231
# CONFIG_DCSSBLK is not set

arch/sh/configs/polaris_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_IP_MULTICAST=y
3838
# CONFIG_INET_XFRM_MODE_BEET is not set
3939
# CONFIG_IPV6 is not set
4040
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41-
# CONFIG_FIRMWARE_IN_KERNEL is not set
4241
CONFIG_MTD=y
4342
CONFIG_MTD_CMDLINE_PARTS=y
4443
CONFIG_MTD_BLOCK=y

0 commit comments

Comments
 (0)