convert fblogo patch to generic patch, remove addon stuff for this

5 files changed, 175 insertions, 196 deletions

diff --git a/target/linux/config/Config.in.addons b/target/linux/config/Config.in.addons
index c89e4356f..6e7b0d2e1 100644
--- a/target/linux/config/Config.in.addons
+++ b/target/linux/config/Config.in.addons
@@ -13,10 +13,6 @@ config ADK_KERNEL_ADDON_MPTCP
 	bool
 	depends on ADK_KERNEL_VERSION_3_14
 
-config ADK_KERNEL_ADDON_FBLOGO
-	bool
-	depends on ADK_KERNEL_VERSION_3_14
-
 config ADK_KERNEL_ADDON_LINUXRT
 	bool
 	depends on ADK_KERNEL_VERSION_3_18
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 3c8c683ef..b93237ad4 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -164,7 +164,9 @@ config ADK_KERNEL_FB_CON_DECOR
 	prompt "Enable fullscreen boot logo"
 	boolean
 	select ADK_PACKAGE_FBSPLASH
-	select ADK_KERNEL_ADDON_FBLOGO
+	depends on ADK_KERNEL_VERSION_3_19 || \
+		   ADK_KERNEL_VERSION_3_18 || \
+		   ADK_KERNEL_VERSION_3_14
 	default n
 
 config ADK_KERNEL_FB_VESA
@@ -178,13 +180,6 @@ config ADK_KERNEL_FB_VESA
  	help
 	 Framebuffer support for VirtualBox Emulator.
 
-config ADK_KERNEL_DRM_DW_HDMI_AUDIO
-	tristate
-	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_KERNEL_VERSION_3_16
- 	default n
- 	help
-
 config ADK_KERNEL_DRM_DW_HDMI_CEC
 	tristate
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
@@ -211,7 +206,7 @@ config ADK_KERNEL_DRM_IMX
 	select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 	select ADK_KERNEL_I2C_IMX
 	depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on ADK_KERNEL_VERSION_3_16
+	depends on ADK_KERNEL_VERSION_3_18
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
  	default n
  	help
diff --git a/target/linux/patches/3.14.35/patch-fblogo b/target/linux/patches/3.14.35/patch.fblogo
index cbbb4216f..cbbb4216f 100644
--- a/target/linux/patches/3.14.35/patch-fblogo
+++ b/target/linux/patches/3.14.35/patch.fblogo
diff --git a/target/linux/patches/3.18.9/patch-fblogo b/target/linux/patches/3.18.9/fblogo.patch
index f1fad64c1..5b9070242 100644
--- a/target/linux/patches/3.18.9/patch-fblogo
+++ b/target/linux/patches/3.18.9/fblogo.patch
@@ -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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/Documentation/fb/00-INDEX linux-3.18.9/Documentation/fb/00-INDEX
+--- linux-3.18.9.orig/Documentation/fb/00-INDEX	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/Documentation/fb/00-INDEX	2015-03-15 14:34:13.068143682 -0500
 @@ -23,6 +23,8 @@
  	- info on the driver for EP93xx LCD controller.
  fbcon.txt
@@ -10,9 +10,9 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/00-INDEX linux-3.15.1/Documentation
  framebuffer.txt
  	- introduction to frame buffer devices.
  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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/Documentation/fb/fbcondecor.txt linux-3.18.9/Documentation/fb/fbcondecor.txt
+--- linux-3.18.9.orig/Documentation/fb/fbcondecor.txt	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.18.9/Documentation/fb/fbcondecor.txt	2015-03-15 14:34:13.068143682 -0500
 @@ -0,0 +1,207 @@
 +What is it?
 +-----------
@@ -221,9 +221,9 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/fbcondecor.txt linux-3.15.1/Documen
 +Fbcondecor, fbcondecor protocol design, current implementation & docs by:
 +  Michal Januszewski <michalj+fbcondecor@gmail.com>
 +
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/Makefile linux-3.18.9/drivers/Makefile
+--- linux-3.18.9.orig/drivers/Makefile	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/drivers/Makefile	2015-03-15 14:34:13.068143682 -0500
 @@ -17,6 +17,10 @@
  obj-$(CONFIG_PCI)		+= pci/
  obj-$(CONFIG_PARISC)		+= parisc/
