From 812dd41a6984264902b3875245bde69895feaa3e Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Tue, 13 Mar 2012 07:44:39 -0700 Subject: [PATCH] --- yaml --- r: 296659 b: refs/heads/master c: 23f16c7b7cb6a5d086254cbf997c13a56c05031e h: refs/heads/master i: 296657: ca7b9995f0d7da985d510e218e1cac29c89cd2e1 296655: a2b9cce0c380ed086986ebc926c18a3f0680d639 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/Kconfig | 18 +++++++++++++----- trunk/arch/arm/mach-exynos/Makefile | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7f7b3c34868d..be45e68421f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9bba61522a7650b0e4d9952bb3ece81d473a52c +refs/heads/master: 23f16c7b7cb6a5d086254cbf997c13a56c05031e diff --git a/trunk/arch/arm/mach-exynos/Kconfig b/trunk/arch/arm/mach-exynos/Kconfig index 5e0a45605a22..a2ed05c4eb46 100644 --- a/trunk/arch/arm/mach-exynos/Kconfig +++ b/trunk/arch/arm/mach-exynos/Kconfig @@ -11,18 +11,19 @@ if ARCH_EXYNOS menu "SAMSUNG EXYNOS SoCs Support" -choice - prompt "EXYNOS System Type" - default ARCH_EXYNOS4 - config ARCH_EXYNOS4 bool "SAMSUNG EXYNOS4" + default y select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 help Samsung EXYNOS4 SoCs based systems -endchoice +config ARCH_EXYNOS5 + bool "SAMSUNG EXYNOS5" + select HAVE_SMP + help + Samsung EXYNOS5 (Cortex-A15) SoC based systems comment "EXYNOS SoCs" @@ -55,6 +56,13 @@ config SOC_EXYNOS4412 help Enable EXYNOS4412 SoC support +config SOC_EXYNOS5250 + bool "SAMSUNG EXYNOS5250" + default y + depends on ARCH_EXYNOS5 + help + Enable EXYNOS5250 SoC support + config EXYNOS4_MCT bool default y diff --git a/trunk/arch/arm/mach-exynos/Makefile b/trunk/arch/arm/mach-exynos/Makefile index f8a377076ff1..7214092b5196 100644 --- a/trunk/arch/arm/mach-exynos/Makefile +++ b/trunk/arch/arm/mach-exynos/Makefile @@ -14,6 +14,7 @@ obj- := obj-$(CONFIG_ARCH_EXYNOS) += common.o obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o +obj-$(CONFIG_ARCH_EXYNOS5) += clock-exynos5.o obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o