[PATCH 0/6] omap Kconfig improvments for 2.6.36 merge window

[PATCH 0/6] omap Kconfig improvments for 2.6.36 merge window

[Tony Lindgren]

Hi all,

Here are some Kconfig improvments to produce a mostly sane .config for
omap2/3/4 without a defconfig. This assumes that CONFIG_ARCH_OMAP is
selected, for example with:

$ echo "CONFIG_ARCH_OMAP=y" > .config && yes "" | ARCH=arm make oldconfig

or

$ rm .config; ARCH=arm make xconfig, then select System Type -> TI OMAP

Regards,

Tony

---

Tony Lindgren (6):
      omap: Disable VGA console for omaps
      omap: Use 32KiHZ timer by default
      omap: Make omap specific features appear under Kconfig menu
      omap2/3/4: Move Kconfig options to mach-omap2/Kconfig
      omap2/3/4: Select all omaps and boards by default
      omap2/3/4: Add Kconfig option to compile in typical omap features


 arch/arm/mach-omap1/Kconfig   |    7 ++++
 arch/arm/mach-omap2/Kconfig   |   74 +++++++++++++++++++++++++++++++++++++++++
 arch/arm/plat-omap/Kconfig    |   22 +-----------
 drivers/video/console/Kconfig |    2 +
 4 files changed, 84 insertions(+), 21 deletions(-)

-- 
Signature

[PATCH 1/6] omap: Disable VGA console for omaps

[Tony Lindgren]

Otherwise we have to disable it manually to avoid compile errors.

Cc: linux-fbdev at vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/video/console/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 8e8f18d..467a966 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
 	bool "VGA text console" if EMBEDDED || !X86
-	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300
+	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !ARCH_OMAP
 	default y
 	help
 	  Saying Y here will allow you to use Linux in text mode through a

[PATCH 1/6] omap: Disable VGA console for omaps

[Anton Vorontsov]

On Tue, Jun 29, 2010 at 02:47:20PM +0300, Tony Lindgren wrote:
> Otherwise we have to disable it manually to avoid compile errors.
> 
> Cc: linux-fbdev at vger.kernel.org
> Signed-off-by: Tony Lindgren <tony@atomide.com>

We'll need this for mach-cns3xxx too. And doing that change for
every ARM subarch is going to produce lots of rejects.

I'd suggest to disable (or make it 'default n') for all ARMs,
except these:

$ git grep VGA_CONSOLE= arch/arm/configs/
arch/arm/configs/footbridge_defconfig:CONFIG_VGA_CONSOLE=y
arch/arm/configs/integrator_defconfig:CONFIG_VGA_CONSOLE=y
arch/arm/configs/netwinder_defconfig:CONFIG_VGA_CONSOLE=y

Thanks!

> ---
>  drivers/video/console/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
> index 8e8f18d..467a966 100644
> --- a/drivers/video/console/Kconfig
> +++ b/drivers/video/console/Kconfig
> @@ -6,7 +6,7 @@ menu "Console display driver support"
>  
>  config VGA_CONSOLE
>  	bool "VGA text console" if EMBEDDED || !X86
> -	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300
> +	depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !ARCH_OMAP
>  	default y
>  	help
>  	  Saying Y here will allow you to use Linux in text mode through a

-- 
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2

[PATCH 1/6] omap: Disable VGA console for omaps

[Tony Lindgren]

* Anton Vorontsov <cbouatmailru@gmail.com> [100629 15:04]:
> On Tue, Jun 29, 2010 at 02:47:20PM +0300, Tony Lindgren wrote:
> > Otherwise we have to disable it manually to avoid compile errors.
> > 
> > Cc: linux-fbdev at vger.kernel.org
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> 
> We'll need this for mach-cns3xxx too. And doing that change for
> every ARM subarch is going to produce lots of rejects.
> 
> I'd suggest to disable (or make it 'default n') for all ARMs,
> except these:
> 
> $ git grep VGA_CONSOLE= arch/arm/configs/
> arch/arm/configs/footbridge_defconfig:CONFIG_VGA_CONSOLE=y
> arch/arm/configs/integrator_defconfig:CONFIG_VGA_CONSOLE=y
> arch/arm/configs/netwinder_defconfig:CONFIG_VGA_CONSOLE=y

