summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJeff Polk <jeff.polk@windriver.com>2014-03-28 17:42:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-01 23:37:01 +0100
commit3008b12d41c8c16032a9ae15af4ff53bc511aabc (patch)
treeee2c41a9175c158bdd9a4eb6b8471d40013536cd /meta
parentf4dc1e568636f7bfe216f4fb1386bbed4ee305af (diff)
downloadpoky-3008b12d41c8c16032a9ae15af4ff53bc511aabc.tar.gz
qemu: Add addition environment space to boot loader qemu-system-mips
The qemu mips malta base board boot loader uses environment strings with a max length of 256 bytes which is not long enough to accommodate a long NFS path in addition to the normal kernel boot command line arguments. The solution is to expand the environment string length to 1024 bytes. (From OE-Core rev: 1e9e26304b77dd11b30ec983b7fa058378b29c47) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/files/qemu-enlarge-env-entry-size.patch31
-rw-r--r--meta/recipes-devtools/qemu/qemu_1.7.0.bb3
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/files/qemu-enlarge-env-entry-size.patch b/meta/recipes-devtools/qemu/files/qemu-enlarge-env-entry-size.patch
new file mode 100644
index 0000000000..c7425ab8d4
--- /dev/null
+++ b/meta/recipes-devtools/qemu/files/qemu-enlarge-env-entry-size.patch
@@ -0,0 +1,31 @@
1qemu: Add addition environment space to boot loader qemu-system-mips
2
3Upstream-Status: Inappropriate - OE uses deep paths
4
5If you create a project with very long directory names like 128 characters
6deep and use NFS, the kernel arguments will be truncated. The kernel will
7accept longer strings such as 1024 bytes, but the qemu boot loader defaulted
8to only 256 bytes. This patch expands the limit.
9
10Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 hw/mips/mips_malta.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
17index 9d521cc..17c0391 100644
18--- a/hw/mips/mips_malta.c
19+++ b/hw/mips/mips_malta.c
20@@ -53,7 +53,7 @@
21
22 #define ENVP_ADDR 0x80002000l
23 #define ENVP_NB_ENTRIES 16
24-#define ENVP_ENTRY_SIZE 256
25+#define ENVP_ENTRY_SIZE 1024
26
27 /* Hardware addresses */
28 #define FLASH_ADDRESS 0x1e000000ULL
29--
301.7.10.4
31
diff --git a/meta/recipes-devtools/qemu/qemu_1.7.0.bb b/meta/recipes-devtools/qemu/qemu_1.7.0.bb
index c0e8b5523e..be6dd51df4 100644
--- a/meta/recipes-devtools/qemu/qemu_1.7.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.7.0.bb
@@ -3,7 +3,8 @@ require qemu.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6SRC_URI += "file://fxrstorssefix.patch" 6SRC_URI += "file://fxrstorssefix.patch \
7 file://qemu-enlarge-env-entry-size.patch"
7 8
8SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" 9SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
9SRC_URI[md5sum] = "32893941d40d052a5e649efcf06aca06" 10SRC_URI[md5sum] = "32893941d40d052a5e649efcf06aca06"