summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2014-12-15 16:11:05 -0800
committerPalmer Dabbelt <palmer@dabbelt.com>2014-12-15 16:11:05 -0800
commit1cc1542ee16982e75702e1b32d7fadafd780ff6c (patch)
tree3bd7d776d64f9a95f64961a8b10c87bb683169ac
parentActually apply the RISC-V patch (diff)
downloadpalmer-1cc1542ee16982e75702e1b32d7fadafd780ff6c.tar.gz
palmer-1cc1542ee16982e75702e1b32d7fadafd780ff6c.tar.bz2
palmer-1cc1542ee16982e75702e1b32d7fadafd780ff6c.zip
Add another QEMU patch
-rw-r--r--app-emulation/qemu/Manifest2
-rw-r--r--app-emulation/qemu/files/qemu-2.1.2-riscv.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 9b4c1a5..42ba37b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,7 +2,7 @@ AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd50070
AUX bridge.conf 454 SHA256 a51850dd39923f3482e4c575b48ad9fef9c9ebb2f2176225da399b79ce48c69d SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533 WHIRLPOOL 8fcbd4abf9b8f7ca3d16fe0eaf17196ebf708dfecf85ce0f020e0de22b64905114f7b310f361826c81bb961c6b1bbbf984bff1e595bb949993b8966ccb222c35
AUX qemu-1.7.0-cflags.patch 300 SHA256 8f35e55c4bae93e82f9580eabe2d6a2d4660bd05343e1f4e6c33815deeede91e SHA512 54446cb555b623b2306f8a323713e4dfb1b8b7bbf3af3771d5b62e164e0672cc21cbe44f08ca8b58052523e8d629e16355a44ebb544a999a44d11ac3af671f1c WHIRLPOOL b903b4abefeeb09a2ab2d1ee224de5d3694f99f50aacfe33882fce0c1c87c23dae4d57b001d1c35cc96fffa93d43fac4a8ab30a3e45fe1f380580162c0332e78
AUX qemu-2.1.1-readlink-self.patch 2933 SHA256 3133ec1a0f0126d3362c9420602a1fdfc76fafacac8b41f5bd755e7542ee4188 SHA512 7ee06e119007e6dc08f254cbfdcc6de1c914181f60e69434190fe507a80b7d0f9e8682f0213d447481f39e145fcb0be2e118516238addb5c4326533fc0db143f WHIRLPOOL 54edcb4510546c69dedf78a2070f22e7ef2809b35a66dc2e5d356f2f1b22eea8baa5b17ed4a4d9860ee6b864fac92eb9d1bbb6daeb6e2d80e3cc702f32039996
-AUX qemu-2.1.2-riscv.patch 437103 SHA256 5dc2a7d6b719622c14f1dc59a097c03a4e98440b8c75bf082e79bc3fd8877658 SHA512 81decf6765e88c555ac3a4dc0a048c680601fd0da73cabb529956d14839764c4b3de2a8bfb520ed4712aa4667be002a7aa47a63da0ef6d6d3b9da6e72639bdba WHIRLPOOL c14f79c8015cac5d313cd37cb7740fe01efa422c4ea4d04084467a9a2f71b9c0487bab7a2833d6a0921eb42fc3fdcec32942ff1401152d9163413d7bec311848
+AUX qemu-2.1.2-riscv.patch 437103 SHA256 92a07ff417bc2d226c6a05b808e23dfd81e66387ea2a776a97649ea6df864c8c SHA512 0cc5a49ccced184a93d7ea4fe540ffe529e622b5705289fe4c0fca62df70797098a057d939fb7425cd97c69cc23e4f0bd6ed4538be9ca90c0b92c2506b8b1c62 WHIRLPOOL e3a875d25f5329c1090c8581b53848e9d9b5bee36ce181e093c7237f9fd804a502720514dd3a4160af0c63cd68af2d02c53b9f148af0a663adb22775e9559515
AUX qemu-2.1.2-vnc-sanitize-bits.patch 1279 SHA256 ef1e748fd9ffa0eb8ef412e6ea3cc96522e0ca91cf7201e6702d260ca50cbac5 SHA512 7e1a744928eb8edb76b18e58cf94da38ad1030f49ceb38f5e081d852573f8f314f998639c8e97fee27a53f51abe495b27406daa02b670a620ab2db165a47429e WHIRLPOOL bc024286739b56038bfebd6c2ad71addd9565a833f21a7a48cadbe7403c3e93c889cb2223d044448634cc93b6dc45a268299ea1b5b18c09b3477bb6e12fb0506
AUX qemu-9999-cflags.patch 347 SHA256 fe3bcbe83e81225b2c722578a0a976fcb724419d5208bbd6d02fb543e80b7e12 SHA512 e1b8be744170d61a2155b23a8394db01f8af6dc70ec033e71b2ff46f72975704836d42b96d7904e5d462289c5f8f24317f2fb28698f18a77ab1de02829e585eb WHIRLPOOL 2d972c7e40292f424fd37a4c1af04d2be095c215211ec2e1d15d8457df553342ffc02a7d39985f817fbbf5342e422d30e439c35a925341cf9b852ca7ff15a308
AUX qemu-9999-virtfs-proxy-helper-accept.patch 973 SHA256 91cc9e024aa09ea3dd23ec52c561047656acc89f0ad0d5ddccce354c1ac4d282 SHA512 031cb1c35b479b18032f56a07fa2fa6d392a7f0919acd3636bf122ab7f75dcfbb5fc0e26e18a8a31a9888409f81c2e08438a1af999232418d940167c5031a92b WHIRLPOOL ea4dc08230289a147fd55d0bd9e32896cd4491130084fc45b4043f41caf611f07d4587cc485e6d25ba3f6fbc66939ed8faf3c2017bf33ab10e1885277fa3f6ff
diff --git a/app-emulation/qemu/files/qemu-2.1.2-riscv.patch b/app-emulation/qemu/files/qemu-2.1.2-riscv.patch
index 60a8c25..2163447 100644
--- a/app-emulation/qemu/files/qemu-2.1.2-riscv.patch
+++ b/app-emulation/qemu/files/qemu-2.1.2-riscv.patch
@@ -886,7 +886,7 @@ index 0000000..c7913fd
+}
diff --git a/hw/riscv/riscv_board.c b/hw/riscv/riscv_board.c
new file mode 100644
-index 0000000..2484cda
+index 0000000..0ddb29f
--- /dev/null
+++ b/hw/riscv/riscv_board.c
@@ -0,0 +1,238 @@
@@ -1057,7 +1057,7 @@ index 0000000..2484cda
+ stl_p(memory_region_get_ram_ptr(main_mem), loaderparams.ram_size >> 20);
+
+#ifdef CONFIG_RISCV_HTIF
-+ serial_mm_init(system_memory, 0x3f8, 0, env->irq[4], 1843200/16, serial_hds[0],
++ serial_mm_init(system_memory, 0x3f8, 0, env->irq[1], 1843200/16, serial_hds[0],
+ DEVICE_NATIVE_ENDIAN);
+
+ // setup HTIF Block Device if one is specified as -hda FILENAME