Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db616eb6 authored by Ben Dooks's avatar Ben Dooks
Browse files

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

arch/arm/plat-s3c/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-s3c/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-s3c24xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-s3c64xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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