diff options
| author | Kai Kang <kai.kang@windriver.com> | 2014-12-18 09:36:40 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 08:14:10 +0000 |
| commit | a693ccb1603be1125bea3b254bf4b6c4188890ac (patch) | |
| tree | 2d490567460466c843857e56a241c8eeda2f2bd3 /meta/recipes-devtools/qemu | |
| parent | 223f8dc63385f2a2f5ba009494abce2a26c78090 (diff) | |
| download | openembedded-core-a693ccb1603be1125bea3b254bf4b6c4188890ac.tar.gz openembedded-core-a693ccb1603be1125bea3b254bf4b6c4188890ac.tar.bz2 openembedded-core-a693ccb1603be1125bea3b254bf4b6c4188890ac.zip | |
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu')
| -rw-r--r-- | meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch | 10 | ||||
| -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> Updated it on 2014-01-15 for rebasing Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +Update it when upgrade qemu to 2.2.0 + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- hw/arm/versatilepb.c | 6 ++++++ 1 file changed, 6 insertions(+) @@ -22,7 +26,7 @@ diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index b48d84c..ad2cd5a 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c -@@ -199,6 +199,12 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) +@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id) fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } @@ -32,9 +36,9 @@ index b48d84c..ad2cd5a 100644 + ((unsigned int)ram_size / (1 << 20))); + exit(1); + } - memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size); + memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size, + &error_abort); vmstate_register_ram_global(ram); - /* ??? RAM should repeat to fill physical memory space. */ -- 1.7.10.4 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 \ file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ " SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" -SRC_URI[md5sum] = "0ff197c4ed4b695620bc4734e77c888f" -SRC_URI[sha256sum] = "fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885" +SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" +SRC_URI[sha256sum] = "b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c" COMPATIBLE_HOST_class-target_mips64 = "null" |