diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-24 14:22:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-24 14:22:38 +0000 |
| commit | d9636b6c2b533ab43fad8c9f47633debeef94561 (patch) | |
| tree | b21a11aa3359041b2a637ac8bc709ea1b7970bff /hw/arm | |
| parent | 229c0372cf3ca201c41d2bb121627e6752e776ad (diff) | |
| parent | e14f0eb12f920fd96b9f79d15cedd437648e8667 (diff) | |
| download | qemu-d9636b6c2b533ab43fad8c9f47633debeef94561.zip qemu-d9636b6c2b533ab43fad8c9f47633debeef94561.tar.gz qemu-d9636b6c2b533ab43fad8c9f47633debeef94561.tar.bz2 | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151124' into staging
target-arm queue:
* fix minimum RAM check warning on xlnx-ep108
* remove unused define from aarch64-linux-user.mak config
* don't mask out bits [47:40] in ARMv8 LPAE descriptors
* correct unallocated instruction checks for ldst_excl
# gpg: Signature made Tue 24 Nov 2015 14:17:10 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-target-arm-20151124:
target-arm/translate-a64.c: Correct unallocated checks for ldst_excl
target-arm: Don't mask out bits [47:40] in LPAE descriptors for v8
default-configs/aarch64-linux-user.mak: Remove unused define
xlnx-ep108: Fix minimum RAM check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/xlnx-ep108.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 2899698..85b978f 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-ep108.c @@ -51,7 +51,7 @@ static void xlnx_ep108_init(MachineState *machine) machine->ram_size = EP108_MAX_RAM_SIZE; } - if (machine->ram_size <= 0x08000000) { + if (machine->ram_size < 0x08000000) { qemu_log("WARNING: RAM size " RAM_ADDR_FMT " is small for EP108", machine->ram_size); } |