diff options
| author | Peter Maydell | 2015-09-14 11:46:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-14 11:46:38 +0200 |
| commit | 2b750d9d261bda7f75b39dfc1e1e5f22502929d5 (patch) | |
| tree | 694ab983efaf829071c85b1149eec905511b4372 /hw | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150911' into staging (diff) | |
| parent | sh4: Fix initramfs initialization for endiannes-mismatched targets (diff) | |
| download | qemu-2b750d9d261bda7f75b39dfc1e1e5f22502929d5.tar.gz qemu-2b750d9d261bda7f75b39dfc1e1e5f22502929d5.tar.xz qemu-2b750d9d261bda7f75b39dfc1e1e5f22502929d5.zip | |
Merge remote-tracking branch 'remotes/aurel/tags/pull-sh4-next-20150913' into staging
sh4-next:
- TCG optimizations
- fix initramfs endianness issue
# gpg: Signature made Sun 13 Sep 2015 22:16:12 BST using RSA key ID 1DDD8C9B
# gpg: Good signature from "Aurelien Jarno <aurelien@aurel32.net>"
# gpg: aka "Aurelien Jarno <aurelien@jarno.fr>"
# gpg: aka "Aurelien Jarno <aurel32@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7746 2642 A9EF 94FD 0F77 196D BA9C 7806 1DDD 8C9B
* remotes/aurel/tags/pull-sh4-next-20150913:
sh4: Fix initramfs initialization for endiannes-mismatched targets
target-sh4: improve shad instruction
target-sh4: improve shld instruction
target-sh4: improve cmp/str instruction
target-sh4: use deposit in swap.b instruction
target-sh4: add flags markups for FP helpers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/sh4/r2d.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 5e22ed79b2..3b0b2ecfa4 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -338,9 +338,9 @@ static void r2d_init(MachineState *machine) } /* initialization which should be done by firmware */ - boot_params.loader_type = 1; - boot_params.initrd_start = INITRD_LOAD_OFFSET; - boot_params.initrd_size = initrd_size; + boot_params.loader_type = tswap32(1); + boot_params.initrd_start = tswap32(INITRD_LOAD_OFFSET); + boot_params.initrd_size = tswap32(initrd_size); } if (kernel_cmdline) { |