Ver código fonte

[POWERPC] Ensure platform CONFIG options have correct dependencies

We currently support TAU and CPU frequency scaling only on discrete
(non-SOC) processors.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala 18 anos atrás
pai
commit
164a460d46
1 arquivos alterados com 6 adições e 1 exclusões
  1. 6 1
      arch/powerpc/platforms/Kconfig

+ 6 - 1
arch/powerpc/platforms/Kconfig

@@ -3,6 +3,7 @@ menu "Platform support"
 
 
 choice
 choice
 	prompt "Machine type"
 	prompt "Machine type"
+	depends on PPC64 || CLASSIC32
 	default PPC_MULTIPLATFORM
 	default PPC_MULTIPLATFORM
 
 
 config PPC_MULTIPLATFORM
 config PPC_MULTIPLATFORM
@@ -137,6 +138,9 @@ config GENERIC_IOMAP
 	bool
 	bool
 	default n
 	default n
 
 
+menu "CPU Frequency support"
+	depends on PPC64 || CLASSIC32
+
 source "drivers/cpufreq/Kconfig"
 source "drivers/cpufreq/Kconfig"
 
 
 config CPU_FREQ_PMAC
 config CPU_FREQ_PMAC
@@ -155,6 +159,7 @@ config CPU_FREQ_PMAC64
 	help
 	help
 	  This adds support for frequency switching on Apple iMac G5,
 	  This adds support for frequency switching on Apple iMac G5,
 	  and some of the more recent desktop G5 machines as well.
 	  and some of the more recent desktop G5 machines as well.
+endmenu
 
 
 config PPC601_SYNC_FIX
 config PPC601_SYNC_FIX
 	bool "Workarounds for PPC601 bugs"
 	bool "Workarounds for PPC601 bugs"
@@ -172,7 +177,7 @@ config PPC601_SYNC_FIX
 
 
 config TAU
 config TAU
 	bool "On-chip CPU temperature sensor support"
 	bool "On-chip CPU temperature sensor support"
-	depends on 6xx
+	depends on CLASSIC32
 	help
 	help
 	  G3 and G4 processors have an on-chip temperature sensor called the
 	  G3 and G4 processors have an on-chip temperature sensor called the
 	  'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
 	  'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die