linux-yocto_3.14: Backport patch for MicroBlaze early_printk

* Backport patch from 3.15 kernel to fix the double definition of
  early_printk for MicroBlaze

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

2 files changed, 51 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-xlnx/3.14/microblaze-Drop-architecture-specific-declaration-of.patch b/recipes-kernel/linux/linux-xlnx/3.14/microblaze-Drop-architecture-specific-declaration-of.patch
new file mode 100644
index 00000000..43594ebd
--- /dev/null
+++ b/recipes-kernel/linux/linux-xlnx/3.14/microblaze-Drop-architecture-specific-declaration-of.patch
@@ -0,0 +1,48 @@
+From 1b3fe856bd53bc1290ef77a0cce75424b81bdc19 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Mon, 17 Feb 2014 09:44:19 -0800
+Subject: [PATCH] microblaze: Drop architecture-specific declaration of
+ early_printk
+
+miceroblaze:allmodconfig fails to build, complaining that
+early_printk is redeclared.
+
+include/linux/printk.h:114:6: error: static declaration of 'early_printk'
+                follows non-static declaration
+ void early_printk(const char *s, ...) { }
+      ^
+In file included from arch/microblaze/include/asm/page.h:19:0,
+                 from arch/microblaze/include/asm/io.h:15,
+                 from include/linux/io.h:22,
+                 from kernel/irq/generic-chip.c:6:
+arch/microblaze/include/asm/setup.h:22:6:
+                note: previous declaration of 'early_printk' was here
+ void early_printk(const char *fmt, ...);
+
+This happens because CONFIG_EARLY_PRINTK is not enabled in this
+configuration.
+
+The architecture-specific declaration is not needed; drop it.
+
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+---
+ arch/microblaze/include/asm/setup.h |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
+index 0990b43..be84a4d 100644
+--- a/arch/microblaze/include/asm/setup.h
++++ b/arch/microblaze/include/asm/setup.h
+@@ -19,8 +19,6 @@ extern char cmd_line[COMMAND_LINE_SIZE];
+ 
+ extern char *klimit;
+ 
+-void early_printk(const char *fmt, ...);
+-
+ int setup_early_printk(char *opt);
+ void remap_early_printk(void);
+ void disable_early_printk(void);
+-- 
+1.7.10.4
+
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 944ff63b..f3010916 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -6,4 +6,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.14:"
 SRC_URI_append_zynq += " \
                 file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \
                 "
+SRC_URI_append_microblaze += " \
+                file://microblaze-Drop-architecture-specific-declaration-of.patch \
+                "