From 7da3067a62fd0f2ead7e5a1ad017a146948080ee Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 31 Dec 2015 00:45:34 +1000 Subject: linux-xlnx_3.14: Remove 'xlnx_3.14' kernel This kernel is no longer maintained, and has custom device tree bindings for various drivers. Remove the kernel recipe and all patches it uses. Signed-off-by: Nathan Rossi --- .../3.14/kernel-add-support-for-gcc-5.patch | 97 ---------------------- .../kernel-use-the-gnu89-standard-explicitly.patch | 66 --------------- ...-RX-hang-and-TX-corruption-in-set_termios.patch | 32 ------- ...sb-host-zynq-dr-of-PHY-reset-during-probe.patch | 58 ------------- recipes-kernel/linux/linux-xlnx_3.14.bb | 17 ---- 5 files changed, 270 deletions(-) delete mode 100644 recipes-kernel/linux/linux-xlnx/3.14/kernel-add-support-for-gcc-5.patch delete mode 100644 recipes-kernel/linux/linux-xlnx/3.14/kernel-use-the-gnu89-standard-explicitly.patch delete mode 100644 recipes-kernel/linux/linux-xlnx/3.14/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch delete mode 100644 recipes-kernel/linux/linux-xlnx/3.14/usb-host-zynq-dr-of-PHY-reset-during-probe.patch delete mode 100644 recipes-kernel/linux/linux-xlnx_3.14.bb diff --git a/recipes-kernel/linux/linux-xlnx/3.14/kernel-add-support-for-gcc-5.patch b/recipes-kernel/linux/linux-xlnx/3.14/kernel-add-support-for-gcc-5.patch deleted file mode 100644 index bfebf72c..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.14/kernel-add-support-for-gcc-5.patch +++ /dev/null @@ -1,97 +0,0 @@ -From: Sasha Levin -Date: Mon, 13 Oct 2014 15:51:05 -0700 -Subject: [PATCH] kernel: add support for gcc 5 - -We're missing include/linux/compiler-gcc5.h which is required now -because gcc branched off to v5 in trunk. - -Just copy the relevant bits out of include/linux/compiler-gcc4.h, -no new code is added as of now. - -This fixes a build error when using gcc 5. - -Signed-off-by: Sasha Levin -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream-Status: Backport ---- - include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -new file mode 100644 -index 0000000..cdd1cc2 ---- /dev/null -+++ b/include/linux/compiler-gcc5.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.5.1 - diff --git a/recipes-kernel/linux/linux-xlnx/3.14/kernel-use-the-gnu89-standard-explicitly.patch b/recipes-kernel/linux/linux-xlnx/3.14/kernel-use-the-gnu89-standard-explicitly.patch deleted file mode 100644 index 9f7b3b8e..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.14/kernel-use-the-gnu89-standard-explicitly.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: "Kirill A. Shutemov" -Date: Mon, 20 Oct 2014 12:23:12 +0300 -Subject: [PATCH] kernel: use the gnu89 standard explicitly - -Sasha Levin reports: - "gcc5 changes the default standard to c11, which makes kernel build - unhappy - - Explicitly define the kernel standard to be gnu89 which should keep - everything working exactly like it was before gcc5" - -There are multiple small issues with the new default, but the biggest -issue seems to be that the old - and very useful - GNU extension to -allow a cast in front of an initializer has gone away. - -Patch updated by Kirill: - "I'm pretty sure all gcc versions you can build kernel with supports - -std=gnu89. cc-option is redunrant. - - We also need to adjust HOSTCFLAGS otherwise allmodconfig fails for me" - -Note by Andrew Pinski: - "Yes it was reported and both problems relating to this extension has - been added to gnu99 and gnu11. Though there are other issues with the - kernel dealing with extern inline have different semantics between - gnu89 and gnu99/11" - -End result: we may be able to move up to a newer stdc model eventually, -but right now the newer models have some annoying deficiencies, so the -traditional "gnu89" model ends up being the preferred one. - -Signed-off-by: Sasha Levin -Singed-off-by: Kirill A. Shutemov -Signed-off-by: Linus Torvalds -Upstream-Status: Backport [Minor merge conflict resolution] ---- - Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index b2f7de8..6af4c22 100644 ---- a/Makefile -+++ b/Makefile -@@ -244,7 +244,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ - - HOSTCC = gcc - HOSTCXX = g++ --HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 - HOSTCXXFLAGS = -O2 - - # Decide whether to build built-in, modular, or both. -@@ -382,7 +382,9 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ -- -fno-delete-null-pointer-checks -+ -fno-delete-null-pointer-checks \ -+ -std=gnu89 -+ - KBUILD_AFLAGS_KERNEL := - KBUILD_CFLAGS_KERNEL := - KBUILD_AFLAGS := -D__ASSEMBLY__ --- -2.5.1 - diff --git a/recipes-kernel/linux/linux-xlnx/3.14/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch b/recipes-kernel/linux/linux-xlnx/3.14/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch deleted file mode 100644 index bafd4332..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.14/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 397b08fb903994ccaa2d4d7f4cf578c9d3028463 Mon Sep 17 00:00:00 2001 -From: Nathan Rossi -Date: Mon, 24 Nov 2014 15:11:43 +1000 -Subject: [PATCH] tty: xuartps: Fix RX hang, and TX corruption in set_termios - -Signed-off-by: Nathan Rossi ---- - drivers/tty/serial/xilinx_uartps.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c -index dbbc195..fcb1c50 100644 ---- a/drivers/tty/serial/xilinx_uartps.c -+++ b/drivers/tty/serial/xilinx_uartps.c -@@ -648,10 +648,10 @@ static void xuartps_set_termios(struct uart_port *port, - - spin_lock_irqsave(&port->lock, flags); - -- /* Empty the receive FIFO 1st before making changes */ -- while ((xuartps_readl(XUARTPS_SR_OFFSET) & -- XUARTPS_SR_RXEMPTY) != XUARTPS_SR_RXEMPTY) { -- xuartps_readl(XUARTPS_FIFO_OFFSET); -+ /* Wait for the transmit FIFO to empty before making changes */ -+ if (!(xuartps_readl(XUARTPS_CR_OFFSET) & XUARTPS_CR_TX_DIS)) { -+ while (!(xuartps_readl(XUARTPS_SR_OFFSET) & XUARTPS_SR_TXEMPTY)) -+ cpu_relax(); - } - - /* Disable the TX and RX to set baud rate */ --- -2.1.1 - diff --git a/recipes-kernel/linux/linux-xlnx/3.14/usb-host-zynq-dr-of-PHY-reset-during-probe.patch b/recipes-kernel/linux/linux-xlnx/3.14/usb-host-zynq-dr-of-PHY-reset-during-probe.patch deleted file mode 100644 index 6ef36098..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.14/usb-host-zynq-dr-of-PHY-reset-during-probe.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Mike Looijmans -Date: Thu, 25 Sep 2014 07:53:49 +0200 -Subject: [PATCH] usb/host/zynq-dr-of: PHY reset during probe - ---- - drivers/usb/host/zynq-dr-of.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/drivers/usb/host/zynq-dr-of.c b/drivers/usb/host/zynq-dr-of.c -index 9ab936a..2765894 100644 ---- a/drivers/usb/host/zynq-dr-of.c -+++ b/drivers/usb/host/zynq-dr-of.c -@@ -26,6 +26,8 @@ - #include - #include - #include -+#include -+#include - - #include "ehci-zynq.h" - -@@ -152,11 +154,33 @@ static int zynq_dr_of_probe(struct platform_device *ofdev) - static unsigned int idx; - struct resource *res; - int i, phy_init; -+ int reset_gpio; - int ret; - - pdata = &data; - memset(pdata, 0, sizeof(data)); - -+ reset_gpio = of_get_named_gpio(np, "xlnx,phy-reset-gpio", 0); -+ if (gpio_is_valid(reset_gpio)) { -+ ret = devm_gpio_request_one(&ofdev->dev, reset_gpio, -+ GPIOF_INIT_LOW, "ulpi resetb"); -+ if (ret) { -+ dev_err(&ofdev->dev, "Failed to request ULPI reset gpio: %d\n", ret); -+ return ret; -+ } -+ udelay(1); /* ULPI Datasheet specifies a 1us pulse width for reset */ -+ if (of_property_read_bool(np, "xlnx,phy-reset-gpio-tristate")) -+ gpio_direction_input(reset_gpio); -+ else -+ gpio_set_value_cansleep(reset_gpio, 1); -+ udelay(1); /* ULPI will assert the DIR line, give it time to do so */ -+ } else { -+ /* GPIO controller is not yet available, try again later. */ -+ if (reset_gpio == -EPROBE_DEFER) { -+ return -EPROBE_DEFER; -+ } -+ } -+ - res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0); - if (IS_ERR(res)) { - dev_err(&ofdev->dev, --- -2.1.1 - diff --git a/recipes-kernel/linux/linux-xlnx_3.14.bb b/recipes-kernel/linux/linux-xlnx_3.14.bb deleted file mode 100644 index c93997e4..00000000 --- a/recipes-kernel/linux/linux-xlnx_3.14.bb +++ /dev/null @@ -1,17 +0,0 @@ -# Kernel version and SRCREV correspond to: xlnx_3.14 branch -LINUX_VERSION = "3.14" -SRCREV ?= "2b48a8aeea7367359f9eebe55c4a09a05227f32b" - -include linux-xlnx.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.14:" -SRC_URI_append = " \ - file://usb-host-zynq-dr-of-PHY-reset-during-probe.patch \ - file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ - file://kernel-add-support-for-gcc-5.patch \ - file://kernel-use-the-gnu89-standard-explicitly.patch \ - " - -# This kernel's Zynq USB driver is different to the newer kernels. -KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc" - -- cgit v1.2.3-54-g00ecf