@@ -235,7 +235,7 @@ diff -Nur linux-3.15.1.orig/drivers/Makefile linux-3.15.1/drivers/Makefile
  obj-y				+= video/
  obj-y				+= idle/
  
-@@ -42,11 +46,6 @@
+@@ -45,11 +49,6 @@
  # reset controllers early, since gpu drivers might rely on them to initialize
  obj-$(CONFIG_RESET_CONTROLLER)	+= reset/
  
@@ -247,41 +247,9 @@ 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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/video/console/bitblit.c linux-3.18.9/drivers/video/console/bitblit.c
+--- linux-3.18.9.orig/drivers/video/console/bitblit.c	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/drivers/video/console/bitblit.c	2015-03-15 14:34:13.068143682 -0500
 @@ -18,6 +18,7 @@
  #include <linux/console.h>
  #include <asm/types.h>
@@ -304,7 +272,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/bitblit.c linux-3.15.1/drivers
  	info->fbops->fb_copyarea(info, &area);
  }
  
-@@ -380,11 +388,15 @@
+@@ -379,11 +387,15 @@
  	cursor.image.depth = 1;
  	cursor.rop = ROP_XOR;
  
@@ -324,9 +292,9 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/bitblit.c linux-3.15.1/drivers
  
  	ops->cursor_reset = 0;
  }
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/video/console/cfbcondecor.c linux-3.18.9/drivers/video/console/cfbcondecor.c
+--- linux-3.18.9.orig/drivers/video/console/cfbcondecor.c	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.18.9/drivers/video/console/cfbcondecor.c	2015-03-15 14:34:13.072143681 -0500
 @@ -0,0 +1,471 @@
 +/*
 + *  linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
@@ -799,9 +767,9 @@ 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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/video/console/fbcon.c linux-3.18.9/drivers/video/console/fbcon.c
+--- linux-3.18.9.orig/drivers/video/console/fbcon.c	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/drivers/video/console/fbcon.c	2015-03-15 14:34:13.072143681 -0500
 @@ -79,6 +79,7 @@
  #include <asm/irq.h>
  
@@ -828,7 +796,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcon.c linux-3.15.1/drivers/v
  	      u16 c, int is_fg)
  {
  	int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -551,6 +552,9 @@
+@@ -550,6 +551,9 @@
  		info_idx = -1;
  	} else {
  		fbcon_has_console_bind = 1;
@@ -1157,9 +1125,9 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcon.c linux-3.15.1/drivers/v
  	fbcon_has_exited = 1;
  }
  
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/video/console/fbcondecor.c linux-3.18.9/drivers/video/console/fbcondecor.c
+--- linux-3.18.9.orig/drivers/video/console/fbcondecor.c	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.18.9/drivers/video/console/fbcondecor.c	2015-03-15 14:34:13.076143680 -0500
 @@ -0,0 +1,555 @@
 +/*
 + *  linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations
@@ -1716,9 +1684,9 @@ 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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/video/console/fbcondecor.h linux-3.18.9/drivers/video/console/fbcondecor.h
+--- linux-3.18.9.orig/drivers/video/console/fbcondecor.h	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.18.9/drivers/video/console/fbcondecor.h	2015-03-15 14:34:13.076143680 -0500
 @@ -0,0 +1,79 @@
 +/* 
 + *  linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers
@@ -1799,9 +1767,41 @@ 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/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 11:21:49.000000000 +0200
+diff -Nur linux-3.18.9.orig/drivers/video/console/Kconfig linux-3.18.9/drivers/video/console/Kconfig
+--- linux-3.18.9.orig/drivers/video/console/Kconfig	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/drivers/video/console/Kconfig	2015-03-15 14:34:13.068143682 -0500
+@@ -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.18.9.orig/drivers/video/console/Makefile linux-3.18.9/drivers/video/console/Makefile
+--- linux-3.18.9.orig/drivers/video/console/Makefile	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/drivers/video/console/Makefile	2015-03-15 14:34:13.068143682 -0500
+@@ -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.18.9.orig/drivers/video/fbdev/core/fbcmap.c linux-3.18.9/drivers/video/fbdev/core/fbcmap.c
+--- linux-3.18.9.orig/drivers/video/fbdev/core/fbcmap.c	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/drivers/video/fbdev/core/fbcmap.c	2015-03-15 14:34:13.076143680 -0500
 @@ -17,6 +17,8 @@
  #include <linux/slab.h>
  #include <linux/uaccess.h>
@@ -1822,9 +1822,9 @@ diff -Nur linux-3.15.1.orig/drivers/video/fbdev/core/fbcmap.c linux-3.15.1/drive
  	return rc;
  }
  
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/include/linux/console_decor.h linux-3.18.9/include/linux/console_decor.h
+--- linux-3.18.9.orig/include/linux/console_decor.h	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.18.9/include/linux/console_decor.h	2015-03-15 14:34:13.076143680 -0500
 @@ -0,0 +1,46 @@
 +#ifndef _LINUX_CONSOLE_DECOR_H_
 +#define _LINUX_CONSOLE_DECOR_H_ 1
@@ -1872,30 +1872,30 @@ diff -Nur linux-3.15.1.orig/include/linux/console_decor.h linux-3.15.1/include/l
 +#endif /* __KERNEL__ */
 +
 +#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 11:21:19.000000000 +0200
