Bläddra i källkod

[ARM] s3c: S3C options should depend on PLAT_S3C

This avoids non-Samsung builds being asked about Samsung specific
configuration options.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 16 år sedan
förälder
incheckning
d83a12a409
1 ändrade filer med 8 tillägg och 15 borttagningar
  1. 8 15
      arch/arm/plat-s3c/Kconfig

+ 8 - 15
arch/arm/plat-s3c/Kconfig

@@ -14,26 +14,24 @@ config PLAT_S3C
 
 
 # low-level serial option nodes
 # low-level serial option nodes
 
 
+if PLAT_S3C
+
 config CPU_LLSERIAL_S3C2410_ONLY
 config CPU_LLSERIAL_S3C2410_ONLY
 	bool
 	bool
-	depends on PLAT_S3C
 	default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
 	default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
 
 
 config CPU_LLSERIAL_S3C2440_ONLY
 config CPU_LLSERIAL_S3C2440_ONLY
 	bool
 	bool
-	depends on PLAT_S3C
 	default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
 	default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
 
 
 config CPU_LLSERIAL_S3C2410
 config CPU_LLSERIAL_S3C2410
 	bool
 	bool
-	depends on PLAT_S3C
 	help
 	help
 	  Selected if there is an S3C2410 (or register compatible) serial
 	  Selected if there is an S3C2410 (or register compatible) serial
 	  low-level implementation needed
 	  low-level implementation needed
 
 
 config CPU_LLSERIAL_S3C2440
 config CPU_LLSERIAL_S3C2440
 	bool
 	bool
-	depends on PLAT_S3C
 	help
 	help
 	  Selected if there is an S3C2440 (or register compatible) serial
 	  Selected if there is an S3C2440 (or register compatible) serial
 	  low-level implementation needed
 	  low-level implementation needed
@@ -44,7 +42,7 @@ comment "Boot options"
 
 
 config S3C_BOOT_WATCHDOG
 config S3C_BOOT_WATCHDOG
 	bool "S3C Initialisation watchdog"
 	bool "S3C Initialisation watchdog"
-	depends on PLAT_S3C && S3C2410_WATCHDOG
+	depends on S3C2410_WATCHDOG
 	help
 	help
 	  Say y to enable the watchdog during the kernel decompression
 	  Say y to enable the watchdog during the kernel decompression
 	  stage. If the kernel fails to uncompress, then the watchdog
 	  stage. If the kernel fails to uncompress, then the watchdog
@@ -52,14 +50,12 @@ config S3C_BOOT_WATCHDOG
 
 
 config S3C_BOOT_ERROR_RESET
 config S3C_BOOT_ERROR_RESET
 	bool "S3C Reboot on decompression error"
 	bool "S3C Reboot on decompression error"
-	depends on PLAT_S3C
 	help
 	help
 	  Say y here to use the watchdog to reset the system if the
 	  Say y here to use the watchdog to reset the system if the
 	  kernel decompressor detects an error during decompression.
 	  kernel decompressor detects an error during decompression.
 
 
 config S3C_BOOT_UART_FORCE_FIFO
 config S3C_BOOT_UART_FORCE_FIFO
        bool "Force UART FIFO on during boot process"
        bool "Force UART FIFO on during boot process"
-       depends on PLAT_S3C
        default y
        default y
        help
        help
          Say Y here to force the UART FIFOs on during the kernel
          Say Y here to force the UART FIFOs on during the kernel
@@ -69,7 +65,7 @@ comment "Power management"
 
 
 config S3C2410_PM_DEBUG
 config S3C2410_PM_DEBUG
 	bool "S3C2410 PM Suspend debug"
 	bool "S3C2410 PM Suspend debug"
-	depends on PLAT_S3C && PM
+	depends on PM
 	help
 	help
 	  Say Y here if you want verbose debugging from the PM Suspend and
 	  Say Y here if you want verbose debugging from the PM Suspend and
 	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
 	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
@@ -77,7 +73,7 @@ config S3C2410_PM_DEBUG
 
 
 config S3C2410_PM_CHECK
 config S3C2410_PM_CHECK
 	bool "S3C2410 PM Suspend Memory CRC"
 	bool "S3C2410 PM Suspend Memory CRC"
-	depends on PLAT_S3C && PM && CRC32
+	depends on PM && CRC32
 	help
 	help
  	  Enable the PM code's memory area checksum over sleep. This option
  	  Enable the PM code's memory area checksum over sleep. This option
 	  will generate CRCs of all blocks of memory, and store them before
 	  will generate CRCs of all blocks of memory, and store them before
@@ -91,7 +87,7 @@ config S3C2410_PM_CHECK
 
 
 config S3C2410_PM_CHECK_CHUNKSIZE
 config S3C2410_PM_CHECK_CHUNKSIZE
 	int "S3C2410 PM Suspend CRC Chunksize (KiB)"
 	int "S3C2410 PM Suspend CRC Chunksize (KiB)"
-	depends on PLAT_S3C && PM && S3C2410_PM_CHECK
+	depends on PM && S3C2410_PM_CHECK
 	default 64
 	default 64
 	help
 	help
 	  Set the chunksize in Kilobytes of the CRC for checking memory
 	  Set the chunksize in Kilobytes of the CRC for checking memory
@@ -103,7 +99,6 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 
 config S3C_LOWLEVEL_UART_PORT
 config S3C_LOWLEVEL_UART_PORT
 	int "S3C UART to use for low-level messages"
 	int "S3C UART to use for low-level messages"
-	depends on PLAT_S3C
 	default 0
 	default 0
 	help
 	help
 	  Choice of which UART port to use for the low-level messages,
 	  Choice of which UART port to use for the low-level messages,
@@ -159,24 +154,22 @@ config S3C_GPIO_CFG_S3C64XX
 
 
 config S3C_DEV_HSMMC
 config S3C_DEV_HSMMC
 	bool
 	bool
-	depends on PLAT_S3C
 	help
 	help
 	  Compile in platform device definitions for HSMMC code
 	  Compile in platform device definitions for HSMMC code
 
 
 config S3C_DEV_HSMMC1
 config S3C_DEV_HSMMC1
 	bool
 	bool
-	depends on PLAT_S3C
 	help
 	help
 	  Compile in platform device definitions for HSMMC channel 1
 	  Compile in platform device definitions for HSMMC channel 1
 
 
 config S3C_DEV_I2C1
 config S3C_DEV_I2C1
 	bool
 	bool
-	depends on PLAT_S3C
 	help
 	help
 	  Compile in platform device definitions for I2C channel 1
 	  Compile in platform device definitions for I2C channel 1
 
 
 config S3C_DEV_FB
 config S3C_DEV_FB
 	bool
 	bool
-	depends on PLAT_S3C
 	help
 	help
 	  Compile in platform device definition for framebuffer
 	  Compile in platform device definition for framebuffer
+
+endif