tree 0be028ba0d89745c5f8fac6fd9d8952cf7ccae49
parent ce19ac90687f424a0ab1db83569d29a73effff4c
parent 206fa996b8d3616391a19a6049079d29001dc637
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> 1615386950 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> 1615386950 +0100

Merge changes I9c9ed516,I2788eaf6 into integration

* changes:
  qemu/qemu_sbsa: fix memory type of secure NOR flash
  qemu/qemu_sbsa: spm_mm supports 512 cores