diff mbox

[Maverick] UBUNTU: [Config] Enable CONFIG_FB_VESA=y for x86

Message ID 1276902995.13559.104.camel@emiko
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Leann Ogasawara June 18, 2010, 11:16 p.m. UTC 
On Fri, 2010-06-18 at 14:42 -0600, Tim Gardner wrote:
> On 06/18/2010 02:18 PM, Leann Ogasawara wrote:
> > Hi All,
> >
> > The following patch will allow us to close out a work item assigned to
> > us in the foundations-m-grub2-boot-framebuffer spec [1].  Details in the
> > commit message.
> >
> > Thanks,
> > Leann
> >
> > https://blueprints.edge.launchpad.net/ubuntu/+spec/foundations-m-grub2-boot-framebuffer
> >
> >> From e66b897db6780cfd76637bd7ac664f43e912657f Mon Sep 17 00:00:00 2001
> > From: Leann Ogasawara<leann.ogasawara@canonical.com>
> > Date: Fri, 18 Jun 2010 10:49:48 -0700
> > Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_FB_VESA=y for x86
> >
> > Per a request from the Foundations Team, we already enabled
> > CONFIG_FRAMEBUFFER_CONSOLE=y by default across all archs to ensure we
> > reliably have a framebuffer console from the start. A secondary item
> > to this request is to also build in vesafb by default for x86.  This
> > will allow the Foundations Team to fix GRUB to program vesafb rather
> > than efifb in the boot parameters structure on x86 and also allow them
> > to change GRUB packaging to use vesafb by default.
> >
> > Signed-off-by: Leann Ogasawara<leann.ogasawara@canonical.com>
> > ---
> >   debian.master/config/amd64/config.common.amd64 |    1 +
> >   debian.master/config/armel/config.common.armel |    1 +
> >   debian.master/config/config.common.ubuntu      |    1 -
> >   debian.master/config/i386/config.common.i386   |    1 +
> >   4 files changed, 3 insertions(+), 1 deletions(-)
> >
> > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> > index d730a53..fd43848 100644
> > --- a/debian.master/config/amd64/config.common.amd64
> > +++ b/debian.master/config/amd64/config.common.amd64
> > @@ -43,6 +43,7 @@ CONFIG_FB_SAVAGE=m
> >   CONFIG_FB_SVGALIB=m
> >   CONFIG_FB_TILEBLITTING=y
> >   CONFIG_FB_UVESA=m
> > +CONFIG_FB_VESA=y
> >   CONFIG_FIRMWARE_EDID=y
> >   # CONFIG_FLATMEM_MANUAL is not set
> >   # CONFIG_FONTS is not set
> > diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> > index ffb27bd..ba002ce 100644
> > --- a/debian.master/config/armel/config.common.armel
> > +++ b/debian.master/config/armel/config.common.armel
> > @@ -17,6 +17,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
> >   CONFIG_EZX_PCAP=y
> >   # CONFIG_FB_BOOT_VESA_SUPPORT is not set
> >   # CONFIG_FB_SAVAGE is not set
> > +CONFIG_FB_VESA=m
> >   CONFIG_FLATMEM_MANUAL=y
> >   CONFIG_FONTS=y
> >   # CONFIG_FSAM7400 is not set
> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> > index 59dd011..8bea5e9 100644
> > --- a/debian.master/config/config.common.ubuntu
> > +++ b/debian.master/config/config.common.ubuntu
> > @@ -1385,7 +1385,6 @@ CONFIG_FB_TMIO=m
> >   CONFIG_FB_TMIO_ACCELL=y
> >   CONFIG_FB_TRIDENT=m
> >   CONFIG_FB_UDL=m
> > -CONFIG_FB_VESA=m
> >   CONFIG_FB_VGA16=m
> >   CONFIG_FB_VIA=m
> >   # CONFIG_FB_VIA_DIRECT_PROCFS is not set
> > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> > index be7a110..d883dd0 100644
> > --- a/debian.master/config/i386/config.common.i386
> > +++ b/debian.master/config/i386/config.common.i386
> > @@ -44,6 +44,7 @@ CONFIG_FB_SAVAGE=m
> >   CONFIG_FB_SVGALIB=m
> >   CONFIG_FB_TILEBLITTING=y
> >   CONFIG_FB_UVESA=m
> > +CONFIG_FB_VESA=y
> >   CONFIG_FIRMWARE_EDID=y
> >   CONFIG_FLATMEM_MANUAL=y
> >   # CONFIG_FONTS is not set
> 
> Since they are now requirements, shouldn't we add CONFIG_FB_VESA=y and 
> CONFIG_FRAMEBUFFER_CONSOLE=y to debian/config/enforce ?
> 
Indeed, patches as follows:

>From 9e5b83c600c607ed76e42b9856ae5f5f27c87bb3 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 18 Jun 2010 14:21:23 -0700
Subject: [PATCH 1/2] UBUNTU: [Config] Add CONFIG_FRAMEBUFFER_CONSOLE=y to config enforcer

Per a request from the Foundations Team, we already enabled
CONFIG_FRAMEBUFFER_CONSOLE=y by default across all archs to ensure we
reliably have a framebuffer console from the start.  Add this config
check to the enforcer.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian.master/config/enforce |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Comments

Leann Ogasawara June 21, 2010, 8:41 p.m. UTC | #1 
Applied to Maverick linux master.

Thanks,
Leann

On Fri, 2010-06-18 at 16:16 -0700, Leann Ogasawara wrote:
> On Fri, 2010-06-18 at 14:42 -0600, Tim Gardner wrote:
> > On 06/18/2010 02:18 PM, Leann Ogasawara wrote:
> > > Hi All,
> > >
> > > The following patch will allow us to close out a work item assigned to
> > > us in the foundations-m-grub2-boot-framebuffer spec [1].  Details in the
> > > commit message.
> > >
> > > Thanks,
> > > Leann
> > >
> > > https://blueprints.edge.launchpad.net/ubuntu/+spec/foundations-m-grub2-boot-framebuffer
> > >
> > >> From e66b897db6780cfd76637bd7ac664f43e912657f Mon Sep 17 00:00:00 2001
> > > From: Leann Ogasawara<leann.ogasawara@canonical.com>
> > > Date: Fri, 18 Jun 2010 10:49:48 -0700
> > > Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_FB_VESA=y for x86
> > >
> > > Per a request from the Foundations Team, we already enabled
> > > CONFIG_FRAMEBUFFER_CONSOLE=y by default across all archs to ensure we
> > > reliably have a framebuffer console from the start. A secondary item
> > > to this request is to also build in vesafb by default for x86.  This
> > > will allow the Foundations Team to fix GRUB to program vesafb rather
> > > than efifb in the boot parameters structure on x86 and also allow them
> > > to change GRUB packaging to use vesafb by default.
> > >
> > > Signed-off-by: Leann Ogasawara<leann.ogasawara@canonical.com>
> > > ---
> > >   debian.master/config/amd64/config.common.amd64 |    1 +
> > >   debian.master/config/armel/config.common.armel |    1 +
> > >   debian.master/config/config.common.ubuntu      |    1 -
> > >   debian.master/config/i386/config.common.i386   |    1 +
> > >   4 files changed, 3 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> > > index d730a53..fd43848 100644
> > > --- a/debian.master/config/amd64/config.common.amd64
> > > +++ b/debian.master/config/amd64/config.common.amd64
> > > @@ -43,6 +43,7 @@ CONFIG_FB_SAVAGE=m
> > >   CONFIG_FB_SVGALIB=m
> > >   CONFIG_FB_TILEBLITTING=y
> > >   CONFIG_FB_UVESA=m
> > > +CONFIG_FB_VESA=y
> > >   CONFIG_FIRMWARE_EDID=y
> > >   # CONFIG_FLATMEM_MANUAL is not set
> > >   # CONFIG_FONTS is not set
> > > diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> > > index ffb27bd..ba002ce 100644
> > > --- a/debian.master/config/armel/config.common.armel
> > > +++ b/debian.master/config/armel/config.common.armel
> > > @@ -17,6 +17,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
> > >   CONFIG_EZX_PCAP=y
> > >   # CONFIG_FB_BOOT_VESA_SUPPORT is not set
> > >   # CONFIG_FB_SAVAGE is not set
> > > +CONFIG_FB_VESA=m
> > >   CONFIG_FLATMEM_MANUAL=y
> > >   CONFIG_FONTS=y
> > >   # CONFIG_FSAM7400 is not set
> > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> > > index 59dd011..8bea5e9 100644
> > > --- a/debian.master/config/config.common.ubuntu
> > > +++ b/debian.master/config/config.common.ubuntu
> > > @@ -1385,7 +1385,6 @@ CONFIG_FB_TMIO=m
> > >   CONFIG_FB_TMIO_ACCELL=y
> > >   CONFIG_FB_TRIDENT=m
> > >   CONFIG_FB_UDL=m
> > > -CONFIG_FB_VESA=m
> > >   CONFIG_FB_VGA16=m
> > >   CONFIG_FB_VIA=m
> > >   # CONFIG_FB_VIA_DIRECT_PROCFS is not set
> > > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> > > index be7a110..d883dd0 100644
> > > --- a/debian.master/config/i386/config.common.i386
> > > +++ b/debian.master/config/i386/config.common.i386
> > > @@ -44,6 +44,7 @@ CONFIG_FB_SAVAGE=m
> > >   CONFIG_FB_SVGALIB=m
> > >   CONFIG_FB_TILEBLITTING=y
> > >   CONFIG_FB_UVESA=m
> > > +CONFIG_FB_VESA=y
> > >   CONFIG_FIRMWARE_EDID=y
> > >   CONFIG_FLATMEM_MANUAL=y
> > >   # CONFIG_FONTS is not set
> > 
> > Since they are now requirements, shouldn't we add CONFIG_FB_VESA=y and 
> > CONFIG_FRAMEBUFFER_CONSOLE=y to debian/config/enforce ?
> > 
> Indeed, patches as follows:
> 
> >From 9e5b83c600c607ed76e42b9856ae5f5f27c87bb3 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Fri, 18 Jun 2010 14:21:23 -0700
> Subject: [PATCH 1/2] UBUNTU: [Config] Add CONFIG_FRAMEBUFFER_CONSOLE=y to config enforcer
> 
> Per a request from the Foundations Team, we already enabled
> CONFIG_FRAMEBUFFER_CONSOLE=y by default across all archs to ensure we
> reliably have a framebuffer console from the start.  Add this config
> check to the enforcer.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  debian.master/config/enforce |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/debian.master/config/enforce b/debian.master/config/enforce
> index 64cae67..dfd069c 100644
> --- a/debian.master/config/enforce
> +++ b/debian.master/config/enforce
> @@ -45,3 +45,7 @@ value CONFIG_SYSFS_DEPRECATED_V2 n
>  
>  # automatically add local version will cause packaging failure
>  value CONFIG_LOCALVERSION_AUTO n
> +
> +# provide framebuffer console form the start
> +# UbuntuSpec:foundations-m-grub2-boot-framebuffer
> +value CONFIG_FRAMEBUFFER_CONSOLE y
> -- 
> 1.7.0.4
> 
> >From 13961df4a17aa51821285577d58b444ef1426d9a Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Fri, 18 Jun 2010 14:26:07 -0700
> Subject: [PATCH 2/2] UBUNTU: [Config] Add CONFIG_FB_VESA=y for x86 to config enforcer
> 
> Per a request from the Foundations Team, we enabled CONFIG_FB_VESA=y to
> allow them to fix GRUB to program vesafb rather than efifb in the boot
> parameters structure on x86 and also allow them to change GRUB packaging
> to use vesafb by default.  Add this config check to the enforcer.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  debian.master/config/enforce |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/debian.master/config/enforce b/debian.master/config/enforce
> index dfd069c..c26ec14 100644
> --- a/debian.master/config/enforce
> +++ b/debian.master/config/enforce
> @@ -49,3 +49,8 @@ value CONFIG_LOCALVERSION_AUTO n
>  # provide framebuffer console form the start
>  # UbuntuSpec:foundations-m-grub2-boot-framebuffer
>  value CONFIG_FRAMEBUFFER_CONSOLE y
> +
> +# GRUB changes will rely on built in vesafb on x86,
> +# UbuntuSpec:foundations-m-grub2-boot-framebuffer
> +(( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
> +	value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
> -- 
> 1.7.0.4
> 
> 
> 
>
diff mbox

Patch

diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 64cae67..dfd069c 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -45,3 +45,7 @@  value CONFIG_SYSFS_DEPRECATED_V2 n
 
 # automatically add local version will cause packaging failure
 value CONFIG_LOCALVERSION_AUTO n
+
+# provide framebuffer console form the start
+# UbuntuSpec:foundations-m-grub2-boot-framebuffer
+value CONFIG_FRAMEBUFFER_CONSOLE y
-- 
1.7.0.4

>From 13961df4a17aa51821285577d58b444ef1426d9a Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 18 Jun 2010 14:26:07 -0700
Subject: [PATCH 2/2] UBUNTU: [Config] Add CONFIG_FB_VESA=y for x86 to config enforcer

Per a request from the Foundations Team, we enabled CONFIG_FB_VESA=y to
allow them to fix GRUB to program vesafb rather than efifb in the boot
parameters structure on x86 and also allow them to change GRUB packaging
to use vesafb by default.  Add this config check to the enforcer.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian.master/config/enforce |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index dfd069c..c26ec14 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -49,3 +49,8 @@  value CONFIG_LOCALVERSION_AUTO n
 # provide framebuffer console form the start
 # UbuntuSpec:foundations-m-grub2-boot-framebuffer
 value CONFIG_FRAMEBUFFER_CONSOLE y
+
+# GRUB changes will rely on built in vesafb on x86,
+# UbuntuSpec:foundations-m-grub2-boot-framebuffer
+(( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
+	value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA