summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorQuanyang Wang <quanyang.wang@windriver.com>2015-07-17 10:58:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-20 10:40:42 +0100
commit557bca8dd39bc966d6fb07e8d6ebb5fa897566a2 (patch)
tree40962915a8c3009087f61d5628c4bbbf6218c5d1 /meta
parentc49cfc2b2001615abffd8610e55654078edb8239 (diff)
downloadpoky-557bca8dd39bc966d6fb07e8d6ebb5fa897566a2.tar.gz
kexec-tools: change powerpc memory size limit
When run "kexec" in powerpc board, the kexec has a limit that the kernel text and bss size must be less than 24M. But now some kernel size exceed the limit. So we need to change the limit, else will get the error log as below: my_load:669: do Could not find a free area of memory of 0x12400 bytes... Could not find a free area of memory of 0x13000 bytes... locate_hole failed (From OE-Core rev: 8458910b3524eeb5164137332f60ba40247c33fa) Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch38
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch b/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
new file mode 100644
index 0000000000..d6b6383c70
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
@@ -0,0 +1,38 @@
1From b19b68eab567aa534cf8dec79fe18e3dc0e14043 Mon Sep 17 00:00:00 2001
2From: Quanyang Wang <quanyang.wang@windriver.com>
3Date: Tue, 16 Jun 2015 12:59:57 +0800
4Subject: [PATCH] powerpc: change the memory size limit
5
6When run "kexec" in powerpc board, the kexec has a limit that
7the kernel text and bss size must be less than 24M. But now
8some kernel size exceed the limit. So we need to change the limit,
9else will get the error log as below:
10
11my_load:669: do
12Could not find a free area of memory of 0x12400 bytes...
13Could not find a free area of memory of 0x13000 bytes...
14locate_hole failed
15
16Upstream-Status: Pending
17
18Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
19---
20 kexec/arch/ppc/kexec-ppc.h | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/kexec/arch/ppc/kexec-ppc.h b/kexec/arch/ppc/kexec-ppc.h
24index 904cf48..a097ecd 100644
25--- a/kexec/arch/ppc/kexec-ppc.h
26+++ b/kexec/arch/ppc/kexec-ppc.h
27@@ -42,7 +42,7 @@ void dol_ppc_usage(void);
28 * During inital setup the kernel does not map the whole memory but a part of
29 * it. On Book-E that is 64MiB, 601 24MiB or 256MiB (if possible).
30 */
31-#define KERNEL_ACCESS_TOP (24 * 1024 * 1024)
32+#define KERNEL_ACCESS_TOP (36 * 1024 * 1024)
33
34 /* boot block version 17 as defined by the linux kernel */
35 struct bootblock {
36--
371.9.1
38
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb
index db5649b506..6164ff507a 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
6 file://kexec-aarch64.patch \ 6 file://kexec-aarch64.patch \
7 file://kexec-x32.patch \ 7 file://kexec-x32.patch \
8 file://0001-purgatory-Disabling-GCC-s-stack-protection.patch \ 8 file://0001-purgatory-Disabling-GCC-s-stack-protection.patch \
9 file://0002-powerpc-change-the-memory-size-limit.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "4ecb7ab7ad9eb6ce413899bdb07a8426" 12SRC_URI[md5sum] = "4ecb7ab7ad9eb6ce413899bdb07a8426"