Good idea, will post a modified patch tomorrow.

Tony

[PATCH] ARM: Disable VGA console for ARM in most cases (Re: [PATCH 1/6] omap: Disable VGA console for omaps)

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [100629 17:15]:
> * Anton Vorontsov <cbouatmailru@gmail.com> [100629 15:04]:
> > On Tue, Jun 29, 2010 at 02:47:20PM +0300, Tony Lindgren wrote:
> > > Otherwise we have to disable it manually to avoid compile errors.
> > > 
> > > Cc: linux-fbdev at vger.kernel.org
> > > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > 
> > We'll need this for mach-cns3xxx too. And doing that change for
> > every ARM subarch is going to produce lots of rejects.
> > 
> > I'd suggest to disable (or make it 'default n') for all ARMs,
> > except these:
> > 
> > $ git grep VGA_CONSOLE= arch/arm/configs/
> > arch/arm/configs/footbridge_defconfig:CONFIG_VGA_CONSOLE=y
> > arch/arm/configs/integrator_defconfig:CONFIG_VGA_CONSOLE=y
> > arch/arm/configs/netwinder_defconfig:CONFIG_VGA_CONSOLE=y
> 
> Good idea, will post a modified patch tomorrow.

Here's this one updated.

Tony
-------------- next part --------------
A non-text attachment was scrubbed...
Name: kconfig-disable-vgacon.patch
Type: text/x-diff
Size: 1452 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100630/06631be0/attachment.bin>

[PATCH 2/6] omap: Use 32KiHZ timer by default

[Tony Lindgren]

Use 32KiHZ timer by default as this is available on all omaps
except 15xx based systems.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/plat-omap/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 78b49a6..3e2e7a8 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -120,7 +120,7 @@ config OMAP_IOMMU_DEBUG
 
 choice
 	prompt "System timer"
-	default OMAP_MPU_TIMER
+	default OMAP_32K_TIMER if !ARCH_OMAP15XX
 
 config OMAP_MPU_TIMER
 	bool "Use mpu timer"

[PATCH 3/6] omap: Make omap specific features appear under Kconfig menu

[Tony Lindgren]

This will make Kconfig look nicer for selecting omap processor type

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/Kconfig |    7 +++++++
 arch/arm/mach-omap2/Kconfig |    7 +++++++
 arch/arm/plat-omap/Kconfig  |    2 +-
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index b18d7c2..c911cdb 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -1,3 +1,7 @@
+if ARCH_OMAP1
+
+menu "TI OMAP1 specific features"
+
 comment "OMAP Core Type"
 	depends on ARCH_OMAP1
 
@@ -237,3 +241,6 @@ config OMAP_ARM_30MHZ
 	help
           Enable 30MHz clock for OMAP CPU. If unsure, say N.
 
+endmenu
+
+endif
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f67f037..e94ee6b 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,3 +1,7 @@
+if ARCH_OMAP2PLUS
+
+menu "TI OMAP2/3/4 Specific Features"
+
 comment "OMAP Core Type"
 	depends on ARCH_OMAP2
 
@@ -186,3 +190,6 @@ config OMAP3_SDRC_AC_TIMING
 	  wish to say no.  Selecting yes without understanding what is
 	  going on could result in system crashes;
 
+endmenu
+
+endif
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 3e2e7a8..a4e8727 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -1,6 +1,6 @@
 if ARCH_OMAP
 
-menu "TI OMAP Implementations"
+menu "TI OMAP Common Features"
 
 config ARCH_OMAP_OTG
 	bool

