summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-03-31 21:28:35 +1000
committerNathan Rossi <nathan@nathanrossi.com>2017-03-31 21:28:35 +1000
commitf17852607bc73aea32fb10e089ac441fe7413397 (patch)
treec654757548aa7a9e174907ecf5e3fb9282fd938a
parent8944160a3876388e08494b350a796d08738e8478 (diff)
downloadmeta-xilinx-f17852607bc73aea32fb10e089ac441fe7413397.tar.gz
linux: Drop unused patch
This was only used for linux-yocto 4.8 kernels, and is no longer used. So remove it. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--recipes-kernel/linux/linux/ARM-zynq-Reserve-correct-amount-of-non-DMA-RAM.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/recipes-kernel/linux/linux/ARM-zynq-Reserve-correct-amount-of-non-DMA-RAM.patch b/recipes-kernel/linux/linux/ARM-zynq-Reserve-correct-amount-of-non-DMA-RAM.patch
deleted file mode 100644
index 9aa014b7..00000000
--- a/recipes-kernel/linux/linux/ARM-zynq-Reserve-correct-amount-of-non-DMA-RAM.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 06305673edf7adc6b035f81f727bdcb18ff6fe9b Mon Sep 17 00:00:00 2001
2From: Kyle Roeschley <kyle.roeschley@ni.com>
3Date: Mon, 31 Oct 2016 11:26:17 -0500
4Subject: [PATCH] ARM: zynq: Reserve correct amount of non-DMA RAM
5
6On Zynq, we haven't been reserving the correct amount of DMA-incapable
7RAM to keep DMA away from it (per the Zynq TRM Section 4.1, it should be
8the first 512k). In older kernels, this was masked by the
9memblock_reserve call in arm_memblock_init(). Now, reserve the correct
10amount excplicitly rather than relying on swapper_pg_dir, which is an
11address and not a size anyway.
12
13Fixes: 46f5b96 ("ARM: zynq: Reserve not DMAable space in front of the
14kernel")
15
16Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
17Tested-by: Nathan Rossi <nathan@nathanrossi.com>
18Signed-off-by: Michal Simek <michal.simek@xilinx.com>
19Upstream-Status: Backport [from v4.10, 7a3cc2a7b2]
20---
21 arch/arm/mach-zynq/common.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
25index d12002cd63..ed11864831 100644
26--- a/arch/arm/mach-zynq/common.c
27+++ b/arch/arm/mach-zynq/common.c
28@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;
29 static void __init zynq_memory_init(void)
30 {
31 if (!__pa(PAGE_OFFSET))
32- memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));
33+ memblock_reserve(__pa(PAGE_OFFSET), 0x80000);
34 }
35
36 static struct platform_device zynq_cpuidle_device = {
37--
382.11.0
39