[PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Benoit Cousson]

devicetree will become the mandatory boot method for OMAP2+.
In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
select USE_OF by default for every OMAP2+ systems.
Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
boot loader to keep working properly.

Enable PROC_DEVICETREE as well.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/Kconfig |    1 -
 arch/arm/plat-omap/Kconfig  |    4 ++++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e1293aa..056a812 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -109,7 +109,6 @@ comment "OMAP Board Type"
 config MACH_OMAP_GENERIC
 	bool "Generic OMAP2+ board"
 	depends on ARCH_OMAP2PLUS
-	select USE_OF
 	default y
 	help
 	  Support for generic TI OMAP2+ boards using Flattened Device Tree.
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index aa59f42..74f41dc 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -24,6 +24,10 @@ config ARCH_OMAP2PLUS
 	select CLKDEV_LOOKUP
 	select GENERIC_IRQ_CHIP
 	select OMAP_DM_TIMER
+	select USE_OF
+	select ARM_APPENDED_DTB
+	select ARM_ATAG_DTB_COMPAT
+	select PROC_DEVICETREE
 	help
 	  "Systems based on OMAP2, OMAP3 or OMAP4"
 
-- 
1.7.0.4

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

Hi,

On Tue, 2011-12-06 at 17:49 +0100, Benoit Cousson wrote:
> devicetree will become the mandatory boot method for OMAP2+.
> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
> select USE_OF by default for every OMAP2+ systems.
> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
> boot loader to keep working properly.

APPENDED_DTB sounds a bit dangerous to be enabled by default according
to the config help text.

 Tomi


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Cousson, Benoit]

On 12/13/2011 2:27 PM, Tomi Valkeinen wrote:
> Hi,
>
> On Tue, 2011-12-06 at 17:49 +0100, Benoit Cousson wrote:
>> devicetree will become the mandatory boot method for OMAP2+.
>> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
>> select USE_OF by default for every OMAP2+ systems.
>> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
>> boot loader to keep working properly.
>
> APPENDED_DTB sounds a bit dangerous to be enabled by default according
> to the config help text.

The help is indeed really scary :-)

Tony,
Do we want to keep it by default? Or should we fix the kconfig help?

Regards
Benoit

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Tony Lindgren]

* Cousson, Benoit <b-cousson@ti.com> [111213 05:02]:
> On 12/13/2011 2:27 PM, Tomi Valkeinen wrote:
> >Hi,
> >
> >On Tue, 2011-12-06 at 17:49 +0100, Benoit Cousson wrote:
> >>devicetree will become the mandatory boot method for OMAP2+.
> >>In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
> >>select USE_OF by default for every OMAP2+ systems.
> >>Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
> >>boot loader to keep working properly.
> >
> >APPENDED_DTB sounds a bit dangerous to be enabled by default according
> >to the config help text.
> 
> The help is indeed really scary :-)

Heh, but it's also true.
 
> Tony,
> Do we want to keep it by default? Or should we fix the kconfig help?

Let's just leave out those two from omap2plus_defconfig then.

Regards,

Tony

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Cousson, Benoit]

On 12/13/2011 11:38 PM, Tony Lindgren wrote:
> * Cousson, Benoit<b-cousson@ti.com>  [111213 05:02]:
>> On 12/13/2011 2:27 PM, Tomi Valkeinen wrote:
>>> Hi,
>>>
>>> On Tue, 2011-12-06 at 17:49 +0100, Benoit Cousson wrote:
>>>> devicetree will become the mandatory boot method for OMAP2+.
>>>> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
>>>> select USE_OF by default for every OMAP2+ systems.
>>>> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
>>>> boot loader to keep working properly.
>>>
>>> APPENDED_DTB sounds a bit dangerous to be enabled by default according
>>> to the config help text.
>>
>> The help is indeed really scary :-)
>
> Heh, but it's also true.
>
>> Tony,
>> Do we want to keep it by default? Or should we fix the kconfig help?
>
> Let's just leave out those two from omap2plus_defconfig then.

OK. I'll do that.

Benoit

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Cousson, Benoit]

Hi Tony,

On 12/13/2011 11:38 PM, Tony Lindgren wrote:
> * Cousson, Benoit<b-cousson-l0cyMroinI0@public.gmane.org>  [111213 05:02]:
>> On 12/13/2011 2:27 PM, Tomi Valkeinen wrote:
>>> Hi,
>>>
>>> On Tue, 2011-12-06 at 17:49 +0100, Benoit Cousson wrote:
>>>> devicetree will become the mandatory boot method for OMAP2+.
>>>> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
>>>> select USE_OF by default for every OMAP2+ systems.
>>>> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
>>>> boot loader to keep working properly.
>>>
>>> APPENDED_DTB sounds a bit dangerous to be enabled by default according
>>> to the config help text.
>>
>> The help is indeed really scary :-)
> 
> Heh, but it's also true.
> 
>> Tony,
>> Do we want to keep it by default? Or should we fix the kconfig help?
> 
> Let's just leave out those two from omap2plus_defconfig then.

Here is the updated version.
Just let me know if you'd like to get the full series re-posted.

