diff options
Diffstat (limited to 'packages')
16 files changed, 42 insertions, 31 deletions
diff --git a/packages/kexecboot/files/angstrom/qvga/logo_linux_clut224.ppm.bz2 b/packages/kexecboot/files/angstrom/qvga/logo_linux_clut224.ppm.bz2 Binary files differnew file mode 100644 index 0000000000..08ae02aae3 --- /dev/null +++ b/packages/kexecboot/files/angstrom/qvga/logo_linux_clut224.ppm.bz2 diff --git a/packages/kexecboot/files/angstrom/vga/logo_linux_clut224.ppm.bz2 b/packages/kexecboot/files/angstrom/vga/logo_linux_clut224.ppm.bz2 Binary files differnew file mode 100644 index 0000000000..3b409b0ce1 --- /dev/null +++ b/packages/kexecboot/files/angstrom/vga/logo_linux_clut224.ppm.bz2 diff --git a/packages/kexecboot/files/qvga/logo_linux_clut224.ppm.bz2 b/packages/kexecboot/files/qvga/logo_linux_clut224.ppm.bz2 Binary files differnew file mode 100644 index 0000000000..ddc39a3c64 --- /dev/null +++ b/packages/kexecboot/files/qvga/logo_linux_clut224.ppm.bz2 diff --git a/packages/kexecboot/files/vga/logo_linux_clut224.ppm.bz2 b/packages/kexecboot/files/vga/logo_linux_clut224.ppm.bz2 Binary files differnew file mode 100644 index 0000000000..c3aeaac183 --- /dev/null +++ b/packages/kexecboot/files/vga/logo_linux_clut224.ppm.bz2 diff --git a/packages/kexecboot/linux-kexecboot-2.6.23/akita/defconfig b/packages/kexecboot/linux-kexecboot-2.6.23/akita/defconfig index ddc7ba01b1..67b8f9ca54 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.23/akita/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.23/akita/defconfig @@ -1079,8 +1079,7 @@ CONFIG_FONT_8x16=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y -# 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.23/c7x0/defconfig b/packages/kexecboot/linux-kexecboot-2.6.23/c7x0/defconfig index a541a10e7c..7afd558d31 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.23/c7x0/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.23/c7x0/defconfig @@ -657,7 +657,10 @@ CONFIG_FONT_8x16=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.23/spitz/defconfig b/packages/kexecboot/linux-kexecboot-2.6.23/spitz/defconfig index d3512f2a4b..874e8b7a5e 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.23/spitz/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.23/spitz/defconfig @@ -1078,13 +1078,9 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_LOGO_OHAND_CLUT224=y -# CONFIG_LOGO_OZ240_CLUT224 is not set -# CONFIG_LOGO_OZ480_CLUT224 is not set -# CONFIG_LOGO_OZ640_CLUT224 is not set +# 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.24/akita/defconfig b/packages/kexecboot/linux-kexecboot-2.6.24/akita/defconfig index 229dfd410b..7ea31cb7d4 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.24/akita/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.24/akita/defconfig @@ -675,16 +675,19 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set -# CONFIG_FONT_8x16 is not set +CONFIG_FONT_8x16=y # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_MINI_4x6 is not set # 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.24/c7x0/defconfig b/packages/kexecboot/linux-kexecboot-2.6.24/c7x0/defconfig index c2a60f2f8e..77a9c62e3a 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.24/c7x0/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.24/c7x0/defconfig @@ -676,16 +676,19 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set -# CONFIG_FONT_8x16 is not set +CONFIG_FONT_8x16=y # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_MINI_4x6 is not set # 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.24/spitz/defconfig b/packages/kexecboot/linux-kexecboot-2.6.24/spitz/defconfig index 91f877857b..c63b1d8738 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.24/spitz/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.24/spitz/defconfig @@ -675,16 +675,19 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set -# CONFIG_FONT_8x16 is not set +CONFIG_FONT_8x16=y # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y +# 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/akita/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig index 80daecd44e..305d935691 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.26/akita/defconfig @@ -810,8 +810,7 @@ CONFIG_FONT_8x16=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.26/c7x0/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig index 3196f89462..875c20dc18 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.26/c7x0/defconfig @@ -823,8 +823,7 @@ CONFIG_FONT_8x16=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.26/spitz/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig index 9de4245374..898319f417 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.26/spitz/defconfig @@ -811,8 +811,7 @@ CONFIG_FONT_8x16=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.inc b/packages/kexecboot/linux-kexecboot.inc index 924a83a459..1985ae4a8c 100644 --- a/packages/kexecboot/linux-kexecboot.inc +++ b/packages/kexecboot/linux-kexecboot.inc @@ -1,7 +1,10 @@ -require packages/linux/linux.inc - SRC_URI = "file://defconfig" +LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' +SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2" + +require packages/linux/linux.inc + DONT_CHECK_KERNELSIZE = "" INITRAMFS_IMAGE = "initramfs-kexecboot-image" @@ -38,6 +41,10 @@ sed -i -e /CONFIG_BLK_DEV_INITRD/d \ -e /CONFIG_DEBUG_KERNEL/d \ ${S}/.config +# Remove last tag appended by linux.inc (output messes screen) +sed -i -e /CONFIG_CMDLINE/s/quiet/loglevel=3/1 ${S}/.config +sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config + echo 'CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" CONFIG_MODULES=n' >> ${S}/.config diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb index f68c770a85..a0540fe189 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 = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "-1" @@ -53,7 +53,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ file://sharpsl-rc-r1.patch;patch=1 \ file://sharpsl-rc-r2.patch;patch=1 \ file://squashfs3.3.patch;patch=1;status=external \ - ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ +# ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://hostap-monitor-mode.patch;patch=1;status=unmergable \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \ diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb index 2fa0e6c816..624a01e628 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 = "r7" +PR = "r8" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" @@ -38,7 +38,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \ ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \ ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \ file://zaurus-i2c-init.patch;patch=1;status=upstream \ - ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ +# ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://hostap-monitor-mode.patch;patch=1;status=unmergable \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \ |