diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2015-12-28 18:20:15 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2015-12-28 18:20:15 +1000 |
commit | fe85ae7de234faf269750c8be0071c11bda348de (patch) | |
tree | 61b35caf106af0fea940f0ab78c8ed92fb8608ca | |
parent | 66b59e4718b405ab53356c077d7912bf19539447 (diff) | |
download | meta-xilinx-fe85ae7de234faf269750c8be0071c11bda348de.tar.gz |
linux-yocto_3.14: Dropped
This version of linux-yocto was dropped from OE-Core.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r-- | recipes-kernel/linux/linux-xlnx/3.14/microblaze-Drop-architecture-specific-declaration-of.patch | 48 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_3.14.bbappend | 13 |
2 files changed, 0 insertions, 61 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 deleted file mode 100644 index 43594ebd..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.14/microblaze-Drop-architecture-specific-declaration-of.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 1b3fe856bd53bc1290ef77a0cce75424b81bdc19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Guenter Roeck <linux@roeck-us.net> | ||
3 | Date: Mon, 17 Feb 2014 09:44:19 -0800 | ||
4 | Subject: [PATCH] microblaze: Drop architecture-specific declaration of | ||
5 | early_printk | ||
6 | |||
7 | miceroblaze:allmodconfig fails to build, complaining that | ||
8 | early_printk is redeclared. | ||
9 | |||
10 | include/linux/printk.h:114:6: error: static declaration of 'early_printk' | ||
11 | follows non-static declaration | ||
12 | void early_printk(const char *s, ...) { } | ||
13 | ^ | ||
14 | In file included from arch/microblaze/include/asm/page.h:19:0, | ||
15 | from arch/microblaze/include/asm/io.h:15, | ||
16 | from include/linux/io.h:22, | ||
17 | from kernel/irq/generic-chip.c:6: | ||
18 | arch/microblaze/include/asm/setup.h:22:6: | ||
19 | note: previous declaration of 'early_printk' was here | ||
20 | void early_printk(const char *fmt, ...); | ||
21 | |||
22 | This happens because CONFIG_EARLY_PRINTK is not enabled in this | ||
23 | configuration. | ||
24 | |||
25 | The architecture-specific declaration is not needed; drop it. | ||
26 | |||
27 | Signed-off-by: Guenter Roeck <linux@roeck-us.net> | ||
28 | Signed-off-by: Michal Simek <michal.simek@xilinx.com> | ||
29 | --- | ||
30 | arch/microblaze/include/asm/setup.h | 2 -- | ||
31 | 1 file changed, 2 deletions(-) | ||
32 | |||
33 | diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h | ||
34 | index 0990b43..be84a4d 100644 | ||
35 | --- a/arch/microblaze/include/asm/setup.h | ||
36 | +++ b/arch/microblaze/include/asm/setup.h | ||
37 | @@ -19,8 +19,6 @@ extern char cmd_line[COMMAND_LINE_SIZE]; | ||
38 | |||
39 | extern char *klimit; | ||
40 | |||
41 | -void early_printk(const char *fmt, ...); | ||
42 | - | ||
43 | int setup_early_printk(char *opt); | ||
44 | void remap_early_printk(void); | ||
45 | void disable_early_printk(void); | ||
46 | -- | ||
47 | 1.7.10.4 | ||
48 | |||
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend deleted file mode 100644 index 07a1de18..00000000 --- a/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | |||
2 | require linux-xilinx-configs.inc | ||
3 | require linux-xilinx-machines.inc | ||
4 | |||
5 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.14:" | ||
6 | SRC_URI_append_zynq = " \ | ||
7 | file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ | ||
8 | " | ||
9 | SRC_URI_append_microblaze = " \ | ||
10 | file://microblaze-Drop-architecture-specific-declaration-of.patch \ | ||
11 | file://kernel-use-the-gnu89-standard-explicitly.patch \ | ||
12 | " | ||
13 | |||