[PATCH 2/2] viocons: make powerpc allmodconfig build

[PATCH 2/2] viocons: make powerpc allmodconfig build

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Make allmodconfig .config build successfully by making VIOCONS
available only if VT=n.
Using PPC_ISERIES in VT prevents kconfig "recursive" warning.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 arch/powerpc/platforms/iseries/Kconfig |    2 +-
 drivers/char/Kconfig                   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-2619-rc2-ppc.orig/drivers/char/Kconfig
+++ linux-2619-rc2-ppc/drivers/char/Kconfig
@@ -7,7 +7,7 @@ menu "Character devices"
 config VT
 	bool "Virtual terminal" if EMBEDDED
 	select INPUT
-	default y if !VIOCONS
+	default y if !PPC_ISERIES
 	---help---
 	  If you say Y here, you will get support for terminal devices with
 	  display and keyboard devices. These are called "virtual" because you
--- linux-2619-rc2-ppc.orig/arch/powerpc/platforms/iseries/Kconfig
+++ linux-2619-rc2-ppc/arch/powerpc/platforms/iseries/Kconfig
@@ -3,7 +3,7 @@ menu "iSeries device drivers"
 	depends on PPC_ISERIES
 
 config VIOCONS
-	tristate "iSeries Virtual Console Support (Obsolete)"
+	tristate "iSeries Virtual Console Support (Obsolete)" if !VT
 	help
 	  This is the old virtual console driver for legacy iSeries.
 	  You should use the iSeries Hypervisor Virtual Console


---

Re: [PATCH 2/2] viocons: make powerpc allmodconfig build

[Stephen Rothwell]

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

On Tue, 17 Oct 2006 09:50:03 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Make allmodconfig .config build successfully by making VIOCONS
> available only if VT=n.
> Using PPC_ISERIES in VT prevents kconfig "recursive" warning.

The problem with this is that we are moving toward being able to build a
single kernel with PPC_PSERIES and PPC_ISERIES (and others) all defined,
and this patch will stop Virtual terminal being built in that case.

--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2/2] viocons: make powerpc allmodconfig build

[Randy.Dunlap]

Stephen Rothwell wrote:
> On Tue, 17 Oct 2006 09:50:03 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> Make allmodconfig .config build successfully by making VIOCONS
>> available only if VT=n.
>> Using PPC_ISERIES in VT prevents kconfig "recursive" warning.
> 
> The problem with this is that we are moving toward being able to build a
> single kernel with PPC_PSERIES and PPC_ISERIES (and others) all defined,
> and this patch will stop Virtual terminal being built in that case.

OK.  Makes sense.  Will you just build VT in that combo *series
config and not build VIOCONS?  If so, that would still fix
"make allmodconfig" to build cleanly (I think).

-- 
~Randy

Re: [PATCH 2/2] viocons: make powerpc allmodconfig build

[Stephen Rothwell]

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

On Tue, 17 Oct 2006 18:24:31 -0700 "Randy.Dunlap" <randy.dunlap@oracle.com> wrote:
>
> OK.  Makes sense.  Will you just build VT in that combo *series
> config and not build VIOCONS?  If so, that would still fix
> "make allmodconfig" to build cleanly (I think).

Yes, VIOCONS is now obsolete (it is replaced by HVC_ISERIES which doesn't
clash with VT), but it is used by the distros so I don't want to remove
it (yet).

--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2/2] viocons: make powerpc allmodconfig build

[Randy.Dunlap]

Stephen Rothwell wrote:
> On Tue, 17 Oct 2006 18:24:31 -0700 "Randy.Dunlap" <randy.dunlap@oracle.com> wrote:
>> OK.  Makes sense.  Will you just build VT in that combo *series
>> config and not build VIOCONS?  If so, that would still fix
>> "make allmodconfig" to build cleanly (I think).
> 
> Yes, VIOCONS is now obsolete (it is replaced by HVC_ISERIES which doesn't
> clash with VT), but it is used by the distros so I don't want to remove
> it (yet).

OK, I wasn't suggesting removing it, just tweaking the dependencies etc.
Is that doable now or do we wait for the integrated I/P series configs?

-- 
~Randy