MLECO-1933, MLECO-1914, MLECO-1885: Update to 21.05-rc2 components
Core driver and sofware dependencies updated to latest release
candidate revisions. Note: TensorFlow Lite Micro has not been
updated.
Also, gcc warnings for simple_platform target and ad use case have
been fixed.
Change-Id: I455b421f34375a719a941e6e220fe292a57613f5
diff --git a/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h b/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h
index 3020dac..0d23a05 100644
--- a/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h
+++ b/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h
@@ -22,10 +22,10 @@
#if defined (MPS3_PLATFORM)
#include "timer_mps3.h"
- typedef mps3_time_counter base_time_counter;
+ typedef mps3_time_counter base_time_counter;
#else /* defined (MPS3_PLATFORM) */
- #include "timer_fvp.h"
- typedef fvp_time_counter base_time_counter;
+ #include "timer_simple_platform.h"
+ typedef generic_time_counter base_time_counter;
#endif /* defined (MPS3_PLATFORM) */
typedef struct bm_time_counter {
@@ -34,9 +34,9 @@
#if defined (ARM_NPU)
uint64_t npu_total_ccnt;
uint32_t npu_idle_ccnt;
- uint32_t npu_axi0_read_ccnt;
- uint32_t npu_axi0_write_ccnt;
- uint32_t npu_axi1_read_ccnt;
+ uint32_t npu_axi0_read_beats;
+ uint32_t npu_axi0_write_beats;
+ uint32_t npu_axi1_read_beats;
#endif /* ARM_NPU */
} time_counter;