bad76ac319
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl2ys7YSHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L748A9QP/jrWoywp5vNVti1YJtVpzHx/GOQcqr2s 1bXFEzEvTAfI1TxQseiz4Z/jW9OmYNSt+lmW8FHBHLn4l4oo8e4/PurSBRa5guW3 Dsohqe2TAK0Ua1ELf4eoIfGWm2rKwz2TH0iChk6nvWKJaLQPTzjEgAlZSqOx7jfV q2+jSKQOzQJDwzMtzOTcan3VxPnru5j4YYlJspSJVNbiQ/bmQMV7JcsXBU5i4Tf+ Z1679CDe1BiRqcxKTsWEYMvAVmINYYfEsp2RuE+Co1mr9bQj9pBCFfybe7x5T3VG FaCEnfMEtOhgAryfW6/k6IfMvHgV6HjvIpfc27ZIn+kMwhhJl6V4Ca9LY7iUKJnf zWYl4FbC0NCM3udWdB/ogaZ6GVJ9FHBcZtnGNWesb3H09KLkRrz95mkOJl1/kPnW eDhzCO9g49T3zOECjGpodBF0RXGXVl1vTukwYk0I0d7bo8NySJ4dxVX91D0OIq4S +TilFrLi1ssXv9/7Y0Y3zC8/p1qVSIzKa1t4618xqf1MO5LfiVRWpPTPgV+0z3kw R48LzMqX50KnIT6fY7BY0YsskwZ1BbZmIJ/++6r8M1L+xaegUsIdI8LHI70TJ7JR hJ+uTgWky8N19A0OUJj08xjetNOv6Souf2GFaTrGJO0DQbyzwjNwELYNVhagqvOZ PHakcrjaMv8G =u0rQ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging Fix typos and docs, trivial changes and RTC devices split # gpg: Signature made Fri 25 Oct 2019 09:35:02 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: hw/rtc/aspeed_rtc: Remove unused includes hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory hw/timer: Compile devices not target-dependent as common object qemu-timer: reuse MIN macro in qemu_timeout_ns_to_ms event_notifier: avoid dandling file descriptor in event_notifier_cleanup util/async: avoid useless cast pci_bridge: fix a typo in comment qemu-options.hx: Update for reboot-timeout parameter Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # hw/timer/trace-events
38 lines
1.5 KiB
Makefile
38 lines
1.5 KiB
Makefile
common-obj-$(CONFIG_ARM_TIMER) += arm_timer.o
|
|
common-obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o
|
|
common-obj-$(CONFIG_ARM_V7M) += armv7m_systick.o
|
|
common-obj-$(CONFIG_A9_GTIMER) += a9gtimer.o
|
|
common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
|
|
common-obj-$(CONFIG_HPET) += hpet.o
|
|
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
|
|
common-obj-$(CONFIG_PUV3) += puv3_ost.o
|
|
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
|
|
common-obj-$(CONFIG_SLAVIO) += slavio_timer.o
|
|
common-obj-$(CONFIG_ETRAXFS) += etraxfs_timer.o
|
|
common-obj-$(CONFIG_GRLIB) += grlib_gptimer.o
|
|
common-obj-$(CONFIG_IMX) += imx_epit.o
|
|
common-obj-$(CONFIG_IMX) += imx_gpt.o
|
|
common-obj-$(CONFIG_LM32) += lm32_timer.o
|
|
common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o
|
|
common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o
|
|
|
|
common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
|
|
common-obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o
|
|
common-obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
|
|
common-obj-$(CONFIG_OMAP) += omap_gptimer.o
|
|
common-obj-$(CONFIG_OMAP) += omap_synctimer.o
|
|
common-obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o
|
|
common-obj-$(CONFIG_SH4) += sh_timer.o
|
|
common-obj-$(CONFIG_DIGIC) += digic-timer.o
|
|
common-obj-$(CONFIG_MIPS_CPS) += mips_gictimer.o
|
|
|
|
common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
|
|
|
|
common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
|
|
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o
|
|
|
|
common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
|
|
common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o
|
|
common-obj-$(CONFIG_MSF2) += mss-timer.o
|
|
common-obj-$(CONFIG_RASPI) += bcm2835_systmr.o
|