[PATCH 4/6] omap2/3/4: Move Kconfig options to mach-omap2/Kconfig

[Tony Lindgren]

Move omap2/3/4 specific Kconfig options to mach-omap2/Kconfig

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/Kconfig |   18 ++++++++++++++++++
 arch/arm/plat-omap/Kconfig  |   18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e94ee6b..d306aa1 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -2,6 +2,24 @@ if ARCH_OMAP2PLUS
 
 menu "TI OMAP2/3/4 Specific Features"
 
+config ARCH_OMAP2
+	bool "TI OMAP2"
+	depends on ARCH_OMAP2PLUS
+	select CPU_V6
+
+config ARCH_OMAP3
+	bool "TI OMAP3"
+	depends on ARCH_OMAP2PLUS
+	select CPU_V7
+	select USB_ARCH_HAS_EHCI
+	select ARM_L1_CACHE_SHIFT_6
+
+config ARCH_OMAP4
+	bool "TI OMAP4"
+	depends on ARCH_OMAP2PLUS
+	select CPU_V7
+	select ARM_GIC
+
 comment "OMAP Core Type"
 	depends on ARCH_OMAP2
 
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index a4e8727..b7a3d80 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -21,24 +21,6 @@ config ARCH_OMAP2PLUS
 	help
 	  "Systems based on omap24xx, omap34xx or omap44xx"
 
-config ARCH_OMAP2
-	bool "TI OMAP2"
-	depends on ARCH_OMAP2PLUS
-	select CPU_V6
-
-config ARCH_OMAP3
-	bool "TI OMAP3"
-	depends on ARCH_OMAP2PLUS
-	select CPU_V7
-	select USB_ARCH_HAS_EHCI
-	select ARM_L1_CACHE_SHIFT_6
-
-config ARCH_OMAP4
-	bool "TI OMAP4"
-	depends on ARCH_OMAP2PLUS
-	select CPU_V7
-	select ARM_GIC
-
 endchoice
 
 comment "OMAP Feature Selections"

[PATCH 5/6] omap2/3/4: Select all omaps and boards by default

[Tony Lindgren]

Select all omaps and boards by default

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/Kconfig |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index d306aa1..4802988 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -5,17 +5,20 @@ menu "TI OMAP2/3/4 Specific Features"
 config ARCH_OMAP2
 	bool "TI OMAP2"
 	depends on ARCH_OMAP2PLUS
+	default y
 	select CPU_V6
 
 config ARCH_OMAP3
 	bool "TI OMAP3"
 	depends on ARCH_OMAP2PLUS
+	default y
 	select CPU_V7
 	select USB_ARCH_HAS_EHCI
 	select ARM_L1_CACHE_SHIFT_6
 
 config ARCH_OMAP4
 	bool "TI OMAP4"
+	default y
 	depends on ARCH_OMAP2PLUS
 	select CPU_V7
 	select ARM_GIC
@@ -26,17 +29,20 @@ comment "OMAP Core Type"
 config ARCH_OMAP2420
 	bool "OMAP2420 support"
 	depends on ARCH_OMAP2
+	default y
 	select OMAP_DM_TIMER
 	select ARCH_OMAP_OTG
 
 config ARCH_OMAP2430
 	bool "OMAP2430 support"
 	depends on ARCH_OMAP2
+	default y
 	select ARCH_OMAP_OTG
 
 config ARCH_OMAP3430
 	bool "OMAP3430 support"
 	depends on ARCH_OMAP3
+	default y
 	select ARCH_OMAP_OTG
 
 config OMAP_PACKAGE_ZAF
@@ -63,6 +69,7 @@ comment "OMAP Board Type"
 config MACH_OMAP_GENERIC
 	bool "Generic OMAP board"
 	depends on ARCH_OMAP2
+	default y
 
 config MACH_OMAP2_TUSB6010
 	bool
