From patchwork Wed May 21 06:52:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 30508 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 036C520671 for ; Wed, 21 May 2014 06:55:09 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf7077528oag.8 for ; Tue, 20 May 2014 23:55:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=E53/bAma6vknwH6PccVQGBuLwEQ+z0GRvDnMlNZiyjk=; b=NJE1usJJN45+HGXMD8WIiHwUIfZaonoXWqypxqdZNtaaq0SHxDzP8AeUb+TxpkyXIq i7EOWaEN/lnrwkCwFpFKt7cwBzuXSzsHH+O8AJkRF3hsKeRYzQpFRp1HBUAXiMmxGxU/ k0ac5WKDrvXsJK2uQ1J6v3VTljdqADAWZV14tqpfN0utmueVHWm9fve+jp9fT2gaH3/c +sQvDTA3alXmTnDKRVE84ZNfk4NMOPUk7jNTc0jChsrKGKyQaa5lStYpEM3gDfMGa34D MxeKLMeC9eWzMd80/s2r5zPyiv/lyPQnCCcEgJZli8FaXG9mORgfhEtdQCQgJwT/s9R0 FTcQ== X-Gm-Message-State: ALoCoQlN6T5CSm4oq0efTvASxzQpitjlNq/zJTw57I3+C4JxvA3EU4pTa0CA982IypvuVwIQHqWH X-Received: by 10.182.252.166 with SMTP id zt6mr21570053obc.17.1400655309408; Tue, 20 May 2014 23:55:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.145 with SMTP id g17ls592465qge.76.gmail; Tue, 20 May 2014 23:55:09 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr1566410vcb.0.1400655309309; Tue, 20 May 2014 23:55:09 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id uj9si148001vec.101.2014.05.20.23.55.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 May 2014 23:55:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so1976189vcb.18 for ; Tue, 20 May 2014 23:55:09 -0700 (PDT) X-Received: by 10.52.185.72 with SMTP id fa8mr6921303vdc.12.1400655309233; Tue, 20 May 2014 23:55:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp88550vcb; Tue, 20 May 2014 23:55:08 -0700 (PDT) X-Received: by 10.66.150.228 with SMTP id ul4mr56996130pab.16.1400655307972; Tue, 20 May 2014 23:55:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zf6si27800915pab.226.2014.05.20.23.55.07; Tue, 20 May 2014 23:55:07 -0700 (PDT) Received-SPF: none (google.com: linux-samsung-soc-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751561AbaEUGzG (ORCPT + 9 others); Wed, 21 May 2014 02:55:06 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:43978 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751260AbaEUGzG (ORCPT ); Wed, 21 May 2014 02:55:06 -0400 Received: by mail-pa0-f42.google.com with SMTP id rd3so1118815pab.29 for ; Tue, 20 May 2014 23:55:05 -0700 (PDT) X-Received: by 10.66.148.98 with SMTP id tr2mr56434915pab.33.1400655305604; Tue, 20 May 2014 23:55:05 -0700 (PDT) Received: from linaro.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id om6sm6440498pbc.43.2014.05.20.23.55.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 May 2014 23:55:05 -0700 (PDT) From: Sachin Kamat To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, arnd@arndb.de, sachin.kamat@linaro.org Subject: [PATCH 2/3] ARM: EXYNOS: Enable multi-platform build support Date: Wed, 21 May 2014 12:22:48 +0530 Message-Id: <1400655169-21683-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400655169-21683-1-git-send-email-sachin.kamat@linaro.org> References: <1400655169-21683-1-git-send-email-sachin.kamat@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Arnd Bergmann This makes it possible to enable the exynos platform as part of a multiplatform kernel, in addition to keeping the single-platform Exynos support. Signed-off-by: Arnd Bergmann Signed-off-by: Sachin Kamat --- arch/arm/Kconfig | 30 ------------------------------ arch/arm/mach-exynos/Kconfig | 28 ++++++++++++++++++++++++++++ arch/arm/mach-exynos/Makefile | 2 ++ arch/arm/plat-samsung/Makefile | 3 +++ 4 files changed, 33 insertions(+), 30 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 666b59b58ab0..26f2bae4d948 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -829,36 +829,6 @@ config ARCH_S5PV210 help Samsung S5PV210/S5PC110 series based systems -config ARCH_EXYNOS - bool "Samsung EXYNOS" - select ARCH_HAS_BANDGAP - select ARCH_HAS_CPUFREQ - select ARCH_HAS_HOLES_MEMORYMODEL - select ARCH_REQUIRE_GPIOLIB - select ARCH_SPARSEMEM_ENABLE - select ARM_AMBA - select ARM_GIC - select CLKSRC_OF - select COMMON_CLK_SAMSUNG - select CPU_V7 - select GENERIC_CLOCKEVENTS - select HAVE_ARM_SCU if SMP - select HAVE_S3C2410_I2C if I2C - select HAVE_S3C2410_WATCHDOG if WATCHDOG - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_SMP - select NEED_MACH_MEMORY_H - select PINCTRL - select PINCTRL_EXYNOS - select PM_GENERIC_DOMAINS if PM_RUNTIME - select S5P_DEV_MFC - select SAMSUNG_DMADEV - select SPARSE_IRQ - select SRAM - select USE_OF - help - Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5) - config ARCH_DAVINCI bool "TI DaVinci" select ARCH_HAS_HOLES_MEMORYMODEL diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 138070e42aa9..46634175cf54 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -7,6 +7,34 @@ # Configuration options for the EXYNOS4 +config ARCH_EXYNOS + bool "Samsung EXYNOS" if ARCH_MULTI_V7 + select ARCH_HAS_BANDGAP + select ARCH_HAS_CPUFREQ + select ARCH_HAS_HOLES_MEMORYMODEL + select ARCH_REQUIRE_GPIOLIB + select ARM_AMBA + select ARM_GIC + select CLKSRC_OF + select COMMON_CLK_SAMSUNG + select CPU_V7 + select GENERIC_CLOCKEVENTS + select HAVE_ARM_SCU if SMP + select HAVE_S3C2410_I2C if I2C + select HAVE_S3C2410_WATCHDOG if WATCHDOG + select HAVE_S3C_RTC if RTC_CLASS + select HAVE_SMP + select PINCTRL + select PINCTRL_EXYNOS + select PM_GENERIC_DOMAINS if PM_RUNTIME + select S5P_DEV_MFC + select SAMSUNG_DMADEV + select SPARSE_IRQ + select SRAM + select USE_OF + help + Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5) + if ARCH_EXYNOS menu "SAMSUNG EXYNOS SoCs Support" diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 2e0666d31e75..97af694291f1 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -5,6 +5,8 @@ # # Licensed under GPLv2 +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include + obj-y := obj-m := obj-n := diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 25c826ed3b65..5e5beaa9ae15 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -4,6 +4,9 @@ # # Licensed under GPLv2 +ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include +ccflags-$(CONFIG_ARCH_EXYNOS) += -I$(srctree)/arch/arm/mach-exynos/include + obj-y := obj-m := obj-n := dummy.o