diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-05-17 09:48:10 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-05-20 15:29:30 +0100 |
| commit | 32cd95f094eaa17631a08dca214ea61b06937f6c (patch) | |
| tree | 0de466b73e415594651b44e68245263158ec8a7f /plat | |
| parent | 0bcedb2212bd2436834117cd956d7b6e16b11673 (diff) | |
Replace SP804 timer by generic delay timer on FVP
Added a build flag to select the generic delay timer on FVP instead
of the SP804 timer. By default, the generic one will be selected. The
user guide has been updated.
Change-Id: Ica34425c6d4ed95a187b529c612f6d3b26b78bc6
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp/fvp_bl2_setup.c | 5 | ||||
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/plat/arm/board/fvp/fvp_bl2_setup.c b/plat/arm/board/fvp/fvp_bl2_setup.c index 305309ab..ee49c302 100644 --- a/plat/arm/board/fvp/fvp_bl2_setup.c +++ b/plat/arm/board/fvp/fvp_bl2_setup.c @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <generic_delay_timer.h> #include <mmio.h> #include <plat_arm.h> #include <sp804_delay_timer.h> @@ -48,6 +49,7 @@ void bl2_platform_setup(void) { arm_bl2_platform_setup(); +#if FVP_USE_SP804_TIMER /* Enable the clock override for SP804 timer 0, which means that no * clock dividers are applied and the raw (35 MHz) clock will be used */ mmio_write_32(V2M_SP810_BASE, FVP_SP810_CTRL_TIM0_OV); @@ -55,4 +57,7 @@ void bl2_platform_setup(void) /* Initialize delay timer driver using SP804 dual timer 0 */ sp804_timer_init(V2M_SP804_TIMER0_BASE, SP804_TIMER_CLKMULT, SP804_TIMER_CLKDIV); +#else + generic_delay_timer_init(); +#endif /* FVP_USE_SP804_TIMER */ } diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index eecb5977..c0fe662e 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -30,6 +30,11 @@ # Use the GICv3 driver on the FVP by default FVP_USE_GIC_DRIVER := FVP_GICV3 +# Use the SP804 timer instead of the generic one +FVP_USE_SP804_TIMER := 0 + +$(eval $(call assert_boolean,FVP_USE_SP804_TIMER)) +$(eval $(call add_define,FVP_USE_SP804_TIMER)) # The FVP platform depends on this macro to build with correct GIC driver. $(eval $(call add_define,FVP_USE_GIC_DRIVER)) @@ -92,8 +97,7 @@ BL1_SOURCES += drivers/io/io_semihosting.c \ ${FVP_INTERCONNECT_SOURCES} -BL2_SOURCES += drivers/arm/sp804/sp804_delay_timer.c \ - drivers/io/io_semihosting.c \ +BL2_SOURCES += drivers/io/io_semihosting.c \ drivers/delay_timer/delay_timer.c \ lib/semihosting/semihosting.c \ lib/semihosting/aarch64/semihosting_call.S \ @@ -102,6 +106,12 @@ BL2_SOURCES += drivers/arm/sp804/sp804_delay_timer.c \ plat/arm/board/fvp/fvp_io_storage.c \ ${FVP_SECURITY_SOURCES} +ifeq (${FVP_USE_SP804_TIMER},1) +BL2_SOURCES += drivers/arm/sp804/sp804_delay_timer.c +else +BL2_SOURCES += drivers/delay_timer/generic_delay_timer.c +endif + BL2U_SOURCES += plat/arm/board/fvp/fvp_bl2u_setup.c \ ${FVP_SECURITY_SOURCES} |