@@ -72,63 +79,75 @@ config MACH_OMAP2_TUSB6010
 config MACH_OMAP_H4
 	bool "OMAP 2420 H4 board"
 	depends on ARCH_OMAP2
+	default y
 	select OMAP_PACKAGE_ZAF
 	select OMAP_DEBUG_DEVICES
 
 config MACH_OMAP_APOLLON
 	bool "OMAP 2420 Apollon board"
 	depends on ARCH_OMAP2
+	default y
 	select OMAP_PACKAGE_ZAC
 
 config MACH_OMAP_2430SDP
 	bool "OMAP 2430 SDP board"
 	depends on ARCH_OMAP2
+	default y
 	select OMAP_PACKAGE_ZAC
 
 config MACH_OMAP3_BEAGLE
 	bool "OMAP3 BEAGLE board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_DEVKIT8000
 	bool "DEVKIT8000 board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CUS
 	select OMAP_MUX
 
 config MACH_OMAP_LDP
 	bool "OMAP3 LDP board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OVERO
 	bool "Gumstix Overo board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3EVM
 	bool "OMAP 3530 EVM board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3517EVM
 	bool "OMAP3517/ AM3517 EVM board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3_PANDORA
 	bool "OMAP3 Pandora"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3_TOUCHBOOK
 	bool "OMAP3 Touch Book"
 	depends on ARCH_OMAP3
+	default y
 	select BACKLIGHT_CLASS_DEVICE
 
 config MACH_OMAP_3430SDP
 	bool "OMAP 3430 SDP board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_NOKIA_N800
@@ -143,6 +162,7 @@ config MACH_NOKIA_N810_WIMAX
 config MACH_NOKIA_N8X0
 	bool "Nokia N800/N810"
 	depends on ARCH_OMAP2420
+	default y
 	select OMAP_PACKAGE_ZAC
 	select MACH_NOKIA_N800
 	select MACH_NOKIA_N810
@@ -151,42 +171,50 @@ config MACH_NOKIA_N8X0
 config MACH_NOKIA_RX51
 	bool "Nokia RX-51 board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_ZOOM2
 	bool "OMAP3 Zoom2 board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_ZOOM3
 	bool "OMAP3630 Zoom3 board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBP
 
 config MACH_CM_T35
 	bool "CompuLab CM-T35 module"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CUS
 	select OMAP_MUX
 
 config MACH_IGEP0020
 	bool "IGEP v2 board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBB
 
 config MACH_SBC3530
 	bool "OMAP3 SBC STALKER board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CUS
 	select OMAP_MUX
 
 config MACH_OMAP_3630SDP
 	bool "OMAP3630 SDP board"
 	depends on ARCH_OMAP3
+	default y
 	select OMAP_PACKAGE_CBP
 
 config MACH_OMAP_4430SDP
 	bool "OMAP 4430 SDP board"
+	default y
 	depends on ARCH_OMAP4
 
 config OMAP3_EMU

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Tony Lindgren]

This produces a sane config that's suitable for using as the
base for most omap2/3/4 boards.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/Kconfig |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 4802988..84fecd0 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -2,6 +2,27 @@ if ARCH_OMAP2PLUS
 
 menu "TI OMAP2/3/4 Specific Features"
 
+config ARCH_OMAP2PLUS_TYPICAL
+	bool "Typical OMAP configuration"
+	default y
+	select AEABI
+	select REGULATOR
+	select PM
+	select PM_RUNTIME
+	select VFP
+	select NEON if ARCH_OMAP3 || ARCH_OMAP4
+	select SERIAL_8250
+	select SERIAL_CORE_CONSOLE
+	select SERIAL_8250_CONSOLE
+	select I2C
+	select I2C_OMAP
+	select MFD
+	select MENELAUS if ARCH_OMAP2
+	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
+	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
+	help
+	  Compile a kernel suitable for booting most boards
+
 config ARCH_OMAP2
 	bool "TI OMAP2"
 	depends on ARCH_OMAP2PLUS

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Shilimkar, Santosh]