-@@ -19,6 +19,7 @@
- struct vt_struct;
+diff -Nur linux-3.18.9.orig/include/linux/console_struct.h linux-3.18.9/include/linux/console_struct.h
+--- linux-3.18.9.orig/include/linux/console_struct.h	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/include/linux/console_struct.h	2015-03-15 14:34:13.076143680 -0500
+@@ -20,6 +20,7 @@
+ struct uni_pagedir;
  
  #define NPAR 16
 +#include <linux/console_decor.h>
  
  struct vc_data {
  	struct tty_port port;			/* Upper level data */
-@@ -107,6 +108,8 @@
- 	unsigned long	vc_uni_pagedir;
- 	unsigned long	*vc_uni_pagedir_loc;  /* [!] Location of uni_pagedir variable for this console */
+@@ -108,6 +109,8 @@
+ 	struct uni_pagedir *vc_uni_pagedir;
+ 	struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */
  	bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */
 +
 +	struct vc_decor vc_decor;
  	/* additional information is in vt_kern.h */
  };
  
-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 11:21:19.000000000 +0200
-@@ -219,6 +219,34 @@
+diff -Nur linux-3.18.9.orig/include/linux/fb.h linux-3.18.9/include/linux/fb.h
+--- linux-3.18.9.orig/include/linux/fb.h	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/include/linux/fb.h	2015-03-15 14:34:13.080143679 -0500
+@@ -220,6 +220,34 @@
  };
  #endif
  
@@ -1930,7 +1930,7 @@ diff -Nur linux-3.15.1.orig/include/linux/fb.h linux-3.15.1/include/linux/fb.h
  /*
   * Frame buffer operations
   *
-@@ -489,6 +517,9 @@
+@@ -490,6 +518,9 @@
  #define FBINFO_STATE_SUSPENDED	1
  	u32 state;			/* Hardware state i.e suspend */
  	void *fbcon_par;                /* fbcon use-only private area */
@@ -1940,9 +1940,9 @@ diff -Nur linux-3.15.1.orig/include/linux/fb.h linux-3.15.1/include/linux/fb.h
  	/* From here on everything is device dependent */
  	void *par;
  	/* 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 11:21:19.000000000 +0200
+diff -Nur linux-3.18.9.orig/include/uapi/linux/fb.h linux-3.18.9/include/uapi/linux/fb.h
+--- linux-3.18.9.orig/include/uapi/linux/fb.h	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/include/uapi/linux/fb.h	2015-03-15 14:34:13.080143679 -0500
 @@ -8,6 +8,25 @@
  
  #define FB_MAX			32	/* sufficient for now */
