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]>
kawasaki · Oct 7, 2021 · 951cd3a · 951cd3a
1 parent 6880fa6
commit 951cd3a
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 14 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -1989,8 +1989,6 @@ config ARCH_HIBERNATION_POSSIBLE
 
 endmenu
 
-source "drivers/firmware/Kconfig"
-
 if CRYPTO
 source "arch/arm/crypto/Kconfig"
 endif

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
@@ -1931,8 +1931,6 @@ source "drivers/cpufreq/Kconfig"
 
 endmenu
 
-source "drivers/firmware/Kconfig"
-
 source "drivers/acpi/Kconfig"
 
 source "arch/arm64/kvm/Kconfig"

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
@@ -388,8 +388,6 @@ config CRASH_DUMP
 	  help
 	    Generate crash dump after being started by kexec.
 
-source "drivers/firmware/Kconfig"
-
 endmenu
 
 menu "Power management and ACPI options"

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
@@ -3316,8 +3316,6 @@ source "drivers/cpuidle/Kconfig"
 
 endmenu
 
-source "drivers/firmware/Kconfig"
-
 source "arch/mips/kvm/Kconfig"
 
 source "arch/mips/vdso/Kconfig"
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
@@ -384,6 +384,4 @@ config KEXEC_FILE
 
 endmenu
 
-source "drivers/firmware/Kconfig"
-
 source "drivers/parisc/Kconfig"
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
@@ -561,5 +561,3 @@ menu "Power management options"
 source "kernel/power/Kconfig"
 
 endmenu
-
-source "drivers/firmware/Kconfig"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
@@ -2828,8 +2828,6 @@ config HAVE_ATOMIC_IOMAP
 	def_bool y
 	depends on X86_32
 
-source "drivers/firmware/Kconfig"
-
 source "arch/x86/kvm/Kconfig"
 
 source "arch/x86/Kconfig.assembler"
diff --git a/drivers/Kconfig b/drivers/Kconfig
@@ -17,6 +17,8 @@ source "drivers/bus/Kconfig"
 
 source "drivers/connector/Kconfig"
 
+source "drivers/firmware/Kconfig"
+
 source "drivers/gnss/Kconfig"
 
 source "drivers/mtd/Kconfig"
-Original file line number
+Diff line change
@@ Expand Up / @@ -1989,8 +1989,6 @@ config ARCH_HIBERNATION_POSSIBLE @@
     endmenu
-    source "drivers/firmware/Kconfig"
     if CRYPTO
     source "arch/arm/crypto/Kconfig"
     endif
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -384,6 +384,4 @@ config KEXEC_FILE

		endmenu

		source "drivers/firmware/Kconfig"

		source "drivers/parisc/Kconfig"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -561,5 +561,3 @@ menu "Power management options"
		source "kernel/power/Kconfig"

		endmenu

		source "drivers/firmware/Kconfig"