mirror of https://gitee.com/openkylin/linux.git
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: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Ben Dooks
parent
ab5d97db1c
commit
431107ea5b
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
# 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
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
# 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
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# arch/arm/plat-s3c6410/Makefile
|
||||
#
|
||||
# Copyright 2008 Openmoko, Inc.
|
||||
# Copyright 2008 Simtec Electronics
|
||||
#
|
||||
# Licensed under GPLv2
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Core support for S3C6410 system
|
||||
|
||||
obj-$(CONFIG_CPU_S3C6410) += cpu.o
|
||||
|
||||
# Helper and device support
|
||||
|
||||
obj-$(CONFIG_S3C6410_SETUP_SDHCI) += setup-sdhci.o
|
||||
|
||||
# machine support
|
||||
|
||||
obj-$(CONFIG_MACH_ANW6410) += mach-anw6410.o
|
||||
obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o
|
||||
obj-$(CONFIG_MACH_NCP) += mach-ncp.o
|
||||
obj-$(CONFIG_MACH_HMT) += mach-hmt.o
|
||||
|
|
@ -1,10 +1,17 @@
|
|||
# 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
|
||||
|
|
@ -58,7 +84,7 @@ config SMDK6410_SD_CH0
|
|||
at least some SMDK6410 boards come with the
|
||||
resistors fitted so that the card detects for
|
||||
channels 0 and 1 are the same.
|
||||
|
||||
|
||||
config SMDK6410_SD_CH1
|
||||
bool "Use channel 1 only"
|
||||
depends on MACH_SMDK6410
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# arch/arm/mach-s3c64xx/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
|
||||
obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
|
||||
|
||||
# setup support
|
||||
|
||||
obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci-s3c6400.o
|
||||
obj-$(CONFIG_S3C6410_SETUP_SDHCI) += setup-sdhci-s3c6410.o
|
||||
|
||||
# Machine support
|
||||
|
||||
obj-$(CONFIG_MACH_ANW6410) += mach-anw6410.o
|
||||
obj-$(CONFIG_MACH_SMDK6400) += mach-smdk6400.o
|
||||
obj-$(CONFIG_MACH_SMDK6410) += mach-smdk6410.o
|
||||
obj-$(CONFIG_MACH_NCP) += mach-ncp.o
|
||||
obj-$(CONFIG_MACH_HMT) += mach-hmt.o
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6410/mach-anw6410.c
|
||||
/* linux/arch/arm/mach-s3c64xx/mach-anw6410.c
|
||||
*
|
||||
* Copyright 2008 Openmoko, Inc.
|
||||
* Copyright 2008 Simtec Electronics
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* linux/arch/arm/mach-s3c6410/mach-ncp.c
|
||||
* linux/arch/arm/mach-s3c64xx/mach-ncp.c
|
||||
*
|
||||
* Copyright (C) 2008-2009 Samsung Electronics
|
||||
*
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6400/mach-smdk6400.c
|
||||
/* linux/arch/arm/mach-s3c64xx/mach-smdk6400.c
|
||||
*
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* Ben Dooks <ben@simtec.co.uk>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6410/mach-smdk6410.c
|
||||
/* linux/arch/arm/mach-s3c64xx/mach-smdk6410.c
|
||||
*
|
||||
* Copyright 2008 Openmoko, Inc.
|
||||
* Copyright 2008 Simtec Electronics
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6410/cpu.c
|
||||
/* linux/arch/arm/mach-s3c64xx/cpu.c
|
||||
*
|
||||
* Copyright 2009 Simtec Electronics
|
||||
* Ben Dooks <ben@simtec.co.uk>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6410/cpu.c
|
||||
/* linux/arch/arm/mach-s3c64xx/s3c6410.c
|
||||
*
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* Copyright 2008 Simtec Electronics
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6410/setup-sdhci.c
|
||||
/* linux/arch/arm/mach-s3c64xx/setup-sdhci.c
|
||||
*
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* Copyright 2008 Simtec Electronics
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* linux/arch/arm/mach-s3c6410/setup-sdhci.c
|
||||
/* linux/arch/arm/mach-s3c64xx/setup-sdhci.c
|
||||
*
|
||||
* Copyright 2008 Simtec Electronics
|
||||
* Copyright 2008 Simtec Electronics
|
||||
Loading…
Reference in New Issue