Commit db616eb6 authored by Ben Dooks's avatar Ben Dooks

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: default avatarBen Dooks <ben-linux@fluff.org>
parent e119766f
...@@ -198,4 +198,9 @@ config S3C_DEV_USB_HSOTG ...@@ -198,4 +198,9 @@ config S3C_DEV_USB_HSOTG
help help
Compile in platform device definition for USB high-speed OtG 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 endif
...@@ -41,4 +41,4 @@ obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o ...@@ -41,4 +41,4 @@ obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o
obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
obj-y += dev-nand.o obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
...@@ -10,6 +10,7 @@ config PLAT_S3C24XX ...@@ -10,6 +10,7 @@ config PLAT_S3C24XX
default y default y
select NO_IOPORT select NO_IOPORT
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select S3C_DEVICE_NAND
help help
Base platform code for any Samsung S3C24XX device Base platform code for any Samsung S3C24XX device
......
...@@ -19,6 +19,7 @@ config PLAT_S3C64XX ...@@ -19,6 +19,7 @@ config PLAT_S3C64XX
select S3C_GPIO_PULL_UPDOWN select S3C_GPIO_PULL_UPDOWN
select S3C_GPIO_CFG_S3C24XX select S3C_GPIO_CFG_S3C24XX
select S3C_GPIO_CFG_S3C64XX select S3C_GPIO_CFG_S3C64XX
select S3C_DEV_NAND
select USB_ARCH_HAS_OHCI select USB_ARCH_HAS_OHCI
help help
Base platform code for any Samsung S3C64XX device Base platform code for any Samsung S3C64XX device
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment