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

Commit 5cbcccb3 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440 



Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440
directory as the S3C2440 and S3C2442 are very close.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 87aef30e

arch/arm/mach-s3c2440/Kconfig

+18 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,7 @@ config S3C2440_DMA 
	help

	help

	  Support for S3C2440 specific DMA code5A

	  Support for S3C2440 specific DMA code5A







menu "S3C2440 and S3C2442 Machines"

menu "S3C2440 Machines"





config MACH_ANUBIS

config MACH_ANUBIS

	bool "Simtec Electronics ANUBIS"

	bool "Simtec Electronics ANUBIS"
@@ -37,6 +36,18 @@ config MACH_ANUBIS 
	  Say Y here if you are using the Simtec Electronics ANUBIS

	  Say Y here if you are using the Simtec Electronics ANUBIS

	  development system

	  development system





config MACH_NEO1973_GTA02

	bool "Openmoko GTA02 / Freerunner phone"

	select CPU_S3C2442

	select MFD_PCF50633

	select PCF50633_GPIO

	select I2C

	select POWER_SUPPLY

	select MACH_NEO1973

	select S3C2410_PWM

	help

	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone



config MACH_OSIRIS

config MACH_OSIRIS

	bool "Simtec IM2440D20 (OSIRIS) module"

	bool "Simtec IM2440D20 (OSIRIS) module"

	select CPU_S3C2440

	select CPU_S3C2440
@@ -99,6 +110,11 @@ config SMDK2440_CPU2440 
	select S3C2440_XTAL_16934400

	select S3C2440_XTAL_16934400

	select CPU_S3C2440

	select CPU_S3C2440





config SMDK2440_CPU2442

	bool "SMDM2440 with S3C2442 CPU module"

	depends on ARCH_S3C2440

	select CPU_S3C2442



config MACH_AT2440EVB

config MACH_AT2440EVB

	bool "Avantech AT2440EVB development board"

	bool "Avantech AT2440EVB development board"

	select CPU_S3C2440

	select CPU_S3C2440

arch/arm/mach-s3c2440/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o 
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o

obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o

obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o

obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o

obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o

obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o

obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o





# extra machine support

# extra machine support

arch/arm/mach-s3c2442/Kconfig

+0 −22
Original line number Original line Diff line number Diff line
@@ -13,25 +13,3 @@ config CPU_S3C2442 
	select CPU_LLSERIAL_S3C2440

	select CPU_LLSERIAL_S3C2440

	help

	help

	  Support for S3C2442 Samsung Mobile CPU based systems.
 
	  Support for S3C2442 Samsung Mobile CPU based systems.
 




menu "S3C2442 Machines"



config SMDK2440_CPU2442

	bool "SMDM2440 with S3C2442 CPU module"

	depends on ARCH_S3C2440

	select CPU_S3C2442



config MACH_NEO1973_GTA02

	bool "Openmoko GTA02 / Freerunner phone"

	select CPU_S3C2442

	select MFD_PCF50633

	select PCF50633_GPIO

	select I2C

	select POWER_SUPPLY

	select MACH_NEO1973

	select S3C2410_PWM

	help

	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone



endmenu