ARM: S3C: Add S3C_DEV_NAND Kconfig entry

Currently the S5PC100 does not define S3C_PA_NAND, leaving the NAND device
definitions in arch/arm/plat-s3c/dev-nand.c unbuildable. Add a KConfig
entry to select whether this is built.

As backwards compatibility, both the S3C24XX and S3C64XX define the new
configuration in their main Kconfig files until better support for basing
this selection on a per-machine basis can be sorted out.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
index 935c7558469bab7b1f524420ccd63b4467abc0d0..8931c5f0e46b64c99a9de606a7867e72012ebaca 100644 (file)
--- a/arch/arm/plat-s3c/Kconfig
+++ b/arch/arm/plat-s3c/Kconfig
@@ -198,4 +198,9 @@ config S3C_DEV_USB_HSOTG
        help
          Compile in platform device definition for USB high-speed OtG
 
+config S3C_DEV_NAND
+       bool
+       help
+         Compile in platform device definition for NAND controller
+
 endif

diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index f32d045e7e367ad1fa37e5208ad5fd35d68b5719..3c09109e9e846689ae1d4d297078192d2647e370 100644 (file)
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -41,4 +41,4 @@ obj-$(CONFIG_S3C_DEV_I2C1)    += dev-i2c1.o
 obj-$(CONFIG_S3C_DEV_FB)       += dev-fb.o
 obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
 obj-$(CONFIG_S3C_DEV_USB_HSOTG)        += dev-usb-hsotg.o
-obj-y                          += dev-nand.o
+obj-$(CONFIG_S3C_DEV_NAND)     += dev-nand.o

diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 2f914568359661cd78ad7ecf874a2cb741599632..9c7aca4896432f629f500efe9044850534547e7f 100644 (file)
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -10,6 +10,7 @@ config PLAT_S3C24XX
        default y
        select NO_IOPORT
        select ARCH_REQUIRE_GPIOLIB
+       select S3C_DEVICE_NAND
        help
          Base platform code for any Samsung S3C24XX device
 

diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig
index 5ebd8b425a54c329df34e09ab2a8a32a637df3e7..bcfa778614d851c467647e952e8022f2c4439fbd 100644 (file)
--- a/arch/arm/plat-s3c64xx/Kconfig
+++ b/arch/arm/plat-s3c64xx/Kconfig
@@ -19,6 +19,7 @@ config PLAT_S3C64XX
        select S3C_GPIO_PULL_UPDOWN
        select S3C_GPIO_CFG_S3C24XX
        select S3C_GPIO_CFG_S3C64XX
+       select S3C_DEV_NAND
        select USB_ARCH_HAS_OHCI
        help
          Base platform code for any Samsung S3C64XX device