diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-14 15:57:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-14 15:57:28 +0100 |
| commit | 22e28174ae423629e57b0d03f4bbf2d1bedcd58f (patch) | |
| tree | 2c691a59df59f671a945ec7aa9944453873302c0 /hw | |
| parent | 190c93c98283e75e1a9e01babd1ec14624cb6204 (diff) | |
| parent | f9a555e4991b9ddc257ea8ce2e4acde672275097 (diff) | |
| download | qemu-22e28174ae423629e57b0d03f4bbf2d1bedcd58f.zip qemu-22e28174ae423629e57b0d03f4bbf2d1bedcd58f.tar.gz qemu-22e28174ae423629e57b0d03f4bbf2d1bedcd58f.tar.bz2 | |
Merge remote-tracking branch 'remotes/xtensa/tags/20160714-xtensa' into staging
Xtensa-related fixes:
- fix FLASH interface width for XTFPGA boards.
# gpg: Signature made Thu 14 Jul 2016 12:00:05 BST
# gpg: using RSA key 0x51F9CC91F83FA044
# gpg: Good signature from "Max Filippov <max.filippov@cogentembedded.com>"
# gpg: aka "Max Filippov <jcmvbkbc@gmail.com>"
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB 17D8 51F9 CC91 F83F A044
* remotes/xtensa/tags/20160714-xtensa:
target-xtensa: xtfpga: fix FLASH interface width
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xtensa/xtfpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 2d11736..ac75949 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -165,7 +165,7 @@ static pflash_t *xtfpga_flash_init(MemoryRegion *address_space, qdev_prop_set_uint32(dev, "num-blocks", board->flash_size / board->flash_sector_size); qdev_prop_set_uint64(dev, "sector-length", board->flash_sector_size); - qdev_prop_set_uint8(dev, "width", 4); + qdev_prop_set_uint8(dev, "width", 2); qdev_prop_set_bit(dev, "big-endian", be); qdev_prop_set_string(dev, "name", "lx60.io.flash"); qdev_init_nofail(dev); |