Author: shadzik Date: Fri Sep 11 01:04:41 2009 GMT
Module: packages Tag: Titanium
---- Log message:
- up to 2.6.31
---- Files affected:
packages/kernel-desktop:
kernel-desktop-bootsplash.patch (1.3.2.1 -> 1.3.2.2)
---- Diffs:
================================================================
Index: packages/kernel-desktop/kernel-desktop-bootsplash.patch
diff -u packages/kernel-desktop/kernel-desktop-bootsplash.patch:1.3.2.1
packages/kernel-desktop/kernel-desktop-bootsplash.patch:1.3.2.2
--- packages/kernel-desktop/kernel-desktop-bootsplash.patch:1.3.2.1 Mon Mar
16 16:43:54 2009
+++ packages/kernel-desktop/kernel-desktop-bootsplash.patch Fri Sep 11
03:04:36 2009
@@ -2540,10 +2540,112 @@
if (info->fbops->fb_cursor)
err = info->fbops->fb_cursor(info, &cursor);
-diff -Nur linux-2.6.27.orig/drivers/video/console/fbcon.c
linux-2.6.27/drivers/video/console/fbcon.c
---- linux-2.6.27.orig/drivers/video/console/fbcon.c 2009-03-10
03:29:51.177256144 +0100
-+++ linux-2.6.27/drivers/video/console/fbcon.c 2009-03-10 03:32:23.508284063
+0100
-@@ -91,6 +91,10 @@
+diff -Nur linux-2.6.27.orig/drivers/video/console/fbcon.h
linux-2.6.27/drivers/video/console/fbcon.h
+--- linux-2.6.27.orig/drivers/video/console/fbcon.h 2008-10-10
00:13:53.000000000 +0200
++++ linux-2.6.27/drivers/video/console/fbcon.h 2009-03-10 03:32:23.508284063
+0100
+@@ -25,6 +25,34 @@
+ * low-level frame buffer device
+ */
+
++#ifdef CONFIG_BOOTSPLASH
++struct splash_data {
++ int splash_state; /* show splash? */
++ int splash_color; /* transparent color */
++ int splash_fg_color; /* foreground color */
++ int splash_width; /* width of image */
++ int splash_height; /* height of image */
++ int splash_text_xo; /* text area origin */
++ int splash_text_yo;
++ int splash_text_wi; /* text area size */
++ int splash_text_he;
++ int splash_showtext; /* silent/verbose mode */
++ int splash_boxcount;
++ int splash_percent;
++ int splash_overpaintok; /* is it ok to overpaint boxes */
++ int splash_palcnt;
++ char *oldscreen_base; /* pointer to top of virtual screen */
++ unsigned char *splash_boxes;
++ unsigned char *splash_jpeg; /* jpeg */
++ unsigned char *splash_palette; /* palette for 8-bit */
++
++ int splash_dosilent; /* show silent jpeg */
++ unsigned char *splash_silentjpeg;
++ unsigned char *splash_sboxes;
++ int splash_sboxcount;
++};
++#endif
++
+ struct display {
+ /* Filled in by the low-level console driver */
+ const u_char *fontdata;
+diff -Nur linux-2.6.27.orig/drivers/video/Kconfig
linux-2.6.27/drivers/video/Kconfig
+--- linux-2.6.27.orig/drivers/video/Kconfig 2008-10-10 00:13:53.000000000
+0200
++++ linux-2.6.27/drivers/video/Kconfig 2009-03-10 03:32:23.508284063 +0100
+@@ -2054,4 +2054,8 @@
+ source "drivers/video/logo/Kconfig"
+ endif
+
++if FB
++ source "drivers/video/bootsplash/Kconfig"
++endif
++
+ endmenu
+diff -Nur linux-2.6.27.orig/drivers/video/Makefile
linux-2.6.27/drivers/video/Makefile
+--- linux-2.6.27.orig/drivers/video/Makefile 2008-10-10 00:13:53.000000000
+0200
++++ linux-2.6.27/drivers/video/Makefile 2009-03-10 03:32:23.508284063
+0100
+@@ -14,6 +14,7 @@
+ obj-$(CONFIG_VT) += console/
+ obj-$(CONFIG_LOGO) += logo/
+ obj-y += backlight/ display/
++obj-$(CONFIG_BOOTSPLASH) += bootsplash/
+
+ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
+ obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o
+diff -Nur linux-2.6.27.orig/drivers/video/vesafb.c
linux-2.6.27/drivers/video/vesafb.c
+--- linux-2.6.27.orig/drivers/video/vesafb.c 2008-10-10 00:13:53.000000000
+0200
++++ linux-2.6.27/drivers/video/vesafb.c 2009-03-10 03:32:23.508284063
+0100
+@@ -174,7 +174,10 @@
+ return err;
+ }
+
+-static struct fb_ops vesafb_ops = {
++#ifndef CONFIG_BOOTSPLASH
++static
++#endif
++struct fb_ops vesafb_ops = {
+ .owner = THIS_MODULE,
+ .fb_setcolreg = vesafb_setcolreg,
+ .fb_pan_display = vesafb_pan_display,
+@@ -258,6 +261,11 @@
+ * option to simply use size_total as that
+ * wastes plenty of kernel address space. */
+ size_remap = size_vmode * 2;
++
++#ifdef CONFIG_BOOTSPLASH
++ size_remap *= 2; /* some more for the images */
++#endif
++
+ if (vram_remap)
+ size_remap = vram_remap * 1024 * 1024;
+ if (size_remap < size_vmode)
+diff -Nur linux-2.6.27.orig/include/linux/console_struct.h
linux-2.6.27/include/linux/console_struct.h
+--- linux-2.6.27.orig/include/linux/console_struct.h 2009-03-10
03:29:51.307469109 +0100
++++ linux-2.6.27/include/linux/console_struct.h 2009-03-10
03:32:23.511617015 +0100
+@@ -106,6 +106,11 @@
+ struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg
console for this display */
+ unsigned long vc_uni_pagedir;
+ unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir
variable for this console */
++
++#ifdef CONFIG_BOOTSPLASH
++ struct splash_data *vc_splash_data;
++#endif
++
+ /* additional information is in vt_kern.h */
+ };
+
+--- linux-2.6.31/drivers/video/console/fbcon.c.orig 2009-09-10
00:13:59.000000000 +0200
++++ linux-2.6.31/drivers/video/console/fbcon.c 2009-09-11 01:32:20.000000000
+0200
+@@ -81,6 +81,10 @@
#include "fbcon.h"
@@ -2554,7 +2656,7 @@
#ifdef FBCONDEBUG
# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ##
args)
#else
-@@ -104,8 +108,7 @@
+@@ -94,8 +98,7 @@
};
static struct display fb_display[MAX_NR_CONSOLES];
@@ -2564,7 +2666,7 @@
static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_lines;
-@@ -578,6 +581,10 @@
+@@ -536,6 +539,10 @@
for (i = first_fb_vc; i <= last_fb_vc; i++)
con2fb_map[i] = info_idx;
@@ -2575,11 +2677,10 @@
err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
fbcon_is_default);
-@@ -1180,6 +1187,16 @@
- new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
+@@ -1083,6 +1090,16 @@
new_cols /= vc->vc_font.width;
new_rows /= vc->vc_font.height;
-+
+
+#ifdef CONFIG_BOOTSPLASH
+ if (vc->vc_splash_data && vc->vc_splash_data->splash_state) {
+ new_cols = vc->vc_splash_data->splash_text_wi /
vc->vc_font.width;
@@ -2588,11 +2689,12 @@
+ con_remap_def_color(vc, vc->vc_splash_data->splash_color << 4 |
vc->vc_splash_data->splash_fg_color);
+ }
+#endif
-+
- vc_resize(vc, new_cols, new_rows);
-
++
++
/*
-@@ -1875,6 +1892,10 @@
+ * We must always set the mode. The mode of the previous console
+ * driver could be in the same resolution but we are using different
+@@ -1777,6 +1794,10 @@
fbcon_softback_note(vc, t, count);
if (logo_shown >= 0)
goto redraw_up;
@@ -2603,7 +2705,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
fbcon_redraw_blit(vc, info, p, t, b - t - count,
-@@ -1964,6 +1985,10 @@
+@@ -1866,6 +1887,10 @@
case SM_DOWN:
if (count > vc->vc_rows) /* Maximum realistic size */
count = vc->vc_rows;
@@ -2614,7 +2716,7 @@
if (logo_shown >= 0)
goto redraw_down;
switch (p->scrollmode) {
-@@ -2114,6 +2139,14 @@
+@@ -2016,6 +2041,14 @@
}
return;
}
@@ -2629,7 +2731,7 @@
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -2222,6 +2255,10 @@
+@@ -2124,6 +2157,10 @@
info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
@@ -2640,7 +2742,7 @@
if (softback_top) {
if (softback_lines)
fbcon_set_origin(vc);
-@@ -2349,6 +2386,12 @@
+@@ -2251,6 +2288,12 @@
{
struct fb_event event;
@@ -2653,7 +2755,7 @@
if (blank) {
unsigned short charmask = vc->vc_hi_font_mask ?
0x1ff : 0xff;
-@@ -2551,10 +2594,19 @@
+@@ -2453,10 +2496,19 @@
if (resize) {
int cols, rows;
@@ -2673,124 +2775,22 @@
vc_resize(vc, cols, rows);
if (CON_IS_VISIBLE(vc) && softback_buf)
fbcon_update_softback(vc);
-diff -Nur linux-2.6.27.orig/drivers/video/console/fbcon.h
linux-2.6.27/drivers/video/console/fbcon.h
---- linux-2.6.27.orig/drivers/video/console/fbcon.h 2008-10-10
00:13:53.000000000 +0200
-+++ linux-2.6.27/drivers/video/console/fbcon.h 2009-03-10 03:32:23.508284063
+0100
-@@ -25,6 +25,34 @@
- * low-level frame buffer device
- */
-
-+#ifdef CONFIG_BOOTSPLASH
-+struct splash_data {
-+ int splash_state; /* show splash? */
-+ int splash_color; /* transparent color */
-+ int splash_fg_color; /* foreground color */
-+ int splash_width; /* width of image */
-+ int splash_height; /* height of image */
-+ int splash_text_xo; /* text area origin */
-+ int splash_text_yo;
-+ int splash_text_wi; /* text area size */
-+ int splash_text_he;
-+ int splash_showtext; /* silent/verbose mode */
-+ int splash_boxcount;
-+ int splash_percent;
-+ int splash_overpaintok; /* is it ok to overpaint boxes */
-+ int splash_palcnt;
-+ char *oldscreen_base; /* pointer to top of virtual screen */
-+ unsigned char *splash_boxes;
-+ unsigned char *splash_jpeg; /* jpeg */
-+ unsigned char *splash_palette; /* palette for 8-bit */
-+
-+ int splash_dosilent; /* show silent jpeg */
-+ unsigned char *splash_silentjpeg;
-+ unsigned char *splash_sboxes;
-+ int splash_sboxcount;
-+};
-+#endif
-+
- struct display {
- /* Filled in by the low-level console driver */
- const u_char *fontdata;
-diff -Nur linux-2.6.27.orig/drivers/video/Kconfig
linux-2.6.27/drivers/video/Kconfig
---- linux-2.6.27.orig/drivers/video/Kconfig 2008-10-10 00:13:53.000000000
+0200
-+++ linux-2.6.27/drivers/video/Kconfig 2009-03-10 03:32:23.508284063 +0100
-@@ -2054,4 +2054,8 @@
- source "drivers/video/logo/Kconfig"
- endif
-
-+if FB
-+ source "drivers/video/bootsplash/Kconfig"
-+endif
-+
- endmenu
-diff -Nur linux-2.6.27.orig/drivers/video/Makefile
linux-2.6.27/drivers/video/Makefile
---- linux-2.6.27.orig/drivers/video/Makefile 2008-10-10 00:13:53.000000000
+0200
-+++ linux-2.6.27/drivers/video/Makefile 2009-03-10 03:32:23.508284063
+0100
-@@ -14,6 +14,7 @@
- obj-$(CONFIG_VT) += console/
- obj-$(CONFIG_LOGO) += logo/
- obj-y += backlight/ display/
-+obj-$(CONFIG_BOOTSPLASH) += bootsplash/
-
- obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
- obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o
-diff -Nur linux-2.6.27.orig/drivers/video/vesafb.c
linux-2.6.27/drivers/video/vesafb.c
---- linux-2.6.27.orig/drivers/video/vesafb.c 2008-10-10 00:13:53.000000000
+0200
-+++ linux-2.6.27/drivers/video/vesafb.c 2009-03-10 03:32:23.508284063
+0100
-@@ -174,7 +174,10 @@
- return err;
- }
-
--static struct fb_ops vesafb_ops = {
-+#ifndef CONFIG_BOOTSPLASH
-+static
-+#endif
-+struct fb_ops vesafb_ops = {
- .owner = THIS_MODULE,
- .fb_setcolreg = vesafb_setcolreg,
- .fb_pan_display = vesafb_pan_display,
-@@ -258,6 +261,11 @@
- * option to simply use size_total as that
- * wastes plenty of kernel address space. */
- size_remap = size_vmode * 2;
-+
-+#ifdef CONFIG_BOOTSPLASH
-+ size_remap *= 2; /* some more for the images */
-+#endif
-+
- if (vram_remap)
- size_remap = vram_remap * 1024 * 1024;
- if (size_remap < size_vmode)
-diff -Nur linux-2.6.27.orig/include/linux/console_struct.h
linux-2.6.27/include/linux/console_struct.h
---- linux-2.6.27.orig/include/linux/console_struct.h 2009-03-10
03:29:51.307469109 +0100
-+++ linux-2.6.27/include/linux/console_struct.h 2009-03-10
03:32:23.511617015 +0100
-@@ -106,6 +106,11 @@
- struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg
console for this display */
- unsigned long vc_uni_pagedir;
- unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir
variable for this console */
-+
-+#ifdef CONFIG_BOOTSPLASH
-+ struct splash_data *vc_splash_data;
-+#endif
-+
- /* additional information is in vt_kern.h */
- };
-
-diff -Nur linux-2.6.27.orig/include/linux/fb.h linux-2.6.27/include/linux/fb.h
---- linux-2.6.27.orig/include/linux/fb.h 2008-10-10 00:13:53.000000000
+0200
-+++ linux-2.6.27/include/linux/fb.h 2009-03-10 03:32:23.511617015 +0100
-@@ -849,6 +849,14 @@
+--- linux-2.6.31/include/linux/fb.h.orig 2009-09-10 00:13:59.000000000
+0200
++++ linux-2.6.31/include/linux/fb.h 2009-09-11 01:40:11.000000000 +0200
+@@ -861,6 +861,16 @@
void *fbcon_par; /* fbcon use-only private area */
/* From here on everything is device dependent */
- void *par;
+ void *par;
++
+#ifdef CONFIG_BOOTSPLASH
+ struct splash_data *splash_data;
+ unsigned char *splash_pic;
+ int splash_pic_size;
+ int splash_bytes;
-+ char *silent_screen_base; /* real screen base */
++ char *silent_screen_base; /* real screen base */
+ char fb_cursordata[64];
+#endif
- };
-
- #ifdef MODULE
++
+ /* we need the PCI or similiar aperture base/size not
+ smem_start/size as smem_start may just be an object
+ allocated inside the aperture so may not actually overlap */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop-bootsplash.patch?r1=1.3.2.1&r2=1.3.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
