From patchwork Fri Jun 18 20:18:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 56222 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 4BE3A1007D7 for ; Sat, 19 Jun 2010 06:18:54 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OPi1Y-0005Be-4o; Fri, 18 Jun 2010 21:18:48 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OPi1W-0005BY-BK for kernel-team@lists.ubuntu.com; Fri, 18 Jun 2010 21:18:46 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OPi1W-0006Bz-9z for ; Fri, 18 Jun 2010 21:18:46 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OPi1V-0004EX-T5 for kernel-team@lists.ubuntu.com; Fri, 18 Jun 2010 21:18:46 +0100 Subject: [PATCH] [Maverick] UBUNTU: [Config] Enable CONFIG_FB_VESA=y for x86 From: Leann Ogasawara To: kernel-team Date: Fri, 18 Jun 2010 13:18:42 -0700 Message-ID: <1276892322.13559.55.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 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 --- 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