Merge "arm_fpga: Remove bogus timer initialisation" into integration

1a63443c · Sandrine Bailleux · TrustedFirmware Code Review · 50d8cf26 · a82ea1db · 1a63443c
Commit 1a63443c authored 5 years ago by Sandrine Bailleux Committed by TrustedFirmware Code Review 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 2 deletions
+0 -2
--- a/plat/arm/board/arm_fpga/fpga_bl31_setup.c
+++ b/plat/arm/board/arm_fpga/fpga_bl31_setup.c
@@ -56,7 +56,6 @@ void bl31_platform_setup(void)

 	/* Write frequency to CNTCRL and initialize timer */
 	generic_delay_timer_init();
-	mmio_write_32(FPGA_TIMER_BASE, ((1 << 8) | 1UL));
 }

 entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)

--- a/plat/arm/board/arm_fpga/fpga_def.h
+++ b/plat/arm/board/arm_fpga/fpga_def.h
@@ -36,6 +36,5 @@
 #define PLAT_FPGA_CRASH_UART_CLK_IN_HZ		PLAT_FPGA_BOOT_UART_CLK_IN_HZ

 #define FPGA_TIMER_FREQUENCY			10000000
-#define FPGA_TIMER_BASE				0x2a830000

 #endif