summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-02-24 10:23:38 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-02-24 10:23:38 +1000
commit2a5de74e4e49cccb9e7eb3de24297c4cb9436102 (patch)
tree5724980940dec4f6baa493bf588225f289d778f3
parent968bb0b29ce7ef020dd6b4f405152797c436f54a (diff)
downloadmeta-xilinx-2a5de74e4e49cccb9e7eb3de24297c4cb9436102.tar.gz
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 <nathan.rossi@xilinx.com>
Diffstat
-rw-r--r--recipes-kernel/linux/linux-xlnx/3.17/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch34
-rw-r--r--recipes-kernel/linux/linux-yocto/3.10/218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch32
-rw-r--r--recipes-kernel/linux/linux-yocto/3.10/7f15a256b556bf26780d7a0bd03c88914a852022.patch44
-rw-r--r--recipes-kernel/linux/linux-yocto/3.10/99399545d62533b4ae742190b5c6b11f7a5826d9.patch46
-rw-r--r--recipes-kernel/linux/linux-yocto/3.10/ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch70
-rw-r--r--recipes-kernel/linux/linux-yocto/3.10/tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch34
-rw-r--r--recipes-kernel/linux/linux-yocto_3.10.bbappend18
-rw-r--r--recipes-kernel/linux/linux-yocto_3.17.bbappend9
8 files changed, 0 insertions, 287 deletions
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 @@
1From c3181f01d21953bff9971e141a193c445099e90f Mon Sep 17 00:00:00 2001
2From: Nathan Rossi <nathan.rossi@xilinx.com>
3Date: Mon, 24 Nov 2014 15:11:43 +1000
4Subject: [PATCH] tty: xuartps: Fix RX hang, and TX corruption in set_termios
5
6Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
7---
8 drivers/tty/serial/xilinx_uartps.c | 10 ++++++----
9 1 file changed, 6 insertions(+), 4 deletions(-)
10
11diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
12index 7f8027f..74dd5c9 100644
13--- a/drivers/tty/serial/xilinx_uartps.c
14+++ b/drivers/tty/serial/xilinx_uartps.c
15@@ -628,10 +628,12 @@ static void cdns_uart_set_termios(struct uart_port *port,
16
17 spin_lock_irqsave(&port->lock, flags);
18
19- /* Empty the receive FIFO 1st before making changes */
20- while ((cdns_uart_readl(CDNS_UART_SR_OFFSET) &
21- CDNS_UART_SR_RXEMPTY) != CDNS_UART_SR_RXEMPTY) {
22- cdns_uart_readl(CDNS_UART_FIFO_OFFSET);
23+ /* Wait for the transmit FIFO to empty before making changes */
24+ if (!(cdns_uart_readl(CDNS_UART_CR_OFFSET) & CDNS_UART_CR_TX_DIS)) {
25+ while (!(cdns_uart_readl(CDNS_UART_SR_OFFSET) &
26+ CDNS_UART_SR_TXEMPTY)) {
27+ cpu_relax();
28+ }
29 }
30
31 /* Disable the TX and RX to set baud rate */
32--
332.1.1
34
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 @@
1From 218a12f1f41f6fdce18d084e5ddd3c6439db0983 Mon Sep 17 00:00:00 2001
2From: Graeme Smecher <gsmecher@threespeedlogic.com>
3Date: Sat, 8 Jun 2013 09:52:08 -0700
4Subject: microblaze: Don't mark arch_kgdb_ops as const.
5
6Other architectures don't do it, and it conflicts with the extern'd definition
7in include/linux/kgdb.h.
8
9The patch fails checkpatch but it reflects current
10functions declaration and solved compilation error.
11
12Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com>
13CC: Michal Simek <monstr@monstr.eu>
14CC: linux-kernel@vger.kernel.org
15Signed-off-by: Michal Simek <michal.simek@xilinx.com>
16Upstream-Status: Backport
17---
18diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c
19index 8adc9244..09a5e82 100644
20--- a/arch/microblaze/kernel/kgdb.c
21+++ b/arch/microblaze/kernel/kgdb.c
22@@ -141,7 +141,7 @@ void kgdb_arch_exit(void)
23 /*
24 * Global data
25 */
26-const struct kgdb_arch arch_kgdb_ops = {
27+struct kgdb_arch arch_kgdb_ops = {
28 #ifdef __MICROBLAZEEL__
29 .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
30 #else
31--
32
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 @@
1From 7f15a256b556bf26780d7a0bd03c88914a852022 Mon Sep 17 00:00:00 2001
2From: Michal Simek <michal.simek@xilinx.com>
3Date: Wed, 6 Nov 2013 16:36:08 +0100
4Subject: microblaze: Calculate kernel pad automatically
5
6The kernel needs to setup the first two tlbs with pad
7which is used for early page allocation which is used
8by mapin_ram() to allocate tables for lowmem memory
9before memory initialisation is done.
10Calculate pad directly from lowmem size.
11
12Signed-off-by: Michal Simek <michal.simek@xilinx.com>
13Upstream-Status: Backport
14---
15diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
16index d8ec74b..655e1ca 100644
17--- a/arch/microblaze/Kconfig
18+++ b/arch/microblaze/Kconfig
19@@ -245,10 +245,6 @@ config MICROBLAZE_64K_PAGES
20
21 endchoice
22
23-config KERNEL_PAD
24- hex "Kernel PAD for unpacking" if ADVANCED_OPTIONS
25- default "0x80000" if MMU
26-
27 endmenu
28
29 source "mm/Kconfig"
30diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S
31index fcc797f..817b7ee 100644
32--- a/arch/microblaze/kernel/head.S
33+++ b/arch/microblaze/kernel/head.S
34@@ -176,7 +176,7 @@ _invalidate:
35 /* start to do TLB calculation */
36 addik r12, r0, _end
37 rsub r12, r3, r12
38- addik r12, r12, CONFIG_KERNEL_PAD /* that's the pad */
39+ addik r12, r12, CONFIG_LOWMEM_SIZE >> PTE_SHIFT /* that's the pad */
40
41 or r9, r0, r0 /* TLB0 = 0 */
42 or r10, r0, r0 /* TLB1 = 0 */
43--
44
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 @@
1From 99399545d62533b4ae742190b5c6b11f7a5826d9 Mon Sep 17 00:00:00 2001
2From: Michal Simek <michal.simek@xilinx.com>
3Date: Mon, 16 Sep 2013 07:46:23 +0200
4Subject: microblaze: Fix bug with mmap2 syscall MB implementation
5
6Fix mmap2 behaviour which incorrectly works with pgoff
7not in 4k units.
8
9Reported-by: Rich Felker <dalias@aerifal.cx>
10Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11Upstream-Status: Backport
12---
13diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c
14index e80a6c0..f1e1f66 100644
15--- a/arch/microblaze/kernel/sys_microblaze.c
16+++ b/arch/microblaze/kernel/sys_microblaze.c
17@@ -42,3 +42,14 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
18
19 return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
20 }
21+
22+SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,
23+ unsigned long, prot, unsigned long, flags, unsigned long, fd,
24+ unsigned long, pgoff)
25+{
26+ if (pgoff & (~PAGE_MASK >> 12))
27+ return -EINVAL;
28+
29+ return sys_mmap_pgoff(addr, len, prot, flags, fd,
30+ pgoff >> (PAGE_SHIFT - 12));
31+}
32diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
33index 4fca56c..b882ad5 100644
34--- a/arch/microblaze/kernel/syscall_table.S
35+++ b/arch/microblaze/kernel/syscall_table.S
36@@ -192,7 +192,7 @@ ENTRY(sys_call_table)
37 .long sys_ni_syscall /* reserved for streams2 */
38 .long sys_vfork /* 190 */
39 .long sys_getrlimit
40- .long sys_mmap_pgoff /* mmap2 */
41+ .long sys_mmap2
42 .long sys_truncate64
43 .long sys_ftruncate64
44 .long sys_stat64 /* 195 */
45--
46
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 @@
1From ec2eba55f0c0e74dd39aca14dcc597583cf1eb67 Mon Sep 17 00:00:00 2001
2From: Jason Wu <huanyu@xilinx.com>
3Date: Wed, 21 Aug 2013 07:10:32 +0200
4Subject: [PATCH] microblaze: Add linux.bin.ub target
5
6Currently the linux.bin target creates both linux.bin and linux.bin.ub.
7Add linux.bin.ub as separate target to generate linux.bin.ub.
8
9Signed-off-by: Jason Wu <huanyu@xilinx.com>
10Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11Upstream-Status: Backport
12---
13 arch/microblaze/Makefile | 3 ++-
14 arch/microblaze/boot/Makefile | 7 ++++---
15 2 files changed, 6 insertions(+), 4 deletions(-)
16
17diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
18index 0a603d3..40350a3 100644
19--- a/arch/microblaze/Makefile
20+++ b/arch/microblaze/Makefile
21@@ -72,7 +72,7 @@ all: linux.bin
22 archclean:
23 $(Q)$(MAKE) $(clean)=$(boot)
24
25-linux.bin linux.bin.gz: vmlinux
26+linux.bin linux.bin.gz linux.bin.ub: vmlinux
27 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
28
29 simpleImage.%: vmlinux
30@@ -81,6 +81,7 @@ simpleImage.%: vmlinux
31 define archhelp
32 echo '* linux.bin - Create raw binary'
33 echo ' linux.bin.gz - Create compressed raw binary'
34+ echo ' linux.bin.ub - Create U-Boot wrapped raw binary'
35 echo ' simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in'
36 echo ' - stripped elf with fdt blob'
37 echo ' simpleImage.<dt>.unstrip - full ELF image with fdt blob'
38diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
39index 80fe54f..8e211cc 100644
40--- a/arch/microblaze/boot/Makefile
41+++ b/arch/microblaze/boot/Makefile
42@@ -2,12 +2,15 @@
43 # arch/microblaze/boot/Makefile
44 #
45
46-targets := linux.bin linux.bin.gz simpleImage.%
47+targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.%
48
49 OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary
50
51 $(obj)/linux.bin: vmlinux FORCE
52 $(call if_changed,objcopy)
53+ @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
54+
55+$(obj)/linux.bin.ub: $(obj)/linux.bin FORCE
56 $(call if_changed,uimage)
57 @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
58
59@@ -22,8 +25,6 @@ quiet_cmd_strip = STRIP $@
60 cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
61 -K _fdt_start vmlinux -o $@
62
63-UIMAGE_IN = $@
64-UIMAGE_OUT = $@.ub
65 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)
66
67 $(obj)/simpleImage.%: vmlinux FORCE
68--
691.8.5.5
70
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 @@
1From 4cbf3473ca25ac47d2d1e43113afce961d057b87 Mon Sep 17 00:00:00 2001
2From: Nathan Rossi <nathan.rossi@xilinx.com>
3Date: Mon, 24 Nov 2014 15:11:43 +1000
4Subject: [PATCH] tty: xuartps: Fix RX hang, and TX corruption in set_termios
5
6Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
7---
8 drivers/tty/serial/xilinx_uartps.c | 10 ++++++----
9 1 file changed, 6 insertions(+), 4 deletions(-)
10
11diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
12index e46e9f3..eb00754 100644
13--- a/drivers/tty/serial/xilinx_uartps.c
14+++ b/drivers/tty/serial/xilinx_uartps.c
15@@ -646,10 +646,12 @@ static void xuartps_set_termios(struct uart_port *port,
16
17 spin_lock_irqsave(&port->lock, flags);
18
19- /* Empty the receive FIFO 1st before making changes */
20- while ((xuartps_readl(XUARTPS_SR_OFFSET) &
21- XUARTPS_SR_RXEMPTY) != XUARTPS_SR_RXEMPTY) {
22- xuartps_readl(XUARTPS_FIFO_OFFSET);
23+ /* Wait for the transmit FIFO to empty before making changes */
24+ if (!(xuartps_readl(XUARTPS_CR_OFFSET) & XUARTPS_CR_TX_DIS)) {
25+ while (!(xuartps_readl(XUARTPS_SR_OFFSET) &
26+ XUARTPS_SR_TXEMPTY)) {
27+ cpu_relax();
28+ }
29 }
30
31 /* Disable the TX and RX to set baud rate */
32--
332.1.1
34
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 @@
1
2require linux-xilinx-configs.inc
3require linux-xilinx-machines.inc
4
5# The MACB driver is non-functional in the 3.10 kernel
6KERNEL_FEATURES_append_zynq += "features/xilinx/disable-macb.scc"
7
8FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto/3.10:"
9SRC_URI_append_microblaze += " \
10 file://ec2eba55f0c0e74dd39aca14dcc597583cf1eb67.patch \
11 file://218a12f1f41f6fdce18d084e5ddd3c6439db0983.patch \
12 file://7f15a256b556bf26780d7a0bd03c88914a852022.patch \
13 file://99399545d62533b4ae742190b5c6b11f7a5826d9.patch \
14 "
15SRC_URI_append_zynq += " \
16 file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \
17 "
18
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 @@
1
2require linux-xilinx-configs.inc
3require linux-xilinx-machines.inc
4
5FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.17:"
6SRC_URI_append_zynq += " \
7 file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \
8 "
9
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-26 10:33:13 +0000