@@ -2025,10 +2025,10 @@ diff -Nur linux-3.15.1.orig/include/uapi/linux/fb.h linux-3.15.1/include/uapi/li
  struct fb_cmap {
  	__u32 start;			/* First entry	*/
  	__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 11:21:19.000000000 +0200
-@@ -146,6 +146,10 @@
+diff -Nur linux-3.18.9.orig/kernel/sysctl.c linux-3.18.9/kernel/sysctl.c
+--- linux-3.18.9.orig/kernel/sysctl.c	2015-03-06 16:53:42.000000000 -0600
++++ linux-3.18.9/kernel/sysctl.c	2015-03-15 14:34:13.080143679 -0500
+@@ -145,6 +145,10 @@
  static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
  #endif
  
@@ -2039,7 +2039,7 @@ diff -Nur linux-3.15.1.orig/kernel/sysctl.c linux-3.15.1/kernel/sysctl.c
  #ifdef CONFIG_INOTIFY_USER
  #include <linux/inotify.h>
  #endif
-@@ -255,6 +259,15 @@
+@@ -257,6 +261,15 @@
  		.mode		= 0555,
  		.child		= dev_table,
  	},
diff --git a/target/linux/patches/3.19.1/patch-fblogo b/target/linux/patches/3.19.1/fblogo.patch
index f1fad64c1..a090f393f 100644
--- a/target/linux/patches/3.19.1/patch-fblogo
+++ b/target/linux/patches/3.19.1/fblogo.patch
@@ -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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/Documentation/fb/00-INDEX linux-3.19.1/Documentation/fb/00-INDEX
+--- linux-3.19.1.orig/Documentation/fb/00-INDEX	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/Documentation/fb/00-INDEX	2015-03-15 15:12:10.436122636 -0500
 @@ -23,6 +23,8 @@
  	- info on the driver for EP93xx LCD controller.
  fbcon.txt
@@ -10,9 +10,9 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/00-INDEX linux-3.15.1/Documentation
  framebuffer.txt
  	- introduction to frame buffer devices.
  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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/Documentation/fb/fbcondecor.txt linux-3.19.1/Documentation/fb/fbcondecor.txt
+--- linux-3.19.1.orig/Documentation/fb/fbcondecor.txt	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.19.1/Documentation/fb/fbcondecor.txt	2015-03-15 15:12:10.452122956 -0500
 @@ -0,0 +1,207 @@
 +What is it?
 +-----------
@@ -221,9 +221,9 @@ diff -Nur linux-3.15.1.orig/Documentation/fb/fbcondecor.txt linux-3.15.1/Documen
 +Fbcondecor, fbcondecor protocol design, current implementation & docs by:
 +  Michal Januszewski <michalj+fbcondecor@gmail.com>
 +
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/Makefile linux-3.19.1/drivers/Makefile
+--- linux-3.19.1.orig/drivers/Makefile	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/drivers/Makefile	2015-03-15 15:12:10.452122956 -0500
 @@ -17,6 +17,10 @@
  obj-$(CONFIG_PCI)		+= pci/
  obj-$(CONFIG_PARISC)		+= parisc/
@@ -235,53 +235,9 @@ diff -Nur linux-3.15.1.orig/drivers/Makefile linux-3.15.1/drivers/Makefile
  obj-y				+= video/
  obj-y				+= idle/
  
-@@ -42,11 +46,6 @@
- # reset controllers early, since gpu drivers might rely on them to initialize
- obj-$(CONFIG_RESET_CONTROLLER)	+= reset/
- 
--# tty/ comes before char/ so that the VT console is the boot-time
--# default.
--obj-y				+= tty/
--obj-y				+= char/
--
- # 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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/video/console/bitblit.c linux-3.19.1/drivers/video/console/bitblit.c
+--- linux-3.19.1.orig/drivers/video/console/bitblit.c	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/drivers/video/console/bitblit.c	2015-03-15 15:12:10.452122956 -0500
 @@ -18,6 +18,7 @@
  #include <linux/console.h>
  #include <asm/types.h>
@@ -304,7 +260,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/bitblit.c linux-3.15.1/drivers
  	info->fbops->fb_copyarea(info, &area);
  }
  
