summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2014-12-18 09:36:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 17:04:42 +0000
commit39dea062d6ad23d375b0d7ff986600254b21601d (patch)
tree7541977198b2b73622405eb0d13ff73c38eec20b /meta/recipes-devtools
parent5c8ef2bfe2782d849fde7367adf446636696a520 (diff)
downloadpoky-39dea062d6ad23d375b0d7ff986600254b21601d.tar.gz
qemu: upgrade to 2.2.0
Upgrade qemu from version 2.1.2 to 2.2.0. Update Qemu-Arm-versatilepb-Add-memory-size-checking.patch for new version qemu. (From OE-Core rev: a693ccb1603be1125bea3b254bf4b6c4188890ac) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch10
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.2.0.bb (renamed from meta/recipes-devtools/qemu/qemu_2.1.2.bb)4
2 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
index 7f1c5a9058..b0c2ea5be9 100644
--- a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
+++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch
@@ -14,6 +14,10 @@ Signed-off-by: Jiang Lu <lu.jiang@windriver.com>
14Updated it on 2014-01-15 for rebasing 14Updated it on 2014-01-15 for rebasing
15 15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17
18Update it when upgrade qemu to 2.2.0
19
20Signed-off-by: Kai Kang <kai.kang@windriver.com>
17--- 21---
18 hw/arm/versatilepb.c | 6 ++++++ 22 hw/arm/versatilepb.c | 6 ++++++
19 1 file changed, 6 insertions(+) 23 1 file changed, 6 insertions(+)
@@ -22,7 +26,7 @@ diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
22index b48d84c..ad2cd5a 100644 26index b48d84c..ad2cd5a 100644
23--- a/hw/arm/versatilepb.c 27--- a/hw/arm/versatilepb.c
24+++ b/hw/arm/versatilepb.c 28+++ b/hw/arm/versatilepb.c
25@@ -199,6 +199,12 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) 29@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id)
26 fprintf(stderr, "Unable to find CPU definition\n"); 30 fprintf(stderr, "Unable to find CPU definition\n");
27 exit(1); 31 exit(1);
28 } 32 }
@@ -32,9 +36,9 @@ index b48d84c..ad2cd5a 100644
32+ ((unsigned int)ram_size / (1 << 20))); 36+ ((unsigned int)ram_size / (1 << 20)));
33+ exit(1); 37+ exit(1);
34+ } 38+ }
35 memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size); 39 memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size,
40 &error_abort);
36 vmstate_register_ram_global(ram); 41 vmstate_register_ram_global(ram);
37 /* ??? RAM should repeat to fill physical memory space. */
38-- 42--
391.7.10.4 431.7.10.4
40 44
diff --git a/meta/recipes-devtools/qemu/qemu_2.1.2.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
index 55ae7b60a6..209b910103 100644
--- a/meta/recipes-devtools/qemu/qemu_2.1.2.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
@@ -8,8 +8,8 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ 8 file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
9 " 9 "
10SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 10SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
11SRC_URI[md5sum] = "0ff197c4ed4b695620bc4734e77c888f" 11SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8"
12SRC_URI[sha256sum] = "fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885" 12SRC_URI[sha256sum] = "b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c"
13 13
14COMPATIBLE_HOST_class-target_mips64 = "null" 14COMPATIBLE_HOST_class-target_mips64 = "null"
15 15