Thanks,
Benoit

---
>From b33d4be0213ab0c630b87bd3df77035cbb109cd0 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson-l0cyMroinI0@public.gmane.org>
Date: Thu, 1 Dec 2011 10:21:16 +0100
Subject: [PATCH] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

devicetree will become the mandatory boot method for OMAP2+.
In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
select USE_OF by default for every OMAP2+ systems.

Enable PROC_DEVICETREE as well.

Signed-off-by: Benoit Cousson <b-cousson-l0cyMroinI0@public.gmane.org>
Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
---
 arch/arm/mach-omap2/Kconfig |    1 -
 arch/arm/plat-omap/Kconfig  |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index b662513..bdd5b68 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -111,7 +111,6 @@ comment "OMAP Board Type"
 config MACH_OMAP_GENERIC
 	bool "Generic OMAP2+ board"
 	depends on ARCH_OMAP2PLUS
-	select USE_OF
 	default y
 	help
 	  Support for generic TI OMAP2+ boards using Flattened Device Tree.
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index aa59f42..734009a 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -24,6 +24,8 @@ config ARCH_OMAP2PLUS
 	select CLKDEV_LOOKUP
 	select GENERIC_IRQ_CHIP
 	select OMAP_DM_TIMER
+	select USE_OF
+	select PROC_DEVICETREE
 	help
 	  "Systems based on OMAP2, OMAP3 or OMAP4"
 
-- 
1.7.0.4

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Tony Lindgren]

* Cousson, Benoit <b-cousson@ti.com> [111216 06:53]:
> Hi Tony,
> 
> On 12/13/2011 11:38 PM, Tony Lindgren wrote:
> > * Cousson, Benoit<b-cousson@ti.com>  [111213 05:02]:
> >> On 12/13/2011 2:27 PM, Tomi Valkeinen wrote:
> >>> Hi,
> >>>
> >>> On Tue, 2011-12-06 at 17:49 +0100, Benoit Cousson wrote:
> >>>> devicetree will become the mandatory boot method for OMAP2+.
> >>>> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
> >>>> select USE_OF by default for every OMAP2+ systems.
> >>>> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
> >>>> boot loader to keep working properly.
> >>>
> >>> APPENDED_DTB sounds a bit dangerous to be enabled by default according
> >>> to the config help text.
> >>
> >> The help is indeed really scary :-)
> > 
> > Heh, but it's also true.
> > 
> >> Tony,
> >> Do we want to keep it by default? Or should we fix the kconfig help?
> > 
> > Let's just leave out those two from omap2plus_defconfig then.
> 
> Here is the updated version.
> Just let me know if you'd like to get the full series re-posted.

Thanks applying into dt branch. No need to repost this series.

Regards,

Tony

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Grant Likely]

On Tue, Dec 6, 2011 at 9:49 AM, Benoit Cousson <b-cousson@ti.com> wrote:
> devicetree will become the mandatory boot method for OMAP2+.
> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
> select USE_OF by default for every OMAP2+ systems.
> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
> boot loader to keep working properly.
>
> Enable PROC_DEVICETREE as well.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>

Acked-by: Grant Likely <grant.likely@secretlab.ca>

> ---
>  arch/arm/mach-omap2/Kconfig |    1 -
>  arch/arm/plat-omap/Kconfig  |    4 ++++
>  2 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index e1293aa..056a812 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -109,7 +109,6 @@ comment "OMAP Board Type"
>  config MACH_OMAP_GENERIC
>        bool "Generic OMAP2+ board"
>        depends on ARCH_OMAP2PLUS
> -       select USE_OF
>        default y
>        help
>          Support for generic TI OMAP2+ boards using Flattened Device Tree.
> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> index aa59f42..74f41dc 100644
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -24,6 +24,10 @@ config ARCH_OMAP2PLUS
>        select CLKDEV_LOOKUP
>        select GENERIC_IRQ_CHIP
>        select OMAP_DM_TIMER
> +       select USE_OF
> +       select ARM_APPENDED_DTB
> +       select ARM_ATAG_DTB_COMPAT
> +       select PROC_DEVICETREE
>        help
>          "Systems based on OMAP2, OMAP3 or OMAP4"
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems

[Cousson, Benoit]

On 1/4/2012 9:11 PM, Grant Likely wrote:
> On Tue, Dec 6, 2011 at 9:49 AM, Benoit Cousson<b-cousson-l0cyMroinI0@public.gmane.org>  wrote:
>> devicetree will become the mandatory boot method for OMAP2+.
>> In order to avoid cluttering the OMAP code with #ifdef CONFIG_OF,
>> select USE_OF by default for every OMAP2+ systems.
>> Select as well the APPENDED_DTB and ATAG_DTB_COMPAT to allow legacy
>> boot loader to keep working properly.
>>
>> Enable PROC_DEVICETREE as well.
>>
>> Signed-off-by: Benoit Cousson<b-cousson-l0cyMroinI0@public.gmane.org>
>> Cc: Tony Lindgren<tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
>
> Acked-by: Grant Likely<grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>

Thanks for the reviews.

Benoit