-@@ -380,11 +388,15 @@
+@@ -379,11 +387,15 @@
  	cursor.image.depth = 1;
  	cursor.rop = ROP_XOR;
  
@@ -324,9 +280,9 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/bitblit.c linux-3.15.1/drivers
  
  	ops->cursor_reset = 0;
  }
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/video/console/cfbcondecor.c linux-3.19.1/drivers/video/console/cfbcondecor.c
+--- linux-3.19.1.orig/drivers/video/console/cfbcondecor.c	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.19.1/drivers/video/console/cfbcondecor.c	2015-03-15 15:12:10.456122903 -0500
 @@ -0,0 +1,471 @@
 +/*
 + *  linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
@@ -799,9 +755,9 @@ 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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/video/console/fbcon.c linux-3.19.1/drivers/video/console/fbcon.c
+--- linux-3.19.1.orig/drivers/video/console/fbcon.c	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/drivers/video/console/fbcon.c	2015-03-15 15:12:10.456122903 -0500
 @@ -79,6 +79,7 @@
  #include <asm/irq.h>
  
@@ -828,7 +784,7 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcon.c linux-3.15.1/drivers/v
  	      u16 c, int is_fg)
  {
  	int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -551,6 +552,9 @@
+@@ -550,6 +551,9 @@
  		info_idx = -1;
  	} else {
  		fbcon_has_console_bind = 1;
@@ -1157,9 +1113,9 @@ diff -Nur linux-3.15.1.orig/drivers/video/console/fbcon.c linux-3.15.1/drivers/v
  	fbcon_has_exited = 1;
  }
  
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/video/console/fbcondecor.c linux-3.19.1/drivers/video/console/fbcondecor.c
+--- linux-3.19.1.orig/drivers/video/console/fbcondecor.c	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.19.1/drivers/video/console/fbcondecor.c	2015-03-15 15:12:10.460122853 -0500
 @@ -0,0 +1,555 @@
 +/*
 + *  linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations
@@ -1716,9 +1672,9 @@ 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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/video/console/fbcondecor.h linux-3.19.1/drivers/video/console/fbcondecor.h
+--- linux-3.19.1.orig/drivers/video/console/fbcondecor.h	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.19.1/drivers/video/console/fbcondecor.h	2015-03-15 15:12:10.460122853 -0500
 @@ -0,0 +1,79 @@
 +/* 
 + *  linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers
@@ -1799,9 +1755,41 @@ 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/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 11:21:49.000000000 +0200
+diff -Nur linux-3.19.1.orig/drivers/video/console/Kconfig linux-3.19.1/drivers/video/console/Kconfig
+--- linux-3.19.1.orig/drivers/video/console/Kconfig	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/drivers/video/console/Kconfig	2015-03-15 15:12:10.452122956 -0500
+@@ -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.19.1.orig/drivers/video/console/Makefile linux-3.19.1/drivers/video/console/Makefile
+--- linux-3.19.1.orig/drivers/video/console/Makefile	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/drivers/video/console/Makefile	2015-03-15 15:12:10.452122956 -0500
+@@ -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.19.1.orig/drivers/video/fbdev/core/fbcmap.c linux-3.19.1/drivers/video/fbdev/core/fbcmap.c
+--- linux-3.19.1.orig/drivers/video/fbdev/core/fbcmap.c	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/drivers/video/fbdev/core/fbcmap.c	2015-03-15 15:12:10.460122853 -0500
 @@ -17,6 +17,8 @@
  #include <linux/slab.h>
  #include <linux/uaccess.h>
@@ -1822,9 +1810,9 @@ diff -Nur linux-3.15.1.orig/drivers/video/fbdev/core/fbcmap.c linux-3.15.1/drive
  	return rc;
  }
  
-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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/include/linux/console_decor.h linux-3.19.1/include/linux/console_decor.h
+--- linux-3.19.1.orig/include/linux/console_decor.h	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.19.1/include/linux/console_decor.h	2015-03-15 15:12:10.460122853 -0500
 @@ -0,0 +1,46 @@
 +#ifndef _LINUX_CONSOLE_DECOR_H_
 +#define _LINUX_CONSOLE_DECOR_H_ 1
@@ -1872,30 +1860,30 @@ diff -Nur linux-3.15.1.orig/include/linux/console_decor.h linux-3.15.1/include/l
 +#endif /* __KERNEL__ */
 +
 +#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 11:21:19.000000000 +0200
