Эх сурвалжийг харах

ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs.

A number of machines that need s3c_device_nand present do not select
this in their Kconfig entries. Add the necessary selection of the
configuration S3C_DEV_NAND so that we avoid the following error:

arch/arm/mach-s3c2410/built-in.o: In function `bast_map_io':
arch/arm/mach-s3c2410/mach-bast.c:634: undefined reference to `s3c_device_nand'
arch/arm/mach-s3c2412/built-in.o: In function `s3c2412_init_uarts':
arch/arm/mach-s3c2412/s3c2412.c:109: undefined reference to `s3c_device_nand'
arch/arm/mach-s3c2412/built-in.o: In function `jive_machine_init':
arch/arm/mach-s3c2412/mach-jive.c:673: undefined reference to `s3c_device_nand'

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks 15 жил өмнө
parent
commit
d23b351740

+ 5 - 0
arch/arm/mach-s3c2410/Kconfig

@@ -77,6 +77,7 @@ config ARCH_H1940
 	select CPU_S3C2410
 	select CPU_S3C2410
 	select PM_H1940 if PM
 	select PM_H1940 if PM
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the HP IPAQ H1940
 	  Say Y here if you are using the HP IPAQ H1940
 
 
@@ -89,6 +90,7 @@ config MACH_N30
 	bool "Acer N30 family"
 	bool "Acer N30 family"
 	select CPU_S3C2410
 	select CPU_S3C2410
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you want suppt for the Acer N30, Acer N35,
 	  Say Y here if you want suppt for the Acer N30, Acer N35,
 	  Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
 	  Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
@@ -103,6 +105,7 @@ config ARCH_BAST
 	select S3C24XX_DCLK
 	select S3C24XX_DCLK
 	select ISA
 	select ISA
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the Simtec Electronics EB2410ITX
 	  Say Y here if you are using the Simtec Electronics EB2410ITX
 	  development board (also known as BAST)
 	  development board (also known as BAST)
@@ -111,6 +114,7 @@ config MACH_OTOM
  	bool "NexVision OTOM Board"
  	bool "NexVision OTOM Board"
  	select CPU_S3C2410
  	select CPU_S3C2410
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
  	  Say Y here if you are using the Nex Vision OTOM board
  	  Say Y here if you are using the Nex Vision OTOM board
 
 
@@ -154,6 +158,7 @@ config MACH_QT2410
 	bool "QT2410"
 	bool "QT2410"
 	select CPU_S3C2410
 	select CPU_S3C2410
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	   Say Y here if you are using the Armzone QT2410
 	   Say Y here if you are using the Armzone QT2410
 
 

+ 3 - 0
arch/arm/mach-s3c2412/Kconfig

@@ -48,6 +48,7 @@ config MACH_JIVE
 	bool "Logitech Jive"
 	bool "Logitech Jive"
 	select CPU_S3C2412
 	select CPU_S3C2412
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the Logitech Jive.
 	  Say Y here if you are using the Logitech Jive.
 
 
@@ -61,6 +62,7 @@ config MACH_SMDK2413
 	select MACH_S3C2413
 	select MACH_S3C2413
 	select MACH_SMDK
 	select MACH_SMDK
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using an SMDK2413
 	  Say Y here if you are using an SMDK2413
 
 
@@ -84,6 +86,7 @@ config MACH_VSTMS
 	bool "VMSTMS"
 	bool "VMSTMS"
 	select CPU_S3C2412
 	select CPU_S3C2412
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using an VSTMS board
 	  Say Y here if you are using an VSTMS board
 
 

+ 6 - 0
arch/arm/mach-s3c2440/Kconfig

@@ -48,6 +48,7 @@ config MACH_OSIRIS
 	select S3C2440_XTAL_12000000
 	select S3C2440_XTAL_12000000
 	select S3C2410_IOTIMING if S3C2440_CPUFREQ
 	select S3C2410_IOTIMING if S3C2440_CPUFREQ
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the Simtec IM2440D20 module, also
 	  Say Y here if you are using the Simtec IM2440D20 module, also
 	  known as the Osiris.
 	  known as the Osiris.
@@ -57,6 +58,7 @@ config MACH_RX3715
 	select CPU_S3C2440
 	select CPU_S3C2440
 	select S3C2440_XTAL_16934400
 	select S3C2440_XTAL_16934400
 	select PM_H1940 if PM
 	select PM_H1940 if PM
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the HP iPAQ rx3715.
 	  Say Y here if you are using the HP iPAQ rx3715.
 
 
@@ -66,6 +68,7 @@ config ARCH_S3C2440
 	select S3C2440_XTAL_16934400
 	select S3C2440_XTAL_16934400
 	select MACH_SMDK
 	select MACH_SMDK
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the SMDK2440.
 	  Say Y here if you are using the SMDK2440.
 
 
@@ -74,6 +77,7 @@ config MACH_NEXCODER_2440
  	select CPU_S3C2440
  	select CPU_S3C2440
 	select S3C2440_XTAL_12000000
 	select S3C2440_XTAL_12000000
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
  	  Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
  	  Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
 
 
@@ -88,6 +92,7 @@ config MACH_AT2440EVB
 	bool "Avantech AT2440EVB development board"
 	bool "Avantech AT2440EVB development board"
 	select CPU_S3C2440
 	select CPU_S3C2440
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here if you are using the AT2440EVB development board
 	  Say Y here if you are using the AT2440EVB development board
 
 
@@ -97,6 +102,7 @@ config MACH_MINI2440
 	select EEPROM_AT24
 	select EEPROM_AT24
 	select LEDS_TRIGGER_BACKLIGHT
 	select LEDS_TRIGGER_BACKLIGHT
 	select SND_S3C24XX_SOC_S3C24XX_UDA134X
 	select SND_S3C24XX_SOC_S3C24XX_UDA134X
+	select S3C_DEV_NAND
 	help
 	help
 	  Say Y here to select support for the MINI2440. Is a 10cm x 10cm board
 	  Say Y here to select support for the MINI2440. Is a 10cm x 10cm board
 	  available via various sources. It can come with a 3.5" or 7" touch LCD.
 	  available via various sources. It can come with a 3.5" or 7" touch LCD.

+ 1 - 0
arch/arm/mach-s3c6400/Kconfig

@@ -26,6 +26,7 @@ config MACH_SMDK6400
        bool "SMDK6400"
        bool "SMDK6400"
 	select CPU_S3C6400
 	select CPU_S3C6400
 	select S3C_DEV_HSMMC
 	select S3C_DEV_HSMMC
+	select S3C_DEV_NAND
 	select S3C6400_SETUP_SDHCI
 	select S3C6400_SETUP_SDHCI
 	help
 	help
 	  Machine support for the Samsung SMDK6400
 	  Machine support for the Samsung SMDK6400

+ 1 - 0
arch/arm/mach-s3c6410/Kconfig

@@ -102,6 +102,7 @@ config MACH_HMT
 	bool "Airgoo HMT"
 	bool "Airgoo HMT"
 	select CPU_S3C6410
 	select CPU_S3C6410
 	select S3C_DEV_FB
 	select S3C_DEV_FB
+	select S3C_DEV_NAND
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HOST
 	select S3C64XX_SETUP_FB_24BPP
 	select S3C64XX_SETUP_FB_24BPP
 	select HAVE_PWM
 	select HAVE_PWM