From 2a5de74e4e49cccb9e7eb3de24297c4cb9436102 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 24 Feb 2015 10:23:38 +1000 Subject: linux-yocto: Remove 3.10 and 3.17 appends * The linux-yocto 3.10 and 3.17 kernels are no longer available Signed-off-by: Nathan Rossi --- ...-RX-hang-and-TX-corruption-in-set_termios.patch | 34 ----------- .../218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch | 32 ---------- .../7f15a256b556bf26780d7a0bd03c88914a852022.patch | 44 -------------- .../99399545d62533b4ae742190b5c6b11f7a5826d9.patch | 46 -------------- .../ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch | 70 ---------------------- ...-RX-hang-and-TX-corruption-in-set_termios.patch | 34 ----------- recipes-kernel/linux/linux-yocto_3.10.bbappend | 18 ------ recipes-kernel/linux/linux-yocto_3.17.bbappend | 9 --- 8 files changed, 287 deletions(-) delete mode 100644 recipes-kernel/linux/linux-xlnx/3.17/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch delete mode 100644 recipes-kernel/linux/linux-yocto/3.10/218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch delete mode 100644 recipes-kernel/linux/linux-yocto/3.10/7f15a256b556bf26780d7a0bd03c88914a852022.patch delete mode 100644 recipes-kernel/linux/linux-yocto/3.10/99399545d62533b4ae742190b5c6b11f7a5826d9.patch delete mode 100644 recipes-kernel/linux/linux-yocto/3.10/ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch delete mode 100644 recipes-kernel/linux/linux-yocto/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch delete mode 100644 recipes-kernel/linux/linux-yocto_3.10.bbappend delete mode 100644 recipes-kernel/linux/linux-yocto_3.17.bbappend diff --git a/recipes-kernel/linux/linux-xlnx/3.17/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch b/recipes-kernel/linux/linux-xlnx/3.17/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch deleted file mode 100644 index 4ac6624d..00000000 --- a/recipes-kernel/linux/linux-xlnx/3.17/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c3181f01d21953bff9971e141a193c445099e90f 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 | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c -index 7f8027f..74dd5c9 100644 ---- a/drivers/tty/serial/xilinx_uartps.c -+++ b/drivers/tty/serial/xilinx_uartps.c -@@ -628,10 +628,12 @@ static void cdns_uart_set_termios(struct uart_port *port, - - spin_lock_irqsave(&port->lock, flags); - -- /* Empty the receive FIFO 1st before making changes */ -- while ((cdns_uart_readl(CDNS_UART_SR_OFFSET) & -- CDNS_UART_SR_RXEMPTY) != CDNS_UART_SR_RXEMPTY) { -- cdns_uart_readl(CDNS_UART_FIFO_OFFSET); -+ /* Wait for the transmit FIFO to empty before making changes */ -+ if (!(cdns_uart_readl(CDNS_UART_CR_OFFSET) & CDNS_UART_CR_TX_DIS)) { -+ while (!(cdns_uart_readl(CDNS_UART_SR_OFFSET) & -+ CDNS_UART_SR_TXEMPTY)) { -+ cpu_relax(); -+ } - } - - /* Disable the TX and RX to set baud rate */ --- -2.1.1 - diff --git a/recipes-kernel/linux/linux-yocto/3.10/218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch b/recipes-kernel/linux/linux-yocto/3.10/218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch deleted file mode 100644 index 9f113815..00000000 --- a/recipes-kernel/linux/linux-yocto/3.10/218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 218a12f1f41f6fdce18d084e5ddd3c6439db0983 Mon Sep 17 00:00:00 2001 -From: Graeme Smecher -Date: Sat, 8 Jun 2013 09:52:08 -0700 -Subject: microblaze: Don't mark arch_kgdb_ops as const. - -Other architectures don't do it, and it conflicts with the extern'd definition -in include/linux/kgdb.h. - -The patch fails checkpatch but it reflects current -functions declaration and solved compilation error. - -Signed-off-by: Graeme Smecher -CC: Michal Simek -CC: linux-kernel@vger.kernel.org -Signed-off-by: Michal Simek -Upstream-Status: Backport ---- -diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c -index 8adc9244..09a5e82 100644 ---- a/arch/microblaze/kernel/kgdb.c -+++ b/arch/microblaze/kernel/kgdb.c -@@ -141,7 +141,7 @@ void kgdb_arch_exit(void) - /* - * Global data - */ --const struct kgdb_arch arch_kgdb_ops = { -+struct kgdb_arch arch_kgdb_ops = { - #ifdef __MICROBLAZEEL__ - .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */ - #else --- - diff --git a/recipes-kernel/linux/linux-yocto/3.10/7f15a256b556bf26780d7a0bd03c88914a852022.patch b/recipes-kernel/linux/linux-yocto/3.10/7f15a256b556bf26780d7a0bd03c88914a852022.patch deleted file mode 100644 index 509b1f17..00000000 --- a/recipes-kernel/linux/linux-yocto/3.10/7f15a256b556bf26780d7a0bd03c88914a852022.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7f15a256b556bf26780d7a0bd03c88914a852022 Mon Sep 17 00:00:00 2001 -From: Michal Simek -Date: Wed, 6 Nov 2013 16:36:08 +0100 -Subject: microblaze: Calculate kernel pad automatically - -The kernel needs to setup the first two tlbs with pad -which is used for early page allocation which is used -by mapin_ram() to allocate tables for lowmem memory -before memory initialisation is done. -Calculate pad directly from lowmem size. - -Signed-off-by: Michal Simek -Upstream-Status: Backport ---- -diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig -index d8ec74b..655e1ca 100644 ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -245,10 +245,6 @@ config MICROBLAZE_64K_PAGES - - endchoice - --config KERNEL_PAD -- hex "Kernel PAD for unpacking" if ADVANCED_OPTIONS -- default "0x80000" if MMU -- - endmenu - - source "mm/Kconfig" -diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S -index fcc797f..817b7ee 100644 ---- a/arch/microblaze/kernel/head.S -+++ b/arch/microblaze/kernel/head.S -@@ -176,7 +176,7 @@ _invalidate: - /* start to do TLB calculation */ - addik r12, r0, _end - rsub r12, r3, r12 -- addik r12, r12, CONFIG_KERNEL_PAD /* that's the pad */ -+ addik r12, r12, CONFIG_LOWMEM_SIZE >> PTE_SHIFT /* that's the pad */ - - or r9, r0, r0 /* TLB0 = 0 */ - or r10, r0, r0 /* TLB1 = 0 */ --- - diff --git a/recipes-kernel/linux/linux-yocto/3.10/99399545d62533b4ae742190b5c6b11f7a5826d9.patch b/recipes-kernel/linux/linux-yocto/3.10/99399545d62533b4ae742190b5c6b11f7a5826d9.patch deleted file mode 100644 index e81caf11..00000000 --- a/recipes-kernel/linux/linux-yocto/3.10/99399545d62533b4ae742190b5c6b11f7a5826d9.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 99399545d62533b4ae742190b5c6b11f7a5826d9 Mon Sep 17 00:00:00 2001 -From: Michal Simek -Date: Mon, 16 Sep 2013 07:46:23 +0200 -Subject: microblaze: Fix bug with mmap2 syscall MB implementation - -Fix mmap2 behaviour which incorrectly works with pgoff -not in 4k units. - -Reported-by: Rich Felker -Signed-off-by: Michal Simek -Upstream-Status: Backport ---- -diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c -index e80a6c0..f1e1f66 100644 ---- a/arch/microblaze/kernel/sys_microblaze.c -+++ b/arch/microblaze/kernel/sys_microblaze.c -@@ -42,3 +42,14 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, - - return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT); - } -+ -+SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len, -+ unsigned long, prot, unsigned long, flags, unsigned long, fd, -+ unsigned long, pgoff) -+{ -+ if (pgoff & (~PAGE_MASK >> 12)) -+ return -EINVAL; -+ -+ return sys_mmap_pgoff(addr, len, prot, flags, fd, -+ pgoff >> (PAGE_SHIFT - 12)); -+} -diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S -index 4fca56c..b882ad5 100644 ---- a/arch/microblaze/kernel/syscall_table.S -+++ b/arch/microblaze/kernel/syscall_table.S -@@ -192,7 +192,7 @@ ENTRY(sys_call_table) - .long sys_ni_syscall /* reserved for streams2 */ - .long sys_vfork /* 190 */ - .long sys_getrlimit -- .long sys_mmap_pgoff /* mmap2 */ -+ .long sys_mmap2 - .long sys_truncate64 - .long sys_ftruncate64 - .long sys_stat64 /* 195 */ --- - diff --git a/recipes-kernel/linux/linux-yocto/3.10/ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch b/recipes-kernel/linux/linux-yocto/3.10/ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch deleted file mode 100644 index de2df302..00000000 --- a/recipes-kernel/linux/linux-yocto/3.10/ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ec2eba55f0c0e74dd39aca14dcc597583cf1eb67 Mon Sep 17 00:00:00 2001 -From: Jason Wu -Date: Wed, 21 Aug 2013 07:10:32 +0200 -Subject: [PATCH] microblaze: Add linux.bin.ub target - -Currently the linux.bin target creates both linux.bin and linux.bin.ub. -Add linux.bin.ub as separate target to generate linux.bin.ub. - -Signed-off-by: Jason Wu -Signed-off-by: Michal Simek -Upstream-Status: Backport ---- - arch/microblaze/Makefile | 3 ++- - arch/microblaze/boot/Makefile | 7 ++++--- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile -index 0a603d3..40350a3 100644 ---- a/arch/microblaze/Makefile -+++ b/arch/microblaze/Makefile -@@ -72,7 +72,7 @@ all: linux.bin - archclean: - $(Q)$(MAKE) $(clean)=$(boot) - --linux.bin linux.bin.gz: vmlinux -+linux.bin linux.bin.gz linux.bin.ub: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - - simpleImage.%: vmlinux -@@ -81,6 +81,7 @@ simpleImage.%: vmlinux - define archhelp - echo '* linux.bin - Create raw binary' - echo ' linux.bin.gz - Create compressed raw binary' -+ echo ' linux.bin.ub - Create U-Boot wrapped raw binary' - echo ' simpleImage.
- ELF image with $(arch)/boot/dts/
.dts linked in' - echo ' - stripped elf with fdt blob' - echo ' simpleImage.
.unstrip - full ELF image with fdt blob' -diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile -index 80fe54f..8e211cc 100644 ---- a/arch/microblaze/boot/Makefile -+++ b/arch/microblaze/boot/Makefile -@@ -2,12 +2,15 @@ - # arch/microblaze/boot/Makefile - # - --targets := linux.bin linux.bin.gz simpleImage.% -+targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.% - - OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary - - $(obj)/linux.bin: vmlinux FORCE - $(call if_changed,objcopy) -+ @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' -+ -+$(obj)/linux.bin.ub: $(obj)/linux.bin FORCE - $(call if_changed,uimage) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' - -@@ -22,8 +25,6 @@ quiet_cmd_strip = STRIP $@ - cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \ - -K _fdt_start vmlinux -o $@ - --UIMAGE_IN = $@ --UIMAGE_OUT = $@.ub - UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR) - - $(obj)/simpleImage.%: vmlinux FORCE --- -1.8.5.5 - diff --git a/recipes-kernel/linux/linux-yocto/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch b/recipes-kernel/linux/linux-yocto/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch deleted file mode 100644 index ea6bbe6b..00000000 --- a/recipes-kernel/linux/linux-yocto/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4cbf3473ca25ac47d2d1e43113afce961d057b87 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 | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c -index e46e9f3..eb00754 100644 ---- a/drivers/tty/serial/xilinx_uartps.c -+++ b/drivers/tty/serial/xilinx_uartps.c -@@ -646,10 +646,12 @@ 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-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index 1ddb2978..00000000 --- a/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ /dev/null @@ -1,18 +0,0 @@ - -require linux-xilinx-configs.inc -require linux-xilinx-machines.inc - -# The MACB driver is non-functional in the 3.10 kernel -KERNEL_FEATURES_append_zynq += "features/xilinx/disable-macb.scc" - -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto/3.10:" -SRC_URI_append_microblaze += " \ - file://ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch \ - file://218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch \ - file://7f15a256b556bf26780d7a0bd03c88914a852022.patch \ - file://99399545d62533b4ae742190b5c6b11f7a5826d9.patch \ - " -SRC_URI_append_zynq += " \ - file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ - " - diff --git a/recipes-kernel/linux/linux-yocto_3.17.bbappend b/recipes-kernel/linux/linux-yocto_3.17.bbappend deleted file mode 100644 index f62d2ddc..00000000 --- a/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ /dev/null @@ -1,9 +0,0 @@ - -require linux-xilinx-configs.inc -require linux-xilinx-machines.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.17:" -SRC_URI_append_zynq += " \ - file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ - " - -- cgit v1.2.3-54-g00ecf