From patchwork Thu Aug 9 04:15:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 10612 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6245A23E41 for ; Thu, 9 Aug 2012 04:16:55 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 165E5A18957 for ; Thu, 9 Aug 2012 04:16:54 +0000 (UTC) Received: by ggnf1 with SMTP id f1so26491ggn.11 for ; Wed, 08 Aug 2012 21:16:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=R1egCpCuyJS/R6kBnF7IEjrBkBJdwCPnF3VCbg4yLH4=; b=j4pnXZ0PuYT3VCY3V6CWw8m2UjHUiwXiRW8wXLDZ4ESHWiX0ZhgT+v4XCdg6TM8bHE YHYCWEhIbFR2o3/o7+BsfUEK0XHeMKxWb4QObgEvQzYNqkubKfW4zT2Owj1s2kku7E4l BBHkuKmuj45KoQL2wTbwRdfSrV/AmgezfLT8DyF8xBiZGfdBxfN+oFdACrF+YNgHnnqa h2BvD8lIB3evWTywirNWWxMsyL6NBc/2bV1vXui7u6VPFpl60GlofgOQ19M0Zp6RExys wnKS46TNDA0hk5jfGTzCCpcAJ9TXFkHsh/vn55cuKhMkMRgmPs3HmathKAw4jA7m98ZL cR0g== Received: by 10.50.94.133 with SMTP id dc5mr991486igb.16.1344485814209; Wed, 08 Aug 2012 21:16:54 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp640142igc; Wed, 8 Aug 2012 21:16:53 -0700 (PDT) Received: by 10.68.226.6 with SMTP id ro6mr720683pbc.115.1344485813270; Wed, 08 Aug 2012 21:16:53 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id qt3si535018pbc.233.2012.08.08.21.16.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Aug 2012 21:16:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by pbcmd12 with SMTP id md12so259965pbc.37 for ; Wed, 08 Aug 2012 21:16:52 -0700 (PDT) Received: by 10.68.235.68 with SMTP id uk4mr842843pbc.52.1344485812730; Wed, 08 Aug 2012 21:16:52 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id ng8sm291767pbc.13.2012.08.08.21.16.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Aug 2012 21:16:52 -0700 (PDT) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH] ARM: Exynos: Enable DT support by default for Exynos5 SoC Date: Thu, 9 Aug 2012 09:45:19 +0530 Message-Id: <1344485719-26111-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQnX17vZ2wGrd0XzX0h1Ld+FjJ9o6HEpM+mBVAGWgWpNmS3fs7d7NnTGNjUUic7SwVXuZwFi Since support for Exynos5 SoC based boards is going to be only device tree (DT) based, it makes no sense to provide DT as a user selectable feature in menuconfig (De-selecting it gives "no machine record defined" linker error). Hence enabling it along with ARCH_EXYNOS5 option. Signed-off-by: Sachin Kamat Signed-off-by: Sachin Kamat --- arch/arm/mach-exynos/Kconfig | 17 +++++------------ arch/arm/mach-exynos/Makefile | 2 +- arch/arm/mach-exynos/Makefile.boot | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index b5b4c8c..72abbb8 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -20,10 +20,13 @@ config ARCH_EXYNOS4 Samsung EXYNOS4 SoCs based systems config ARCH_EXYNOS5 - bool "SAMSUNG EXYNOS5" + bool "SAMSUNG EXYNOS5 (using DT)" select HAVE_SMP + select USE_OF + select ARM_AMBA help - Samsung EXYNOS5 (Cortex-A15) SoC based systems + Samsung EXYNOS5 (Cortex-A15) SoC based systems using + device tree (DT) comment "EXYNOS SoCs" @@ -411,16 +414,6 @@ config MACH_EXYNOS4_DT Note: This is under development and not all peripherals can be supported with this machine file. -config MACH_EXYNOS5_DT - bool "SAMSUNG EXYNOS5 Machine using device tree" - depends on ARCH_EXYNOS5 - select SOC_EXYNOS5250 - select USE_OF - select ARM_AMBA - help - Machine support for Samsung Exynos4 machine with device tree enabled. - Select this if a fdt blob is available for the EXYNOS4 SoC based board. - if ARCH_EXYNOS4 comment "Configuration for HSMMC 8-bit bus width" diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 9b58024..5f04692 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -43,7 +43,7 @@ obj-$(CONFIG_MACH_SMDK4212) += mach-smdk4x12.o obj-$(CONFIG_MACH_SMDK4412) += mach-smdk4x12.o obj-$(CONFIG_MACH_EXYNOS4_DT) += mach-exynos4-dt.o -obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o +obj-$(CONFIG_ARCH_EXYNOS5) += mach-exynos5-dt.o # device support diff --git a/arch/arm/mach-exynos/Makefile.boot b/arch/arm/mach-exynos/Makefile.boot index 31bd181..2fc5b8c 100644 --- a/arch/arm/mach-exynos/Makefile.boot +++ b/arch/arm/mach-exynos/Makefile.boot @@ -2,4 +2,4 @@ params_phys-y := 0x40000100 dtb-$(CONFIG_MACH_EXYNOS4_DT) += exynos4210-origen.dtb exynos4210-smdkv310.dtb -dtb-$(CONFIG_MACH_EXYNOS5_DT) += exynos5250-smdk5250.dtb +dtb-$(CONFIG_ARCH_EXYNOS5) += exynos5250-smdk5250.dtb