Tony,
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Tony Lindgren
> Sent: Tuesday, June 29, 2010 5:18 PM
> To: linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> Subject: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical
> omap features
> 
> This produces a sane config that's suitable for using as the
> base for most omap2/3/4 boards.
> 
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>  arch/arm/mach-omap2/Kconfig |   21 +++++++++++++++++++++
>  1 files changed, 21 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 4802988..84fecd0 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -2,6 +2,27 @@ if ARCH_OMAP2PLUS
> 
>  menu "TI OMAP2/3/4 Specific Features"
> 
> +config ARCH_OMAP2PLUS_TYPICAL
> +	bool "Typical OMAP configuration"
> +	default y
> +	select AEABI
> +	select REGULATOR
> +	select PM
> +	select PM_RUNTIME
> +	select VFP
> +	select NEON if ARCH_OMAP3 || ARCH_OMAP4
> +	select SERIAL_8250
> +	select SERIAL_CORE_CONSOLE
> +	select SERIAL_8250_CONSOLE
> +	select I2C
> +	select I2C_OMAP
> +	select MFD
> +	select MENELAUS if ARCH_OMAP2
> +	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
> +	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
> +	help
> +	  Compile a kernel suitable for booting most boards
> +
>  config ARCH_OMAP2
>  	bool "TI OMAP2"
>  	depends on ARCH_OMAP2PLUS
> 
With your series OMAP4 build breaks because of PM and SMP dependencies.
To ensure that build doesn't break on OMAP4, I needed below change. With
This change I tried your series and it boots OK on OMAP4430 SDP

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 84fecd0..f48f275 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -7,8 +7,8 @@ config ARCH_OMAP2PLUS_TYPICAL
        default y
        select AEABI
        select REGULATOR
-       select PM
-       select PM_RUNTIME
+       select PM if !ARCH_OMAP4
+       select PM_RUNTIME if !ARCH_OMAP4
        select VFP
        select NEON if ARCH_OMAP3 || ARCH_OMAP4
        select SERIAL_8250

Regards
Santosh

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Shilimkar, Santosh]

> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> owner at vger.kernel.org] On Behalf Of Shilimkar, Santosh
> Sent: Tuesday, June 29, 2010 7:23 PM
> To: Tony Lindgren; linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> Subject: RE: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in
> typical omap features
> 
> Tony,
> > -----Original Message-----
> > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> > owner at vger.kernel.org] On Behalf Of Tony Lindgren
> > Sent: Tuesday, June 29, 2010 5:18 PM
> > To: linux-arm-kernel at lists.infradead.org
> > Cc: linux-omap at vger.kernel.org
> > Subject: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical
> > omap features
> >
> > This produces a sane config that's suitable for using as the
> > base for most omap2/3/4 boards.
> >
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> >  arch/arm/mach-omap2/Kconfig |   21 +++++++++++++++++++++
> >  1 files changed, 21 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index 4802988..84fecd0 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -2,6 +2,27 @@ if ARCH_OMAP2PLUS
> >
> >  menu "TI OMAP2/3/4 Specific Features"
> >
> > +config ARCH_OMAP2PLUS_TYPICAL
> > +	bool "Typical OMAP configuration"
> > +	default y
> > +	select AEABI
> > +	select REGULATOR
> > +	select PM
> > +	select PM_RUNTIME
> > +	select VFP
> > +	select NEON if ARCH_OMAP3 || ARCH_OMAP4
> > +	select SERIAL_8250
> > +	select SERIAL_CORE_CONSOLE
> > +	select SERIAL_8250_CONSOLE
> > +	select I2C
> > +	select I2C_OMAP
> > +	select MFD
> > +	select MENELAUS if ARCH_OMAP2
> > +	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
> > +	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
> > +	help
> > +	  Compile a kernel suitable for booting most boards
> > +
> >  config ARCH_OMAP2
> >  	bool "TI OMAP2"
> >  	depends on ARCH_OMAP2PLUS
> >
> With your series OMAP4 build breaks because of PM and SMP dependencies.
> To ensure that build doesn't break on OMAP4, I needed below change. With
> This change I tried your series and it boots OK on OMAP4430 SDP
> 
Also tested the multi-omap build on OMAP3430 SDP and OMAP4430 SDP. Both boots OK.

> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 84fecd0..f48f275 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -7,8 +7,8 @@ config ARCH_OMAP2PLUS_TYPICAL
>         default y
>         select AEABI
>         select REGULATOR
> -       select PM
> -       select PM_RUNTIME
> +       select PM if !ARCH_OMAP4
> +       select PM_RUNTIME if !ARCH_OMAP4
>         select VFP
>         select NEON if ARCH_OMAP3 || ARCH_OMAP4
>         select SERIAL_8250
> 
> Regards
> Santosh
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Tony Lindgren]

* Shilimkar, Santosh <santosh.shilimkar@ti.com> [100629 17:40]:
> > >
> > With your series OMAP4 build breaks because of PM and SMP dependencies.
> > To ensure that build doesn't break on OMAP4, I needed below change. With
> > This change I tried your series and it boots OK on OMAP4430 SDP

Hmm the build does not break for me?
 
> Also tested the multi-omap build on OMAP3430 SDP and OMAP4430 SDP. Both boots OK.
> 
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index 84fecd0..f48f275 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -7,8 +7,8 @@ config ARCH_OMAP2PLUS_TYPICAL
> >         default y
> >         select AEABI
> >         select REGULATOR
> > -       select PM
> > -       select PM_RUNTIME
> > +       select PM if !ARCH_OMAP4
> > +       select PM_RUNTIME if !ARCH_OMAP4
> >         select VFP
> >         select NEON if ARCH_OMAP3 || ARCH_OMAP4
> >         select SERIAL_8250

Let's rather fix whatever the issue is for booting (or building?)
omap4 with CONFIG_PM and CONFIG_PM_RUNTIME. If we can't implement
PM yet for omap4, we can just return early if cpu_is_omap44xx.

CONFIG_SMP we can't enable as that requires various ARM changes
to work on unicore systems. But hopefully we can enable that too
at some point with select SMP if ARCH_OMAP4.

Regards,

Tony

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Shilimkar, Santosh]

> -----Original Message-----
> From: Tony Lindgren [mailto:tony at atomide.com]
> Sent: Wednesday, June 30, 2010 11:47 AM
> To: Shilimkar, Santosh
> Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
> Subject: Re: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in
> typical omap features
> 
> * Shilimkar, Santosh <santosh.shilimkar@ti.com> [100629 17:40]:
> > > >
> > > With your series OMAP4 build breaks because of PM and SMP
> dependencies.
> > > To ensure that build doesn't break on OMAP4, I needed below change.
> With
> > > This change I tried your series and it boots OK on OMAP4430 SDP
> 
> Hmm the build does not break for me?
>
Looks like I am missing something here. How do you build OMAP4 alone with
these new changes ??
 
> > Also tested the multi-omap build on OMAP3430 SDP and OMAP4430 SDP. Both
> boots OK.
> >
> > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > > index 84fecd0..f48f275 100644
> > > --- a/arch/arm/mach-omap2/Kconfig
> > > +++ b/arch/arm/mach-omap2/Kconfig
> > > @@ -7,8 +7,8 @@ config ARCH_OMAP2PLUS_TYPICAL
> > >         default y
> > >         select AEABI
> > >         select REGULATOR
> > > -       select PM
> > > -       select PM_RUNTIME
> > > +       select PM if !ARCH_OMAP4
> > > +       select PM_RUNTIME if !ARCH_OMAP4
> > >         select VFP
> > >         select NEON if ARCH_OMAP3 || ARCH_OMAP4
> > >         select SERIAL_8250
> 
> Let's rather fix whatever the issue is for booting (or building?)
> omap4 with CONFIG_PM and CONFIG_PM_RUNTIME. If we can't implement
> PM yet for omap4, we can just return early if cpu_is_omap44xx.
> 
> CONFIG_SMP we can't enable as that requires various ARM changes
> to work on unicore systems. But hopefully we can enable that too
> at some point with select SMP if ARCH_OMAP4.
> 

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Tony Lindgren]

