diff --git a/components/freertos/include/mpu_wrappers.h b/components/freertos/include/mpu_wrappers.h
index 4329e0c8..68a8952f 100644
--- a/components/freertos/include/mpu_wrappers.h
+++ b/components/freertos/include/mpu_wrappers.h
@@ -30,7 +30,7 @@
 
 /* This file redefines API functions to be called through a wrapper macro, but
 only for ports that are using the MPU. */
-#ifdef portUSING_MPU_WRAPPERS
+#if (portUSING_MPU_WRAPPERS == 1)
 
 /* MPU_WRAPPERS_INCLUDED_FROM_API_FILE will be defined when this file is
     included from queue.c or task.c to prevent it from having an effect within
diff --git a/components/freertos/portable/gcc/risc-v/bl602/FreeRTOSConfig.h b/components/freertos/portable/gcc/risc-v/bl602/FreeRTOSConfig.h
index dd4a2e5c..bd0790ea 100644
--- a/components/freertos/portable/gcc/risc-v/bl602/FreeRTOSConfig.h
+++ b/components/freertos/portable/gcc/risc-v/bl602/FreeRTOSConfig.h
@@ -44,7 +44,7 @@
 #define configCLINT_BASE_ADDRESS                CLINT_CTRL_ADDR
 #define configUSE_PREEMPTION                    1
 #define configUSE_IDLE_HOOK                     0
-#define configUSE_TICK_HOOK                     1
+#define configUSE_TICK_HOOK                     0
 #define configCPU_CLOCK_HZ                      (1000000UL)
 #define configTICK_RATE_HZ                      ((TickType_t)1000)
 #define configMAX_PRIORITIES                    (7)
@@ -64,6 +64,7 @@
 #define configGENERATE_RUN_TIME_STATS           0
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 #define configUSE_STATS_FORMATTING_FUNCTIONS    2
+#define configUSE_TICKLESS_IDLE                 0
 
 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES           0
@@ -102,4 +103,10 @@ void vAssertCalled(void);
     if ((x) == 0)       \
     vAssertCalled()
 
+#if (configUSE_TICKLESS_IDLE != 0)
+void vApplicationSleep(uint32_t xExpectedIdleTime);
+#define portSUPPRESS_TICKS_AND_SLEEP(xExpectedIdleTime) vApplicationSleep(xExpectedIdleTime)
+#endif
+
+#define portUSING_MPU_WRAPPERS 0
 #endif /* FREERTOS_CONFIG_H */
diff --git a/components/freertos/portable/gcc/risc-v/bl702/FreeRTOSConfig.h b/components/freertos/portable/gcc/risc-v/bl702/FreeRTOSConfig.h
index 7a32f240..1ad79327 100644
--- a/components/freertos/portable/gcc/risc-v/bl702/FreeRTOSConfig.h
+++ b/components/freertos/portable/gcc/risc-v/bl702/FreeRTOSConfig.h
@@ -44,11 +44,11 @@
 #define configCLINT_BASE_ADDRESS                CLINT_CTRL_ADDR
 #define configUSE_PREEMPTION                    1
 #define configUSE_IDLE_HOOK                     0
-#define configUSE_TICK_HOOK                     1
+#define configUSE_TICK_HOOK                     0
 #define configCPU_CLOCK_HZ                      (1000000UL)
 #define configTICK_RATE_HZ                      ((TickType_t)1000)
 #define configMAX_PRIORITIES                    (7)
-#define configMINIMAL_STACK_SIZE                ((unsigned short)160) /* Only needs to be this high as some demo tasks also use this constant.  In production only the idle task would use this. */
+#define configMINIMAL_STACK_SIZE                ((unsigned short)512) /* Only needs to be this high as some demo tasks also use this constant.  In production only the idle task would use this. */
 #define configTOTAL_HEAP_SIZE                   ((size_t)48 * 1024)
 #define configMAX_TASK_NAME_LEN                 (16)
 #define configUSE_TRACE_FACILITY                1
@@ -64,6 +64,7 @@
 #define configGENERATE_RUN_TIME_STATS           0
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 #define configUSE_STATS_FORMATTING_FUNCTIONS    2
+#define configUSE_TICKLESS_IDLE                 0
 
 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES           0
@@ -102,4 +103,10 @@ void vAssertCalled(void);
     if ((x) == 0)       \
     vAssertCalled()
 
+#if (configUSE_TICKLESS_IDLE != 0)
+void vApplicationSleep(uint32_t xExpectedIdleTime);
+#define portSUPPRESS_TICKS_AND_SLEEP(xExpectedIdleTime) vApplicationSleep(xExpectedIdleTime)
+#endif
+
+#define portUSING_MPU_WRAPPERS 0
 #endif /* FREERTOS_CONFIG_H */