[Qemu-commits] [qemu/qemu] a6b2f1: hw/arm/aspeed: Map the UART5 device unconditionally

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a6b2f1fc36307574dcb24708918ee22348a0ad82
      
https://github.com/qemu/qemu/commit/a6b2f1fc36307574dcb24708918ee22348a0ad82
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-18 (Fri, 18 Sep 2020)

  Changed paths:
    M hw/arm/aspeed_ast2600.c
    M hw/arm/aspeed_soc.c

  Log Message:
  -----------
  hw/arm/aspeed: Map the UART5 device unconditionally

The UART5 is present on the machine regardless there is a
character device connected to it. Map it unconditionally.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20200905212415.760452-1-f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>


  Commit: 9820e52fbef71564d05f3a83a26ce4c3f7d5d3fd
      
https://github.com/qemu/qemu/commit/9820e52fbef71564d05f3a83a26ce4c3f7d5d3fd
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2020-09-18 (Fri, 18 Sep 2020)

  Changed paths:
    M docs/system/arm/aspeed.rst
    M hw/arm/aspeed.c

  Log Message:
  -----------
  hw/arm/aspeed: Add machine properties to define the flash models

Some machines don't have much differences a part from the flash model
being used. Introduce new machine properties to change them from the
command line.

For instance, to start the ast2500-evb machine with a different FMC
chip and a 64M SPI chip, use :

  -M ast2500-evb,fmc-model=mx25l25635e,spi-model=mx66u51235f

Cc: 郁雷 <yulei.sh@bytedance.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Tested-by: Lei YU <yulei.sh@bytedance.com>
Message-Id: <20200915054859.2338477-1-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>


  Commit: 204dab83fe00a3e0781d93ad7899192a9409e987
      
https://github.com/qemu/qemu/commit/204dab83fe00a3e0781d93ad7899192a9409e987
  Author: Joel Stanley <joel@jms.id.au>
  Date:   2020-09-18 (Fri, 18 Sep 2020)

  Changed paths:
    M hw/misc/aspeed_scu.c

  Log Message:
  -----------
  misc: aspeed_scu: Update AST2600 silicon id register

Aspeed have released an updated datasheet (v7) containing the silicon id
for the AST2600 A2. It looks like this:

              SCU004      SCU014
  AST2600-A0  0x05000303  0x05000303
  AST2600-A1  0x05010303  0x05010303
  AST2600-A2  0x05010303  0x05020303
  AST2620-A1  0x05010203  0x05010203
  AST2620-A2  0x05010203  0x05020203

The SCU004 (silicon id 1) value matches SCU014 for A0, but for
subsequent revisions it is hard coded to the A1 value.

Qemu effectively dropped support for the A0 in 7582591ae745 ("aspeed:
Support AST2600A1 silicon revision") as the A0 reset table was removed,
so it makes sense to only support the behaviour of A1 and onwards.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20200916082012.776628-1-joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>


  Commit: e883b492c221241d28aaa322c61536436090538a
      
https://github.com/qemu/qemu/commit/e883b492c221241d28aaa322c61536436090538a
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-18 (Fri, 18 Sep 2020)

  Changed paths:
    M docs/system/arm/aspeed.rst
    M hw/arm/aspeed.c
    M hw/arm/aspeed_ast2600.c
    M hw/arm/aspeed_soc.c
    M hw/misc/aspeed_scu.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20200918' 
into staging

Aspeed patches :

* Couple of cleanups
* New machine properties to define the flash models

# gpg: Signature made Fri 18 Sep 2020 08:23:19 BST
# gpg:                using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined]
# 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: A0F6 6548 F048 95EB FE6B  0B60 51A3 43C7 CFFB ECA1

* remotes/legoater/tags/pull-aspeed-20200918:
  misc: aspeed_scu: Update AST2600 silicon id register
  hw/arm/aspeed: Add machine properties to define the flash models
  hw/arm/aspeed: Map the UART5 device unconditionally

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/17cd6e2bbffa...e883b492c221