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

Commit 28c569f6 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Move common-smdk code to mach directory 



This code is used by boards based on the S3C2410/S3C2440/S3C2416.
The patch includes also a rename of the option, as the smdk code
is not a mach itself, but only an extension with common code.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 880bcd4a

arch/arm/mach-s3c24xx/Kconfig

+14 −5
Original line number Original line Diff line number Diff line
@@ -81,6 +81,15 @@ config CPU_S3C2443 
	help

	help

	  Support for the S3C2443 SoC from the S3C24XX line

	  Support for the S3C2443 SoC from the S3C24XX line





# common code



config S3C24XX_SMDK

	bool

	help

	  Common machine code for SMDK2410 and SMDK2440



# cpu-specific sections



if CPU_S3C2410

if CPU_S3C2410





config S3C2410_DMA

config S3C2410_DMA
@@ -192,7 +201,7 @@ config MACH_QT2410 




config ARCH_SMDK2410

config ARCH_SMDK2410

	bool "SMDK2410/A9M2410"

	bool "SMDK2410/A9M2410"

	select MACH_SMDK

	select S3C24XX_SMDK

	help

	help

	  Say Y here if you are using the SMDK2410 or the derived module A9M2410

	  Say Y here if you are using the SMDK2410 or the derived module A9M2410

	  <http://www.fsforth.de>

	  <http://www.fsforth.de>
@@ -279,7 +288,7 @@ config MACH_SMDK2412 
config MACH_SMDK2413

config MACH_SMDK2413

	bool "SMDK2413"

	bool "SMDK2413"

	select MACH_S3C2413

	select MACH_S3C2413

	select MACH_SMDK

	select S3C24XX_SMDK

	select S3C_DEV_USB_HOST

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	select S3C_DEV_NAND

	help

	help
@@ -317,7 +326,7 @@ comment "S3C2416 Boards" 




config MACH_SMDK2416

config MACH_SMDK2416

	bool "SMDK2416"

	bool "SMDK2416"

	select MACH_SMDK

	select S3C24XX_SMDK

	select S3C_DEV_FB

	select S3C_DEV_FB

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC1
@@ -420,7 +429,7 @@ config MACH_RX3715 
config ARCH_S3C2440

config ARCH_S3C2440

	bool "SMDK2440"

	bool "SMDK2440"

	select S3C2440_XTAL_16934400

	select S3C2440_XTAL_16934400

	select MACH_SMDK

	select S3C24XX_SMDK

	select S3C_DEV_USB_HOST

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	select S3C_DEV_NAND

	help

	help
@@ -492,7 +501,7 @@ comment "S3C2443 Boards" 




config MACH_SMDK2443

config MACH_SMDK2443

	bool "SMDK2443"

	bool "SMDK2443"

	select MACH_SMDK

	select S3C24XX_SMDK

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC1

	help

	help

	  Say Y here if you are using an SMDK2443

	  Say Y here if you are using an SMDK2443

arch/arm/mach-s3c24xx/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ obj-$(CONFIG_MACH_SMDK2443) += mach-smdk2443.o 




# common bits of machine support

# common bits of machine support





obj-$(CONFIG_S3C24XX_SMDK)		+= common-smdk.o

obj-$(CONFIG_SIMTEC_NOR)		+= nor-simtec.o

obj-$(CONFIG_SIMTEC_NOR)		+= nor-simtec.o





# machine additions

# machine additions

arch/arm/plat-s3c24xx/Kconfig

+0 −5
Original line number Original line Diff line number Diff line
@@ -119,11 +119,6 @@ config S3C2412_IOTIMING 
	  Intel node to select io timing code that is common to the s3c2412

	  Intel node to select io timing code that is common to the s3c2412

	  and the s3c2443.

	  and the s3c2443.





config MACH_SMDK

	bool

	help

	  Common machine code for SMDK2410 and SMDK2440



config S3C24XX_SIMTEC_AUDIO

config S3C24XX_SIMTEC_AUDIO

	bool

	bool

	depends on (ARCH_BAST || MACH_VR1000 || MACH_OSIRIS || MACH_ANUBIS)

	depends on (ARCH_BAST || MACH_VR1000 || MACH_OSIRIS || MACH_ANUBIS)

arch/arm/plat-s3c24xx/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -39,5 +39,4 @@ obj-$(CONFIG_S3C2410_SETUP_TS) += setup-ts.o 




# machine common support

# machine common support





obj-$(CONFIG_MACH_SMDK)		+= common-smdk.o

obj-$(CONFIG_S3C24XX_SIMTEC_AUDIO)	+= simtec-audio.o
 
obj-$(CONFIG_S3C24XX_SIMTEC_AUDIO)	+= simtec-audio.o