From 4d93bba9f44ec2634f49d4632c9643de64086303 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 21 Dec 2008 15:02:07 +0000 Subject: [PATCH] --- yaml --- r: 123938 b: refs/heads/master c: d83a12a40915774332cec625856c2e7ba9033e15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c/Kconfig | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 5e1a2ad423be..7d929f01a665 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a663a71e429d7d06a7773edc4092995c5fe1171f +refs/heads/master: d83a12a40915774332cec625856c2e7ba9033e15 diff --git a/trunk/arch/arm/plat-s3c/Kconfig b/trunk/arch/arm/plat-s3c/Kconfig index def0bb457ca3..de9383814e5e 100644 --- a/trunk/arch/arm/plat-s3c/Kconfig +++ b/trunk/arch/arm/plat-s3c/Kconfig @@ -14,26 +14,24 @@ config PLAT_S3C # low-level serial option nodes +if PLAT_S3C + config CPU_LLSERIAL_S3C2410_ONLY bool - depends on PLAT_S3C default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440 config CPU_LLSERIAL_S3C2440_ONLY bool - depends on PLAT_S3C default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410 config CPU_LLSERIAL_S3C2410 bool - depends on PLAT_S3C help Selected if there is an S3C2410 (or register compatible) serial low-level implementation needed config CPU_LLSERIAL_S3C2440 bool - depends on PLAT_S3C help Selected if there is an S3C2440 (or register compatible) serial low-level implementation needed @@ -44,7 +42,7 @@ comment "Boot options" config S3C_BOOT_WATCHDOG bool "S3C Initialisation watchdog" - depends on PLAT_S3C && S3C2410_WATCHDOG + depends on S3C2410_WATCHDOG help Say y to enable the watchdog during the kernel decompression stage. If the kernel fails to uncompress, then the watchdog @@ -52,14 +50,12 @@ config S3C_BOOT_WATCHDOG config S3C_BOOT_ERROR_RESET bool "S3C Reboot on decompression error" - depends on PLAT_S3C help Say y here to use the watchdog to reset the system if the kernel decompressor detects an error during decompression. config S3C_BOOT_UART_FORCE_FIFO bool "Force UART FIFO on during boot process" - depends on PLAT_S3C default y help Say Y here to force the UART FIFOs on during the kernel @@ -69,7 +65,7 @@ comment "Power management" config S3C2410_PM_DEBUG bool "S3C2410 PM Suspend debug" - depends on PLAT_S3C && PM + depends on PM help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See @@ -77,7 +73,7 @@ config S3C2410_PM_DEBUG config S3C2410_PM_CHECK bool "S3C2410 PM Suspend Memory CRC" - depends on PLAT_S3C && PM && CRC32 + depends on PM && CRC32 help Enable the PM code's memory area checksum over sleep. This option 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 int "S3C2410 PM Suspend CRC Chunksize (KiB)" - depends on PLAT_S3C && PM && S3C2410_PM_CHECK + depends on PM && S3C2410_PM_CHECK default 64 help 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 int "S3C UART to use for low-level messages" - depends on PLAT_S3C default 0 help 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 bool - depends on PLAT_S3C help Compile in platform device definitions for HSMMC code config S3C_DEV_HSMMC1 bool - depends on PLAT_S3C help Compile in platform device definitions for HSMMC channel 1 config S3C_DEV_I2C1 bool - depends on PLAT_S3C help Compile in platform device definitions for I2C channel 1 config S3C_DEV_FB bool - depends on PLAT_S3C help Compile in platform device definition for framebuffer + +endif