diff options
| author | Peter Maydell | 2021-08-25 12:39:04 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-08-25 12:39:04 +0200 |
| commit | 52fecb866923890b16202be8e0f360bf247db6a7 (patch) | |
| tree | 074bcf048c514653c28042adbf13a1bb7f3c9499 /include | |
| parent | Open 6.2 development tree (diff) | |
| parent | docs: Document how to use gdb with unix sockets (diff) | |
| download | qemu-52fecb866923890b16202be8e0f360bf247db6a7.tar.gz qemu-52fecb866923890b16202be8e0f360bf247db6a7.tar.xz qemu-52fecb866923890b16202be8e0f360bf247db6a7.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210825' into staging
target-arm queue:
* More MVE emulation work
* Implement M-profile trapping on division by zero
* kvm: use RCU_READ_LOCK_GUARD() in kvm_arch_fixup_msi_route()
* hw/char/pl011: add support for sending break
* fsl-imx6ul: Instantiate SAI1/2/3 and ASRC as unimplemented devices
* hw/dma/pl330: Add memory region to replace default
* sbsa-ref: Rename SBSA_GWDT enum value
* fsl-imx7: Instantiate SAI1/2/3 as unimplemented devices
* docs: Document how to use gdb with unix sockets
# gpg: Signature made Wed 25 Aug 2021 11:34:50 BST
# gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg: issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg: aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20210825: (44 commits)
docs: Document how to use gdb with unix sockets
fsl-imx7: Instantiate SAI1/2/3 as unimplemented devices
sbsa-ref: Rename SBSA_GWDT enum value
hw/dma/pl330: Add memory region to replace default
fsl-imx6ul: Instantiate SAI1/2/3 and ASRC as unimplemented devices
hw/char/pl011: add support for sending break
target/arm: kvm: use RCU_READ_LOCK_GUARD() in kvm_arch_fixup_msi_route()
target/arm: Implement M-profile trapping on division by zero
target/arm: Re-indent sdiv and udiv helpers
target/arm: Implement MVE interleaving loads/stores
target/arm: Implement MVE scatter-gather immediate forms
target/arm: Implement MVE scatter-gather insns
target/arm: Implement MVE VCTP
target/arm: Implement MVE VPNOT
target/arm: Implement MVE VMOV to/from 2 general-purpose registers
target/arm: Implement MVE VMAXA, VMINA
target/arm: Implement MVE VQABS, VQNEG
target/arm: Implement MVE saturating doubling multiply accumulates
target/arm: Implement MVE VMLA
target/arm: Implement MVE VMLADAV and VMLSLDAV
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/arm/fsl-imx7.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index f5d527a490..1c5fa6fd67 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -174,6 +174,11 @@ enum FslIMX7MemoryMap { FSL_IMX7_UART6_ADDR = 0x30A80000, FSL_IMX7_UART7_ADDR = 0x30A90000, + FSL_IMX7_SAI1_ADDR = 0x308A0000, + FSL_IMX7_SAI2_ADDR = 0x308B0000, + FSL_IMX7_SAI3_ADDR = 0x308C0000, + FSL_IMX7_SAIn_SIZE = 0x10000, + FSL_IMX7_ENET1_ADDR = 0x30BE0000, FSL_IMX7_ENET2_ADDR = 0x30BF0000, |