-@@ -19,6 +19,7 @@
- struct vt_struct;
+diff -Nur linux-3.19.1.orig/include/linux/console_struct.h linux-3.19.1/include/linux/console_struct.h
+--- linux-3.19.1.orig/include/linux/console_struct.h	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/include/linux/console_struct.h	2015-03-15 15:12:10.460122853 -0500
+@@ -20,6 +20,7 @@
+ struct uni_pagedir;
  
  #define NPAR 16
 +#include <linux/console_decor.h>
  
  struct vc_data {
  	struct tty_port port;			/* Upper level data */
-@@ -107,6 +108,8 @@
- 	unsigned long	vc_uni_pagedir;
- 	unsigned long	*vc_uni_pagedir_loc;  /* [!] Location of uni_pagedir variable for this console */
+@@ -108,6 +109,8 @@
+ 	struct uni_pagedir *vc_uni_pagedir;
+ 	struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */
  	bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */
 +
 +	struct vc_decor vc_decor;
  	/* additional information is in vt_kern.h */
  };
  
-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 11:21:19.000000000 +0200
-@@ -219,6 +219,34 @@
+diff -Nur linux-3.19.1.orig/include/linux/fb.h linux-3.19.1/include/linux/fb.h
+--- linux-3.19.1.orig/include/linux/fb.h	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/include/linux/fb.h	2015-03-15 15:12:10.464122809 -0500
+@@ -220,6 +220,34 @@
  };
  #endif
  
@@ -1930,7 +1918,7 @@ diff -Nur linux-3.15.1.orig/include/linux/fb.h linux-3.15.1/include/linux/fb.h
  /*
   * Frame buffer operations
   *
-@@ -489,6 +517,9 @@
+@@ -490,6 +518,9 @@
  #define FBINFO_STATE_SUSPENDED	1
  	u32 state;			/* Hardware state i.e suspend */
  	void *fbcon_par;                /* fbcon use-only private area */
@@ -1940,9 +1928,9 @@ diff -Nur linux-3.15.1.orig/include/linux/fb.h linux-3.15.1/include/linux/fb.h
  	/* From here on everything is device dependent */
  	void *par;
  	/* 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 11:21:19.000000000 +0200
+diff -Nur linux-3.19.1.orig/include/uapi/linux/fb.h linux-3.19.1/include/uapi/linux/fb.h
+--- linux-3.19.1.orig/include/uapi/linux/fb.h	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/include/uapi/linux/fb.h	2015-03-15 15:12:10.464122809 -0500
 @@ -8,6 +8,25 @@
  
  #define FB_MAX			32	/* sufficient for now */
@@ -2025,10 +2013,10 @@ diff -Nur linux-3.15.1.orig/include/uapi/linux/fb.h linux-3.15.1/include/uapi/li
  struct fb_cmap {
  	__u32 start;			/* First entry	*/
  	__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 11:21:19.000000000 +0200
-@@ -146,6 +146,10 @@
+diff -Nur linux-3.19.1.orig/kernel/sysctl.c linux-3.19.1/kernel/sysctl.c
+--- linux-3.19.1.orig/kernel/sysctl.c	2015-03-06 16:57:59.000000000 -0600
++++ linux-3.19.1/kernel/sysctl.c	2015-03-15 15:12:10.464122809 -0500
+@@ -145,6 +145,10 @@
  static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
  #endif
  
@@ -2039,7 +2027,7 @@ diff -Nur linux-3.15.1.orig/kernel/sysctl.c linux-3.15.1/kernel/sysctl.c
  #ifdef CONFIG_INOTIFY_USER
  #include <linux/inotify.h>
  #endif
-@@ -255,6 +259,15 @@
+@@ -257,6 +261,15 @@
  		.mode		= 0555,
  		.child		= dev_table,
  	},