Commit 22e28174 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 190c93c9 f9a555e4

hw/xtensa/xtfpga.c

+1 −1
Original line number Diff line number Diff line
@@ -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);