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

Commit 431107ea authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410 



As per discussions with Russell King on linux-arm-kernel, it appears that
both mach-s3c6400 and mach-s3c6410 are so close together that they should
simply be merged into mach-s3c64xx.

Note, this patch does not eliminate any of the bits that are still common,
it is simply a move of the two directories together, any further common
code will be eliminated or moved in further patches.

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

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -799,8 +799,7 @@ source "arch/arm/mach-s3c2443/Kconfig" 
endif



if ARCH_S3C64XX

source "arch/arm/mach-s3c6400/Kconfig"

source "arch/arm/mach-s3c6410/Kconfig"

source "arch/arm/mach-s3c64xx/Kconfig"

endif



source "arch/arm/mach-s5p6440/Kconfig"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ machine-$(CONFIG_ARCH_REALVIEW) := realview 
machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

machine-$(CONFIG_ARCH_S5PC1XX)		:= s5pc100

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

arch/arm/mach-s3c6400/Kconfig

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
# Copyright 2008 Openmoko, Inc.

#	Simtec Electronics, Ben Dooks <ben@simtec.co.uk>

#

# Licensed under GPLv2



# Configuration options for the S3C6410 CPU



config CPU_S3C6400

	bool

	select CPU_S3C6400_INIT

	select CPU_S3C6400_CLOCK

	help

	  Enable S3C6400 CPU support



config S3C6400_SETUP_SDHCI

	bool

	help

	  Internal configuration for default SDHCI

	  setup for S3C6400.



# S36400 Macchine support



config MACH_SMDK6400

       bool "SMDK6400"

	select CPU_S3C6400

	select S3C_DEV_HSMMC

	select S3C_DEV_NAND

	select S3C6400_SETUP_SDHCI

	help

	  Machine support for the Samsung SMDK6400

arch/arm/mach-s3c6400/Makefile

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
# arch/arm/mach-s3c6400/Makefile

#

# Copyright 2008 Openmoko, Inc.

# Copyright 2008 Simtec Electronics

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:=

obj-				:=



# Core support for S3C6400 system



obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o



# setup support



obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci.o



# Machine support



obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o

arch/arm/mach-s3c6410/Kconfig→arch/arm/mach-s3c64xx/Kconfig

+28 −2
Original line number Diff line number Diff line 
# Copyright 2008 Openmoko, Inc.

# Copyright 2008 Simtec Electronics

#	Simtec Electronics, Ben Dooks <ben@simtec.co.uk>

#

# Licensed under GPLv2



# Configuration options for the S3C6410 CPU



config CPU_S3C6400

	bool

	select CPU_S3C6400_INIT

	select CPU_S3C6400_CLOCK

	help

	  Enable S3C6400 CPU support



config CPU_S3C6410

	bool

	select CPU_S3C6400_INIT
@@ -12,12 +19,31 @@ config CPU_S3C6410 
	help

	  Enable S3C6410 CPU support



config S3C6400_SETUP_SDHCI

	bool

	help

	  Internal configuration for default SDHCI

	  setup for S3C6400.



config S3C6410_SETUP_SDHCI

	bool

	select S3C64XX_SETUP_SDHCI_GPIO

	help

	  Internal helper functions for S3C6410 based SDHCI systems



# S36400 Macchine support



config MACH_SMDK6400

       bool "SMDK6400"

	select CPU_S3C6400

	select S3C_DEV_HSMMC

	select S3C_DEV_NAND

	select S3C6400_SETUP_SDHCI

	help

	  Machine support for the Samsung SMDK6400



# S3C6410 machine support



config MACH_ANW6410

	bool "A&W6410"

	select CPU_S3C6410