diff options
| author | Peter Maydell | 2015-03-11 17:30:33 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-11 17:30:33 +0100 |
| commit | d598911b6f5e7bf7bafb63b8e1d074729e94aca7 (patch) | |
| tree | 4adfbc7a7c32f771c3db8f603177efaa05c9ecca /hw/misc/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150310' into s... (diff) | |
| parent | bitops.h: sextract64() return type should be int64_t, not uint64_t (diff) | |
| download | qemu-d598911b6f5e7bf7bafb63b8e1d074729e94aca7.tar.gz qemu-d598911b6f5e7bf7bafb63b8e1d074729e94aca7.tar.xz qemu-d598911b6f5e7bf7bafb63b8e1d074729e94aca7.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150311' into staging
target-arm queue:
* fix a bug in bitops.h
* implement SD card support on integratorcp
* add a missing 'compatible' property for Cortex-A57
* add Netduino 2 machine model
* fix command line parsing bug for CPU options with multiple CPUs
# gpg: Signature made Wed Mar 11 14:14:22 2015 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
* remotes/pmaydell/tags/pull-target-arm-20150311:
bitops.h: sextract64() return type should be int64_t, not uint64_t
integrator/cp: Implement CARDIN and WPROT signals
integrator/cp: Model CP control registers as sysbus device
target-arm: Add missing compatible property to A57
netduino2: Add the Netduino 2 Machine
stm32f205: Add the stm32f205 SoC
stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG
stm32f2xx_USART: Add the stm32f2xx USART Controller
stm32f2xx_timer: Add the stm32f2xx Timer
hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/Makefile.objs')
| -rw-r--r-- | hw/misc/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 6c6e29681a..4aa76ffec9 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -36,6 +36,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o obj-$(CONFIG_OMAP) += omap_tap.o obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o +obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o obj-$(CONFIG_PVPANIC) += pvpanic.o obj-$(CONFIG_EDU) += edu.o |