* Shilimkar, Santosh <santosh.shilimkar@ti.com> [100630 09:41]:
> > -----Original Message-----
> > From: Tony Lindgren [mailto:tony at atomide.com]
> > Sent: Wednesday, June 30, 2010 11:47 AM
> > To: Shilimkar, Santosh
> > Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
> > Subject: Re: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in
> > typical omap features
> > 
> > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [100629 17:40]:
> > > > >
> > > > With your series OMAP4 build breaks because of PM and SMP
> > dependencies.
> > > > To ensure that build doesn't break on OMAP4, I needed below change.
> > With
> > > > This change I tried your series and it boots OK on OMAP4430 SDP
> > 
> > Hmm the build does not break for me?
> >
> Looks like I am missing something here. How do you build OMAP4 alone with
> these new changes ??

Use your old config file, or just unselect CONFIG_ARCH_OMAP2
and CONFIG_ARCH_OMAP3. Note that if you now do:

$ yes "" | ARCH=arm make oldconfig

with your old omap4 only config file, then by default the
typical features get added by default. So what you probably
want to do is (untested):

$ echo "# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set" >> .config
$ yes "" | ARCH=arm make oldconfig

Then it should not change your old config file.

To see how the boards and features show up, you can also play
with it with make xconfig:

System Type -> TI OMAP2/3/4 Specific Features

Uncheck TI OMAP2 and TI OMAP3 so only TI OMAP4 is selected.

Regards,

Tony

[PATCH 6/6] omap2/3/4: Add Kconfig option to compile in typical omap features

[Shilimkar, Santosh]

> -----Original Message-----
> From: Tony Lindgren [mailto:tony at atomide.com]
> Sent: Wednesday, June 30, 2010 12:55 PM
> To: Shilimkar, Santosh
> Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
> Subject: Re: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in
> typical omap features
> 
> * Shilimkar, Santosh <santosh.shilimkar@ti.com> [100630 09:41]:
> > > -----Original Message-----
> > > From: Tony Lindgren [mailto:tony at atomide.com]
> > > Sent: Wednesday, June 30, 2010 11:47 AM
> > > To: Shilimkar, Santosh
> > > Cc: linux-arm-kernel at lists.infradead.org; linux-omap at vger.kernel.org
> > > Subject: Re: [PATCH 6/6] omap2/3/4: Add Kconfig option to compile in
> > > typical omap features
> > >
> > > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [100629 17:40]:
> > > > > >
> > > > > With your series OMAP4 build breaks because of PM and SMP
> > > dependencies.
> > > > > To ensure that build doesn't break on OMAP4, I needed below
> change.
> > > With
> > > > > This change I tried your series and it boots OK on OMAP4430 SDP
> > >
> > > Hmm the build does not break for me?
> > >
> > Looks like I am missing something here. How do you build OMAP4 alone
> with
> > these new changes ??
> 
> Use your old config file, or just unselect CONFIG_ARCH_OMAP2
> and CONFIG_ARCH_OMAP3. Note that if you now do:
> 
> $ yes "" | ARCH=arm make oldconfig
> 
> with your old omap4 only config file, then by default the
> typical features get added by default. So what you probably
> want to do is (untested):
> 
> $ echo "# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set" >> .config
> $ yes "" | ARCH=arm make oldconfig
> 
> Then it should not change your old config file.
> 
The above method works Tony. The series boot tested with 4430 SDP

Regards,
Santosh