diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/patches/3.15.1/patch-fblogo | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/target/linux/patches/3.15.1/patch-fblogo b/target/linux/patches/3.15.1/patch-fblogo index 59f7695d4..f1fad64c1 100644 --- a/target/linux/patches/3.15.1/patch-fblogo +++ b/target/linux/patches/3.15.1/patch-fblogo @@ -1,6 +1,6 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/00-INDEX linux-3.15.1/Documentation/fb/00-INDEX --- linux-3.15.1.orig/Documentation/fb/00-INDEX 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/Documentation/fb/00-INDEX 2014-06-28 10:11:55.076940740 +0200 ++++ linux-3.15.1/Documentation/fb/00-INDEX 2014-06-28 11:21:19.000000000 +0200 @@ -23,6 +23,8 @@ - info on the driver for EP93xx LCD controller. fbcon.txt @@ -12,7 +12,7 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/00-INDEX linux-3.15.1/Documentation gxfb.txt diff -Nur linux-3.15.1.orig/Documentation/fb/fbcondecor.txt linux-3.15.1/Documentation/fb/fbcondecor.txt --- linux-3.15.1.orig/Documentation/fb/fbcondecor.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.15.1/Documentation/fb/fbcondecor.txt 2014-06-28 10:11:55.076940740 +0200 ++++ linux-3.15.1/Documentation/fb/fbcondecor.txt 2014-06-28 11:21:19.000000000 +0200 @@ -0,0 +1,207 @@ +What is it? +----------- @@ -223,7 +223,7 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/fbcondecor.txt linux-3.15.1/Documen + diff -Nur linux-3.15.1.orig/drivers/Makefile linux-3.15.1/drivers/Makefile --- linux-3.15.1.orig/drivers/Makefile 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/drivers/Makefile 2014-06-28 10:11:55.076940740 +0200 ++++ linux-3.15.1/drivers/Makefile 2014-06-28 11:21:19.000000000 +0200 @@ -17,6 +17,10 @@ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ @@ -247,9 +247,41 @@ diff -Nur linux-3.15.1.orig/drivers/Makefile linux-3.15.1/drivers/Makefile # gpu/ comes after char for AGP vs DRM startup obj-y += gpu/ +diff -Nur linux-3.15.1.orig/drivers/video/console/Kconfig linux-3.15.1/drivers/video/console/Kconfig +--- linux-3.15.1.orig/drivers/video/console/Kconfig 2014-06-16 22:44:27.000000000 +0200 ++++ linux-3.15.1/drivers/video/console/Kconfig 2014-06-28 11:21:19.000000000 +0200 +@@ -126,6 +126,19 @@ + such that other users of the framebuffer will remain normally + oriented. + ++config FB_CON_DECOR ++ bool "Support for the Framebuffer Console Decorations" ++ depends on FRAMEBUFFER_CONSOLE=y && !FB_TILEBLITTING ++ default n ++ ---help--- ++ This option enables support for framebuffer console decorations which ++ makes it possible to display images in the background of the system ++ consoles. Note that userspace utilities are necessary in order to take ++ advantage of these features. Refer to Documentation/fb/fbcondecor.txt ++ for more information. ++ ++ If unsure, say N. ++ + config STI_CONSOLE + bool "STI text console" + depends on PARISC +diff -Nur linux-3.15.1.orig/drivers/video/console/Makefile linux-3.15.1/drivers/video/console/Makefile +--- linux-3.15.1.orig/drivers/video/console/Makefile 2014-06-16 22:44:27.000000000 +0200 ++++ linux-3.15.1/drivers/video/console/Makefile 2014-06-28 11:21:19.000000000 +0200 +@@ -16,4 +16,5 @@ + fbcon_ccw.o + endif + ++obj-$(CONFIG_FB_CON_DECOR) += fbcondecor.o cfbcondecor.o + obj-$(CONFIG_FB_STI) += sticore.o diff -Nur linux-3.15.1.orig/drivers/video/console/bitblit.c linux-3.15.1/drivers/video/console/bitblit.c --- linux-3.15.1.orig/drivers/video/console/bitblit.c 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/drivers/video/console/bitblit.c 2014-06-28 10:11:55.080940744 +0200 ++++ linux-3.15.1/drivers/video/console/bitblit.c 2014-06-28 11:21:19.000000000 +0200 @@ -18,6 +18,7 @@ #include <linux/console.h> #include <asm/types.h> @@ -294,7 +326,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/bitblit.c linux-3.15.1/drivers } diff -Nur linux-3.15.1.orig/drivers/video/console/cfbcondecor.c linux-3.15.1/drivers/video/console/cfbcondecor.c --- linux-3.15.1.orig/drivers/video/console/cfbcondecor.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.15.1/drivers/video/console/cfbcondecor.c 2014-06-28 10:11:55.080940744 +0200 ++++ linux-3.15.1/drivers/video/console/cfbcondecor.c 2014-06-28 11:21:19.000000000 +0200 @@ -0,0 +1,471 @@ +/* + * linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions @@ -769,7 +801,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/cfbcondecor.c linux-3.15.1/dri + diff -Nur linux-3.15.1.orig/drivers/video/console/fbcon.c linux-3.15.1/drivers/video/console/fbcon.c --- linux-3.15.1.orig/drivers/video/console/fbcon.c 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/drivers/video/console/fbcon.c 2014-06-28 10:11:55.080940744 +0200 ++++ linux-3.15.1/drivers/video/console/fbcon.c 2014-06-28 11:21:19.000000000 +0200 @@ -79,6 +79,7 @@ #include <asm/irq.h> @@ -1127,7 +1159,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcon.c linux-3.15.1/drivers/v diff -Nur linux-3.15.1.orig/drivers/video/console/fbcondecor.c linux-3.15.1/drivers/video/console/fbcondecor.c --- linux-3.15.1.orig/drivers/video/console/fbcondecor.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.15.1/drivers/video/console/fbcondecor.c 2014-06-28 10:11:55.080940744 +0200 ++++ linux-3.15.1/drivers/video/console/fbcondecor.c 2014-06-28 11:21:19.000000000 +0200 @@ -0,0 +1,555 @@ +/* + * linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations @@ -1686,7 +1718,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcondecor.c linux-3.15.1/driv +EXPORT_SYMBOL(fbcon_decor_path); diff -Nur linux-3.15.1.orig/drivers/video/console/fbcondecor.h linux-3.15.1/drivers/video/console/fbcondecor.h --- linux-3.15.1.orig/drivers/video/console/fbcondecor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.15.1/drivers/video/console/fbcondecor.h 2014-06-28 10:11:55.080940744 +0200 ++++ linux-3.15.1/drivers/video/console/fbcondecor.h 2014-06-28 11:21:19.000000000 +0200 @@ -0,0 +1,79 @@ +/* + * linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers @@ -1767,46 +1799,14 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcondecor.h linux-3.15.1/driv +#endif /* CONFIG_FB_CON_DECOR */ + +#endif /* __FBCON_DECOR_H */ -diff -Nur linux-3.15.1.orig/drivers/video/console/Kconfig linux-3.15.1/drivers/video/console/Kconfig ---- linux-3.15.1.orig/drivers/video/console/Kconfig 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/drivers/video/console/Kconfig 2014-06-28 10:11:55.080940744 +0200 -@@ -126,6 +126,19 @@ - such that other users of the framebuffer will remain normally - oriented. - -+config FB_CON_DECOR -+ bool "Support for the Framebuffer Console Decorations" -+ depends on FRAMEBUFFER_CONSOLE=y && !FB_TILEBLITTING -+ default n -+ ---help--- -+ This option enables support for framebuffer console decorations which -+ makes it possible to display images in the background of the system -+ consoles. Note that userspace utilities are necessary in order to take -+ advantage of these features. Refer to Documentation/fb/fbcondecor.txt -+ for more information. -+ -+ If unsure, say N. -+ - config STI_CONSOLE - bool "STI text console" - depends on PARISC -diff -Nur linux-3.15.1.orig/drivers/video/console/Makefile linux-3.15.1/drivers/video/console/Makefile ---- linux-3.15.1.orig/drivers/video/console/Makefile 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/drivers/video/console/Makefile 2014-06-28 10:11:55.080940744 +0200 -@@ -16,4 +16,5 @@ - fbcon_ccw.o - endif - -+obj-$(CONFIG_FB_CON_DECOR) += fbcondecor.o cfbcondecor.o - obj-$(CONFIG_FB_STI) += sticore.o diff -Nur linux-3.15.1.orig/drivers/video/fbdev/core/fbcmap.c linux-3.15.1/drivers/video/fbdev/core/fbcmap.c --- linux-3.15.1.orig/drivers/video/fbdev/core/fbcmap.c 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/drivers/video/fbdev/core/fbcmap.c 2014-06-28 10:21:58.105462014 +0200 ++++ linux-3.15.1/drivers/video/fbdev/core/fbcmap.c 2014-06-28 11:21:49.000000000 +0200 @@ -17,6 +17,8 @@ #include <linux/slab.h> #include <linux/uaccess.h> -+#include "console/fbcondecor.h" ++#include "../../console/fbcondecor.h" + static u16 red2[] __read_mostly = { 0x0000, 0xaaaa @@ -1824,7 +1824,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/fbdev/core/fbcmap.c linux-3.15.1/drive diff -Nur linux-3.15.1.orig/include/linux/console_decor.h linux-3.15.1/include/linux/console_decor.h --- linux-3.15.1.orig/include/linux/console_decor.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.15.1/include/linux/console_decor.h 2014-06-28 10:12:10.096953881 +0200 ++++ linux-3.15.1/include/linux/console_decor.h 2014-06-28 11:21:19.000000000 +0200 @@ -0,0 +1,46 @@ +#ifndef _LINUX_CONSOLE_DECOR_H_ +#define _LINUX_CONSOLE_DECOR_H_ 1 @@ -1874,7 +1874,7 @@ diff -Nur linux-3.15.1.orig/include/linux/console_decor.h linux-3.15.1/include/l +#endif diff -Nur linux-3.15.1.orig/include/linux/console_struct.h linux-3.15.1/include/linux/console_struct.h --- linux-3.15.1.orig/include/linux/console_struct.h 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/include/linux/console_struct.h 2014-06-28 10:12:10.100953885 +0200 ++++ linux-3.15.1/include/linux/console_struct.h 2014-06-28 11:21:19.000000000 +0200 @@ -19,6 +19,7 @@ struct vt_struct; @@ -1894,7 +1894,7 @@ diff -Nur linux-3.15.1.orig/include/linux/console_struct.h linux-3.15.1/include/ diff -Nur linux-3.15.1.orig/include/linux/fb.h linux-3.15.1/include/linux/fb.h --- linux-3.15.1.orig/include/linux/fb.h 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/include/linux/fb.h 2014-06-28 10:12:10.100953885 +0200 ++++ linux-3.15.1/include/linux/fb.h 2014-06-28 11:21:19.000000000 +0200 @@ -219,6 +219,34 @@ }; #endif @@ -1942,7 +1942,7 @@ diff -Nur linux-3.15.1.orig/include/linux/fb.h linux-3.15.1/include/linux/fb.h /* we need the PCI or similar aperture base/size not diff -Nur linux-3.15.1.orig/include/uapi/linux/fb.h linux-3.15.1/include/uapi/linux/fb.h --- linux-3.15.1.orig/include/uapi/linux/fb.h 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/include/uapi/linux/fb.h 2014-06-28 10:12:10.100953885 +0200 ++++ linux-3.15.1/include/uapi/linux/fb.h 2014-06-28 11:21:19.000000000 +0200 @@ -8,6 +8,25 @@ #define FB_MAX 32 /* sufficient for now */ @@ -2027,7 +2027,7 @@ diff -Nur linux-3.15.1.orig/include/uapi/linux/fb.h linux-3.15.1/include/uapi/li __u32 len; /* Number of entries */ diff -Nur linux-3.15.1.orig/kernel/sysctl.c linux-3.15.1/kernel/sysctl.c --- linux-3.15.1.orig/kernel/sysctl.c 2014-06-16 22:44:27.000000000 +0200 -+++ linux-3.15.1/kernel/sysctl.c 2014-06-28 10:12:10.100953885 +0200 ++++ linux-3.15.1/kernel/sysctl.c 2014-06-28 11:21:19.000000000 +0200 @@ -146,6 +146,10 @@ static unsigned long hung_task_timeout_max = (LONG_MAX/HZ); #endif |