diff mbox

ARM: Exynos: Enable DT support by default for Exynos5 SoC

Message ID 1344485719-26111-1-git-send-email-sachin.kamat@linaro.org
State Not Applicable
Headers show

Commit Message

Sachin Kamat Aug. 9, 2012, 4:15 a.m. UTC
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 <sachin.kamat@linaro.org>
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
---
 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(-)

Comments

Kukjin Kim Aug. 10, 2012, 6:14 a.m. UTC | #1
Sachin Kamat wrote:
> 
> 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.
> 
Yeah, it's true supporting EXYNOS5 SoCs is available only on DT. But I think
this is not needed and current method is more clear with EXYNOS4.

Note, 'exynos_defconfig' in mainline is supporting EXYNOS4 and EXYNOS5 DT
together.


> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>

BTW, I commented on other patch, I don't see why you need to keep the
duplicated signoff?

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Sachin Kamat Aug. 10, 2012, 6:27 a.m. UTC | #2
On 10 August 2012 11:44, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Sachin Kamat wrote:
>>
>> 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.
>>
> Yeah, it's true supporting EXYNOS5 SoCs is available only on DT. But I think
> this is not needed and current method is more clear with EXYNOS4.

Exynos4 supports both DT as well as non-DT platforms. Hence it is
appropriate to have DT as a user selectable option in Exynos4 case.

>
> Note, 'exynos_defconfig' in mainline is supporting EXYNOS4 and EXYNOS5 DT
> together.

Even this config provides a user selectable DT option for Exynos5.
When there is no possibility of having a non-DT platform for Exynos5
(atleast as of now), I do not see the need to provide a user
selectable option (it also leads to build errors with played around
with as mentioned in my patch) for DT for Exynos5 as it _has_ to be
enabled if one needs to build the kernel for Exynos5 machines.

>
>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
>
> BTW, I commented on other patch, I don't see why you need to keep the
> duplicated signoff?

Please refer to my reply to previous patch.

>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
diff mbox

Patch

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