diff --git a/bsps/aarch64/shared/start/aarch64-smp.c b/bsps/aarch64/shared/start/aarch64-smp.c
index 3b0e9d6b0a..0796d8c31d 100644
--- a/bsps/aarch64/shared/start/aarch64-smp.c
+++ b/bsps/aarch64/shared/start/aarch64-smp.c
@@ -66,12 +66,6 @@ void _CPU_SMP_Finalize_initialization( uint32_t cpu_count )
     &aarch64_ipi_entry
   );
   _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL );
-
-#if defined( BSP_DATA_CACHE_ENABLED ) || \
-  defined( BSP_INSTRUCTION_CACHE_ENABLED )
-  /* Enable unified L2 cache */
-  rtems_cache_enable_data();
-#endif
 }
 
 void _CPU_SMP_Prepare_start_multitasking( void )
diff --git a/bsps/shared/start/bspsmp-arm-psci.c b/bsps/shared/start/bspsmp-arm-psci.c
index 1ff5b7bb89..d6633e199f 100644
--- a/bsps/shared/start/bspsmp-arm-psci.c
+++ b/bsps/shared/start/bspsmp-arm-psci.c
@@ -84,9 +84,5 @@ bool _CPU_SMP_Start_processor( uint32_t cpu_index )
     REGISTER_PREFIX "3"
   );
 
-  if ( ret != 0 ) {
-    return false;
-  }
-
-  return _Per_CPU_State_wait_for_non_initial_state( cpu_index, 0 );
+  return ret == 0;
 }