aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2009-01-29 01:16:21 +0100
committerAndrea Adami <andrea.adami@gmail.com>2009-01-29 01:22:21 +0100
commitfc0b46cf92ab34f93ca7937a5da68672f92fcce8 (patch)
treef09750c55867d4816f54352148e50aaf2d021f02
parent70ac9ba6487fc109318507a4bd36adc58faebdff (diff)
downloadopenembedded-fc0b46cf92ab34f93ca7937a5da68672f92fcce8.tar.gz
openembedded-fc0b46cf92ab34f93ca7937a5da68672f92fcce8.tar.bz2
openembedded-fc0b46cf92ab34f93ca7937a5da68672f92fcce8.zip
linux-kexecboot: add bootlogo for collie and poodle
- both linux-kexecboot 2.6.24 and 2.6.26 - bump both PR
-rw-r--r--packages/kexecboot/linux-kexecboot-2.6.24/poodle/defconfig5
-rw-r--r--packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig5
-rw-r--r--packages/kexecboot/linux-kexecboot-2.6.26/poodle/defconfig3
-rw-r--r--packages/kexecboot/linux-kexecboot_2.6.24.bb2
-rw-r--r--packages/kexecboot/linux-kexecboot_2.6.26.bb2
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 e962baa2be..2bbd230ad9 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 2e7c8130f6..128fe03c51 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 195f3f498a..a0696d854b 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 a0540fe189..43913e8038 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 624a01e628..e1dd9d4660 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"