Skip to content

Commit 951cd3a

Browse files
committed
firmware: include drivers/firmware/Kconfig unconditionally
Compile-testing drivers that require access to a firmware layer fails when that firmware symbol is unavailable. This happened twice this week: - My proposed to change to rework the QCOM_SCM firmware symbol broke on ppc64 and others. - The cs_dsp firmware patch added device specific firmware loader into drivers/firmware, which broke on the same set of architectures. We should probably do the same thing for other subsystems as well, but fix this one first as this is a dependency for other patches getting merged. Reviewed-by: Bjorn Andersson <[email protected]> Reviewed-by: Charles Keepax <[email protected]> Acked-by: Will Deacon <[email protected]> Acked-by: Bjorn Andersson <[email protected]> Cc: Mark Brown <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Charles Keepax <[email protected]> Cc: Simon Trimmer <[email protected]> Cc: Michael Ellerman <[email protected]> Reviewed-by: Mark Brown <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 6880fa6 commit 951cd3a

File tree

8 files changed

+2
-14
lines changed

8 files changed

+2
-14
lines changed

arch/arm/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,8 +1989,6 @@ config ARCH_HIBERNATION_POSSIBLE
19891989

19901990
endmenu
19911991

1992-
source "drivers/firmware/Kconfig"
1993-
19941992
if CRYPTO
19951993
source "arch/arm/crypto/Kconfig"
19961994
endif

arch/arm64/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,8 +1931,6 @@ source "drivers/cpufreq/Kconfig"
19311931

19321932
endmenu
19331933

1934-
source "drivers/firmware/Kconfig"
1935-
19361934
source "drivers/acpi/Kconfig"
19371935

19381936
source "arch/arm64/kvm/Kconfig"

arch/ia64/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,6 @@ config CRASH_DUMP
388388
help
389389
Generate crash dump after being started by kexec.
390390

391-
source "drivers/firmware/Kconfig"
392-
393391
endmenu
394392

395393
menu "Power management and ACPI options"

arch/mips/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3316,8 +3316,6 @@ source "drivers/cpuidle/Kconfig"
33163316

33173317
endmenu
33183318

3319-
source "drivers/firmware/Kconfig"
3320-
33213319
source "arch/mips/kvm/Kconfig"
33223320

33233321
source "arch/mips/vdso/Kconfig"

arch/parisc/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,4 @@ config KEXEC_FILE
384384

385385
endmenu
386386

387-
source "drivers/firmware/Kconfig"
388-
389387
source "drivers/parisc/Kconfig"

arch/riscv/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,5 +561,3 @@ menu "Power management options"
561561
source "kernel/power/Kconfig"
562562

563563
endmenu
564-
565-
source "drivers/firmware/Kconfig"

arch/x86/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,8 +2828,6 @@ config HAVE_ATOMIC_IOMAP
28282828
def_bool y
28292829
depends on X86_32
28302830

2831-
source "drivers/firmware/Kconfig"
2832-
28332831
source "arch/x86/kvm/Kconfig"
28342832

28352833
source "arch/x86/Kconfig.assembler"

drivers/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ source "drivers/bus/Kconfig"
1717

1818
source "drivers/connector/Kconfig"
1919

20+
source "drivers/firmware/Kconfig"
21+
2022
source "drivers/gnss/Kconfig"
2123

2224
source "drivers/mtd/Kconfig"

0 commit comments

Comments
 (0)