From 5577eeb98f5ee43192cfad069208d4d64cbc5cc3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 6 Feb 2008 17:52:09 +0000
Subject: [PATCH] linux-nokia800: Enable automatic screen updates, framebuffer
 console and make 2.6.21 the default for the nokia800

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3681 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../linux-nokia800-2.6.21-osso71/{ => nokia800}/defconfig      | 10 +++++++---
 meta/packages/linux/linux-nokia800_2.6.21-osso71.bb            |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)
 rename meta/packages/linux/linux-nokia800-2.6.21-osso71/{ => nokia800}/defconfig (99%)

diff --git a/meta/packages/linux/linux-nokia800-2.6.21-osso71/defconfig b/meta/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
similarity index 99%
rename from meta/packages/linux/linux-nokia800-2.6.21-osso71/defconfig
rename to meta/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
index 04d87a4..4455697 100644
--- a/meta/packages/linux/linux-nokia800-2.6.21-osso71/defconfig
+++ b/meta/packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-omap1
-# Tue Nov 13 10:49:14 2007
+# Wed Feb  6 17:40:31 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1066,7 +1066,7 @@ CONFIG_FB_OMAP=y
 CONFIG_FB_OMAP_LCDC_EXTERNAL=y
 # CONFIG_FB_OMAP_LCDC_HWA742 is not set
 CONFIG_FB_OMAP_LCDC_BLIZZARD=y
-CONFIG_FB_OMAP_MANUAL_UPDATE=y
+# CONFIG_FB_OMAP_MANUAL_UPDATE is not set
 CONFIG_FB_OMAP_LCD_MIPID=y
 CONFIG_FB_OMAP_BOOTLOADER_INIT=y
 CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4
@@ -1078,7 +1078,11 @@ CONFIG_FB_OMAP_PAUSING=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 
 #
 # Logo configuration
diff --git a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb b/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
index 9819720..c6b52de 100644
--- a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
@@ -1,6 +1,7 @@
 require linux-nokia800.inc
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_nokia800 = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
 	   http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \
-- 
2.7.4