[oe-commits] Andrea Adami : linux-kexecboot: add bootlogo for collie and poodle

[GIT User account]

Module: openembedded.git
Branch: ieee80215
Commit: fc0b46cf92ab34f93ca7937a5da68672f92fcce8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fc0b46cf92ab34f93ca7937a5da68672f92fcce8

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Thu Jan 29 01:16:21 2009 +0100

linux-kexecboot: add bootlogo for collie and poodle

- both linux-kexecboot 2.6.24 and 2.6.26
- bump both PR

---

 .../linux-kexecboot-2.6.24/poodle/defconfig        |    5 ++++-
 .../linux-kexecboot-2.6.26/collie/defconfig        |    5 ++++-
 .../linux-kexecboot-2.6.26/poodle/defconfig        |    3 +--
 packages/kexecboot/linux-kexecboot_2.6.24.bb       |    2 +-
 packages/kexecboot/linux-kexecboot_2.6.26.bb       |    2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/kexecboot/linux-kexecboot-2.6.24/poodle/defconfig b/packages/kexecboot/linux-kexecboot-2.6.24/poodle/defconfig
index e962baa..2bbd230 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.24/poodle/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.24/poodle/defconfig
@@ -687,7 +687,10 @@ CONFIG_FONT_MINI_4x6=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
 
 #
 # Sound
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig
index 2e7c813..128fe03 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig
@@ -624,7 +624,10 @@ CONFIG_FONT_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
 
 #
 # Sound
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/poodle/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/poodle/defconfig
index 195f3f4..a0696d8 100644
--- a/packages/kexecboot/linux-kexecboot-2.6.26/poodle/defconfig
+++ b/packages/kexecboot/linux-kexecboot-2.6.26/poodle/defconfig
@@ -1103,8 +1103,7 @@ CONFIG_FONT_MINI_4x6=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-CONFIG_LOGO_OHAND_CLUT224=y
+CONFIG_LOGO_LINUX_CLUT224=y
 
 #
 # Sound
diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb
index a0540fe..43913e8 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.24.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.24.bb
@@ -1,6 +1,6 @@
 require linux-kexecboot.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "-1"
diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb
index 624a01e..e1dd9d4 100644
--- a/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-kexecboot.inc
 
-PR = "r8"
+PR = "r9"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"