fwk: Rename fwk_errno.h to fwk_status.h

This patch renames the header file for the return
values to fwk_status.h. This is to reflect the recent
addition of positive values that do not fall into
the error category.

Change-Id: I283b945c39d3ad31702db0dc7687dbe99e81ed19
Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>

99 files changed, 105 insertions, 105 deletions

diff --git a/arch/src/arm_main.c b/arch/src/arm_main.c
index d30ef785..95070aa3 100644
--- a/arch/src/arm_main.c
+++ b/arch/src/arm_main.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <fwk_arch.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <cmsis_compiler.h>
 
 #define SCB_CCR ((FWK_RW uint32_t *)(0xE000ED14))
diff --git a/arch/src/arm_mm.c b/arch/src/arm_mm.c
index 16955533..81f07ccc 100644
--- a/arch/src/arm_mm.c
+++ b/arch/src/arm_mm.c
@@ -11,8 +11,8 @@
 #include <stdint.h>
 #include <fwk_arch.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 
 int arm_mm_init(struct fwk_arch_mm_data *data)
 {
diff --git a/arch/src/arm_nvic.c b/arch/src/arm_nvic.c
index 51063f15..a9640cd4 100644
--- a/arch/src/arm_nvic.c
+++ b/arch/src/arm_nvic.c
@@ -11,11 +11,11 @@
 #include <limits.h>
 #include <stdint.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_noreturn.h>
+#include <fwk_status.h>
 #include <cmsis_compiler.h>
 
 #ifdef BUILD_HAS_MULTITHREADING
diff --git a/arch/src/host.c b/arch/src/host.c
index 52f30115..c1569945 100644
--- a/arch/src/host.c
+++ b/arch/src/host.c
@@ -8,8 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_noreturn.h>
+#include <fwk_status.h>
 
 extern int host_interrupt_init(struct fwk_arch_interrupt_driver **driver);
 
diff --git a/arch/src/host_interrupt.c b/arch/src/host_interrupt.c
index 6ce2121c..3a9885bf 100644
--- a/arch/src/host_interrupt.c
+++ b/arch/src/host_interrupt.c
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 static int global_enable(void)
 {
diff --git a/framework/include/fwk_id.h b/framework/include/fwk_id.h
index b97b00c3..16800814 100644
--- a/framework/include/fwk_id.h
+++ b/framework/include/fwk_id.h
@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <internal/fwk_id.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 /*!
  * \addtogroup GroupLibFramework Framework
diff --git a/framework/include/fwk_errno.h b/framework/include/fwk_status.h
index 403b2a5c..67ff5436 100644
--- a/framework/include/fwk_errno.h
+++ b/framework/include/fwk_status.h
@@ -8,8 +8,8 @@
  *     Standard return codes.
  */
 
-#ifndef FWK_ERRNO_H
-#define FWK_ERRNO_H
+#ifndef FWK_STATUS_H
+#define FWK_STATUS_H
 
 /*!
  * \addtogroup GroupLibFramework Framework
@@ -17,7 +17,7 @@
  */
 
 /*!
- * \defgroup GroupErrno Return Codes
+ * \defgroup GroupStatus Return Codes
  * @{
  */
 
@@ -89,4 +89,4 @@
  * @}
  */
 
-#endif /* FWK_ERRNO_H */
+#endif /* FWK_STATUS_H */
diff --git a/framework/src/fwk_arch.c b/framework/src/fwk_arch.c
index 95f5cbf2..465026d4 100644
--- a/framework/src/fwk_arch.c
+++ b/framework/src/fwk_arch.c
@@ -9,9 +9,9 @@
  */
 
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 
 extern int fwk_mm_init(uintptr_t start, size_t size);
diff --git a/framework/src/fwk_interrupt.c b/framework/src/fwk_interrupt.c
index eadbf5c5..82a692d3 100644
--- a/framework/src/fwk_interrupt.c
+++ b/framework/src/fwk_interrupt.c
@@ -11,9 +11,9 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 
 static bool initialized;
 static const struct fwk_arch_interrupt_driver *driver;
diff --git a/framework/src/fwk_mm.c b/framework/src/fwk_mm.c
index 7bc0afcb..ece4ed05 100644
--- a/framework/src/fwk_mm.c
+++ b/framework/src/fwk_mm.c
@@ -14,9 +14,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 
 static bool initialized;
 static bool mm_locked;
diff --git a/framework/src/fwk_module.c b/framework/src/fwk_module.c
index 8f695842..c01b1de8 100644
--- a/framework/src/fwk_module.c
+++ b/framework/src/fwk_module.c
@@ -10,9 +10,9 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_thread.h>
 #ifdef BUILD_HAS_NOTIFICATION
diff --git a/framework/src/fwk_multi_thread.c b/framework/src/fwk_multi_thread.c
index 65cf8434..546d2fc7 100644
--- a/framework/src/fwk_multi_thread.c
+++ b/framework/src/fwk_multi_thread.c
@@ -9,11 +9,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_interrupt.h>
 #include <fwk_element.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_notification.h>
 #include <internal/fwk_multi_thread.h>
diff --git a/framework/src/fwk_thread.c b/framework/src/fwk_thread.c
index d8a89a7b..97f9a49a 100644
--- a/framework/src/fwk_thread.c
+++ b/framework/src/fwk_thread.c
@@ -12,11 +12,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_host.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_notification.h>
 #include <internal/fwk_single_thread.h>
diff --git a/framework/test/fwk_test.c b/framework/test/fwk_test.c
index 956c5ce7..d1295036 100644
--- a/framework/test/fwk_test.c
+++ b/framework/test/fwk_test.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <fwk_errno.h>
 #include <fwk_noreturn.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 /* Test information provided by the test suite */
diff --git a/framework/test/test_fwk_arch.c b/framework/test/test_fwk_arch.c
index e1e930e1..ee678bdf 100644
--- a/framework/test/test_fwk_arch.c
+++ b/framework/test/test_fwk_arch.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <fwk_assert.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 static int fwk_mm_init_return_val;
diff --git a/framework/test/test_fwk_interrupt.c b/framework/test/test_fwk_interrupt.c
index 7ea4d947..5a2d9804 100644
--- a/framework/test/test_fwk_interrupt.c
+++ b/framework/test/test_fwk_interrupt.c
@@ -8,9 +8,9 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_arch.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 #define INTERRUPT_ID 42
diff --git a/framework/test/test_fwk_mm.c b/framework/test/test_fwk_mm.c
index 08dcebd4..486e4ad9 100644
--- a/framework/test/test_fwk_mm.c
+++ b/framework/test/test_fwk_mm.c
@@ -10,9 +10,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 #define SIZE_MEM            (1024 * 1024)
diff --git a/framework/test/test_fwk_module.c b/framework/test/test_fwk_module.c
index f7126bb3..f31ed664 100644
--- a/framework/test/test_fwk_module.c
+++ b/framework/test/test_fwk_module.c
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_module.h>
 
diff --git a/framework/test/test_fwk_multi_thread_common_thread.c b/framework/test/test_fwk_multi_thread_common_thread.c
index 4cae23e6..19295413 100644
--- a/framework/test/test_fwk_multi_thread_common_thread.c
+++ b/framework/test/test_fwk_multi_thread_common_thread.c
@@ -11,10 +11,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_create.c b/framework/test/test_fwk_multi_thread_create.c
index 0d868467..76d910e1 100644
--- a/framework/test/test_fwk_multi_thread_create.c
+++ b/framework/test/test_fwk_multi_thread_create.c
@@ -13,9 +13,9 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_init.c b/framework/test/test_fwk_multi_thread_init.c
index a7cca306..8db7ac8a 100644
--- a/framework/test/test_fwk_multi_thread_init.c
+++ b/framework/test/test_fwk_multi_thread_init.c
@@ -10,10 +10,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_put_event.c b/framework/test/test_fwk_multi_thread_put_event.c
index 3dd4a94a..c34fceeb 100644
--- a/framework/test/test_fwk_multi_thread_put_event.c
+++ b/framework/test/test_fwk_multi_thread_put_event.c
@@ -13,10 +13,10 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_multi_thread_util.c b/framework/test/test_fwk_multi_thread_util.c
index 2944ed5a..b8410cee 100644
--- a/framework/test/test_fwk_multi_thread_util.c
+++ b/framework/test/test_fwk_multi_thread_util.c
@@ -11,10 +11,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_id.h>
 #include <internal/fwk_module.h>
diff --git a/framework/test/test_fwk_notification.c b/framework/test/test_fwk_notification.c
index 53a26ea9..b32dbcb0 100644
--- a/framework/test/test_fwk_notification.c
+++ b/framework/test/test_fwk_notification.c
@@ -9,11 +9,11 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
 #include <fwk_slist.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_single_thread.h>
diff --git a/framework/test/test_fwk_thread.c b/framework/test/test_fwk_thread.c
index 875ca944..349a9975 100644
--- a/framework/test/test_fwk_thread.c
+++ b/framework/test/test_fwk_thread.c
@@ -9,11 +9,11 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_list.h>
 #include <fwk_macros.h>
 #include <fwk_slist.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 #include <internal/fwk_module.h>
 #include <internal/fwk_single_thread.h>
diff --git a/framework/test/test_version.c b/framework/test/test_version.c
index 6d214718..68d1b2d3 100644
--- a/framework/test/test_version.c
+++ b/framework/test/test_version.c
@@ -7,8 +7,8 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_status.h>
 #include <fwk_test.h>
 
 static void test_version(void)
diff --git a/module/apcontext/src/mod_apcontext.c b/module/apcontext/src/mod_apcontext.c
index 098b3311..a7d2413b 100644
--- a/module/apcontext/src/mod_apcontext.c
+++ b/module/apcontext/src/mod_apcontext.c
@@ -7,11 +7,11 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_apcontext.h>
 #include <mod_clock.h>
 #include <mod_log.h>
diff --git a/module/bootloader/src/mod_bootloader.c b/module/bootloader/src/mod_bootloader.c
index e69bfb22..816319c3 100644
--- a/module/bootloader/src/mod_bootloader.c
+++ b/module/bootloader/src/mod_bootloader.c
@@ -8,10 +8,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_bootloader.h>
 #include <mod_sds.h>
 
diff --git a/module/clock/src/mod_clock.c b/module/clock/src/mod_clock.c
index 8efd6e89..42020b9d 100644
--- a/module/clock/src/mod_clock.c
+++ b/module/clock/src/mod_clock.c
@@ -8,12 +8,12 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
-#include <fwk_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
+#include <fwk_thread.h>
 #include <mod_clock.h>
 #include <mod_power_domain.h>
 
diff --git a/module/cmn600/src/mod_cmn600.c b/module/cmn600/src/mod_cmn600.c
index c9dc281e..e0f5a6a6 100644
--- a/module/cmn600/src/mod_cmn600.c
+++ b/module/cmn600/src/mod_cmn600.c
@@ -8,13 +8,13 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_math.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_cmn600.h>
 #include <mod_log.h>
diff --git a/module/css_clock/src/mod_css_clock.c b/module/css_clock/src/mod_css_clock.c
index 9f1b110c..be8459de 100644
--- a/module/css_clock/src/mod_css_clock.c
+++ b/module/css_clock/src/mod_css_clock.c
@@ -8,9 +8,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_css_clock.h>
 #include <mod_power_domain.h>
diff --git a/module/ddr_phy500/src/mod_ddr_phy500.c b/module/ddr_phy500/src/mod_ddr_phy500.c
index c250e3d6..ddb9ecb1 100644
--- a/module/ddr_phy500/src/mod_ddr_phy500.c
+++ b/module/ddr_phy500/src/mod_ddr_phy500.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_ddr_phy500.h>
 
 #ifdef BUILD_HAS_MOD_DMC500
diff --git a/module/dmc620/src/mod_dmc620.c b/module/dmc620/src/mod_dmc620.c
index 0fd5329c..6d4243ef 100644
--- a/module/dmc620/src/mod_dmc620.c
+++ b/module/dmc620/src/mod_dmc620.c
@@ -9,10 +9,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_dmc620.h>
 #include <mod_clock.h>
 #include <mod_log.h>
diff --git a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
index 948a35a4..25e17483 100644
--- a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
+++ b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <stdbool.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_dw_apb_i2c.h>
 #include <mod_i2c.h>
 #include <mod_timer.h>
diff --git a/module/gtimer/src/mod_gtimer.c b/module/gtimer/src/mod_gtimer.c
index 75903282..e4be1d4a 100644
--- a/module/gtimer/src/mod_gtimer.c
+++ b/module/gtimer/src/mod_gtimer.c
@@ -7,12 +7,12 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <gtimer_reg.h>
 #include <mod_clock.h>
 #include <mod_gtimer.h>
diff --git a/module/host_console/src/mod_host_console.c b/module/host_console/src/mod_host_console.c
index f10b4913..f45515a0 100644
--- a/module/host_console/src/mod_host_console.c
+++ b/module/host_console/src/mod_host_console.c
@@ -7,8 +7,8 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 
 /*
diff --git a/module/i2c/src/mod_i2c.c b/module/i2c/src/mod_i2c.c
index 34e67a2d..6a3816e8 100644
--- a/module/i2c/src/mod_i2c.c
+++ b/module/i2c/src/mod_i2c.c
@@ -7,11 +7,11 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_i2c.h>
 
diff --git a/module/log/src/mod_log.c b/module/log/src/mod_log.c
index 8451c654..ca70caf6 100644
--- a/module/log/src/mod_log.c
+++ b/module/log/src/mod_log.c
@@ -10,11 +10,11 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
+#include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
-#include <fwk_mm.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 
 static const struct mod_log_config *log_config;
diff --git a/module/mhu/src/mod_mhu.c b/module/mhu/src/mod_mhu.c
index 71fdb5e1..3e4169eb 100644
--- a/module/mhu/src/mod_mhu.c
+++ b/module/mhu/src/mod_mhu.c
@@ -10,12 +10,12 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/mhu.h>
 #include <mod_smt.h>
 
diff --git a/module/mhu2/src/mod_mhu2.c b/module/mhu2/src/mod_mhu2.c
index 8e776c2f..814cb3d7 100644
--- a/module/mhu2/src/mod_mhu2.c
+++ b/module/mhu2/src/mod_mhu2.c
@@ -11,12 +11,12 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_mhu2.h>
 #include <mhu2.h>
 #include <mod_smt.h>
diff --git a/module/msys_rom/src/mod_msys_rom.c b/module/msys_rom/src/mod_msys_rom.c
index d12170fd..266ad517 100644
--- a/module/msys_rom/src/mod_msys_rom.c
+++ b/module/msys_rom/src/mod_msys_rom.c
@@ -13,12 +13,12 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_noreturn.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_bootloader.h>
 #include <mod_log.h>
diff --git a/module/pik_clock/src/mod_pik_clock.c b/module/pik_clock/src/mod_pik_clock.c
index 7ecf4f72..9f7a1e8f 100644
--- a/module/pik_clock/src/mod_pik_clock.c
+++ b/module/pik_clock/src/mod_pik_clock.c
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_css_clock.h>
 #include <mod_pik_clock.h>
diff --git a/module/pl011/src/mod_pl011.c b/module/pl011/src/mod_pl011.c
index c257877d..837a2029 100644
--- a/module/pl011/src/mod_pl011.c
+++ b/module/pl011/src/mod_pl011.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_log.h>
 #include <mod_pl011.h>
diff --git a/module/power_domain/src/mod_power_domain.c b/module/power_domain/src/mod_power_domain.c
index 9c891d5b..1691c043 100644
--- a/module/power_domain/src/mod_power_domain.c
+++ b/module/power_domain/src/mod_power_domain.c
@@ -14,15 +14,15 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
-#include <fwk_thread.h>
 #include <fwk_multi_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
+#include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
 
diff --git a/module/ppu_v0/src/ppu_v0.c b/module/ppu_v0/src/ppu_v0.c
index bd353511..e49cb53d 100644
--- a/module/ppu_v0/src/ppu_v0.c
+++ b/module/ppu_v0/src/ppu_v0.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <ppu_v0.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 void ppu_v0_init(struct ppu_v0_reg *ppu)
 {
diff --git a/module/ppu_v1/src/ppu_v1.c b/module/ppu_v1/src/ppu_v1.c
index 9fbbc3d4..38406525 100644
--- a/module/ppu_v1/src/ppu_v1.c
+++ b/module/ppu_v1/src/ppu_v1.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <ppu_v1.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 void ppu_v1_init(struct ppu_v1_reg *ppu)
 {
diff --git a/module/reg_sensor/src/mod_reg_sensor.c b/module/reg_sensor/src/mod_reg_sensor.c
index 20967079..117dbf74 100644
--- a/module/reg_sensor/src/mod_reg_sensor.c
+++ b/module/reg_sensor/src/mod_reg_sensor.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_reg_sensor.h>
 #include <mod_sensor.h>
 
diff --git a/module/scmi/src/mod_scmi.c b/module/scmi/src/mod_scmi.c
index ed3a2766..22ab7f26 100644
--- a/module/scmi/src/mod_scmi.c
+++ b/module/scmi/src/mod_scmi.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
@@ -20,6 +19,7 @@
 #include <fwk_module_idx.h>
 #include <fwk_multi_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <internal/mod_scmi.h>
 #include <internal/scmi.h>
 #include <internal/scmi_base.h>
diff --git a/module/scmi_apcore/src/mod_scmi_apcore.c b/module/scmi_apcore/src/mod_scmi_apcore.c
index dac63dcd..fd0379c0 100644
--- a/module/scmi_apcore/src/mod_scmi_apcore.c
+++ b/module/scmi_apcore/src/mod_scmi_apcore.c
@@ -10,11 +10,11 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_apcore.h>
 #include <mod_scmi.h>
diff --git a/module/scmi_clock/src/mod_scmi_clock.c b/module/scmi_clock/src/mod_scmi_clock.c
index b0beb0a3..d49f850e 100644
--- a/module/scmi_clock/src/mod_scmi_clock.c
+++ b/module/scmi_clock/src/mod_scmi_clock.c
@@ -10,11 +10,11 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_clock.h>
 #include <mod_clock.h>
diff --git a/module/scmi_perf/src/mod_scmi_perf.c b/module/scmi_perf/src/mod_scmi_perf.c
index f9395a64..59abfcf7 100644
--- a/module/scmi_perf/src/mod_scmi_perf.c
+++ b/module/scmi_perf/src/mod_scmi_perf.c
@@ -10,10 +10,10 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_perf.h>
 #include <mod_dvfs.h>
diff --git a/module/scmi_power_domain/src/mod_scmi_power_domain.c b/module/scmi_power_domain/src/mod_scmi_power_domain.c
index 1556afdd..92f10407 100644
--- a/module/scmi_power_domain/src/mod_scmi_power_domain.c
+++ b/module/scmi_power_domain/src/mod_scmi_power_domain.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_power_domain.h>
 #include <mod_log.h>
diff --git a/module/scmi_sensor/src/mod_scmi_sensor.c b/module/scmi_sensor/src/mod_scmi_sensor.c
index 66eeee25..afe9211e 100644
--- a/module/scmi_sensor/src/mod_scmi_sensor.c
+++ b/module/scmi_sensor/src/mod_scmi_sensor.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_sensor.h>
 #include <mod_sensor.h>
diff --git a/module/scmi_system_power/src/mod_scmi_system_power.c b/module/scmi_system_power/src/mod_scmi_system_power.c
index 9374ea8f..7540c9df 100644
--- a/module/scmi_system_power/src/mod_scmi_system_power.c
+++ b/module/scmi_system_power/src/mod_scmi_system_power.c
@@ -7,11 +7,11 @@
 
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/scmi_system_power.h>
 #include <mod_power_domain.h>
diff --git a/module/sds/src/mod_sds.c b/module/sds/src/mod_sds.c
index d87e6f71..c7665a29 100644
--- a/module/sds/src/mod_sds.c
+++ b/module/sds/src/mod_sds.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_sds.h>
 
 #if BUILD_HAS_MOD_CLOCK
diff --git a/module/sensor/src/mod_sensor.c b/module/sensor/src/mod_sensor.c
index 86af115b..dd11683f 100644
--- a/module/sensor/src/mod_sensor.c
+++ b/module/sensor/src/mod_sensor.c
@@ -7,11 +7,11 @@
 
 #include <stdbool.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_sensor.h>
 
 struct sensor_dev_ctx {
diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c
index 25327119..e0e8dde6 100644
--- a/module/smt/src/mod_smt.c
+++ b/module/smt/src/mod_smt.c
@@ -8,12 +8,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
 #include <mod_scmi.h>
diff --git a/module/system_pll/src/mod_system_pll.c b/module/system_pll/src/mod_system_pll.c
index 76aa9f7e..d2f73a23 100644
--- a/module/system_pll/src/mod_system_pll.c
+++ b/module/system_pll/src/mod_system_pll.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_system_pll.h>
 #include <mod_power_domain.h>
diff --git a/module/timer/src/mod_timer.c b/module/timer/src/mod_timer.c
index 00a4ba92..8edd91f6 100644
--- a/module/timer/src/mod_timer.c
+++ b/module/timer/src/mod_timer.c
@@ -13,7 +13,6 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_event.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
@@ -21,6 +20,7 @@
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_timer.h>
diff --git a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c
index 735a7360..a52d8341 100644
--- a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c
+++ b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_juno_ddr_phy400.h>
 #include <mod_juno_dmc400.h>
 #include <juno_scc.h>
diff --git a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c
index c60edafc..6617eb1c 100644
--- a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c
+++ b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c
@@ -9,13 +9,13 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_multi_thread.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_juno_dmc400.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
diff --git a/product/juno/module/juno_ppu/src/mod_juno_ppu.c b/product/juno/module/juno_ppu/src/mod_juno_ppu.c
index affe5bb3..583f708f 100644
--- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c
+++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c
@@ -7,12 +7,12 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_juno_ppu.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
diff --git a/product/juno/module/juno_ram/src/mod_juno_ram.c b/product/juno/module/juno_ram/src/mod_juno_ram.c
index d2ff61a5..a89eb512 100644
--- a/product/juno/module/juno_ram/src/mod_juno_ram.c
+++ b/product/juno/module/juno_ram/src/mod_juno_ram.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_math.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_juno_ram.h>
 #include <mod_timer.h>
 #include <juno_id.h>
diff --git a/product/juno/module/juno_rom/src/juno_debug_rom.c b/product/juno/module/juno_rom/src/juno_debug_rom.c
index 0e358d9e..0fd465b3 100644
--- a/product/juno/module/juno_rom/src/juno_debug_rom.c
+++ b/product/juno/module/juno_rom/src/juno_debug_rom.c
@@ -6,9 +6,9 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_juno_ppu.h>
 #include <juno_irq.h>
 #include <juno_ppu_idx.h>
diff --git a/product/juno/module/juno_rom/src/mod_juno_rom.c b/product/juno/module/juno_rom/src/mod_juno_rom.c
index 0dff1dd3..6062c402 100644
--- a/product/juno/module/juno_rom/src/mod_juno_rom.c
+++ b/product/juno/module/juno_rom/src/mod_juno_rom.c
@@ -7,12 +7,12 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_bootloader.h>
 #include <mod_juno_ppu.h>
diff --git a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c
index b6f6ca61..f57231ba 100644
--- a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c
+++ b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c
@@ -10,8 +10,8 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_juno_soc_clock.h>
 #include <juno_id.h>
 #include <juno_scc.h>
diff --git a/product/juno/module/juno_system/src/mod_juno_system.c b/product/juno/module/juno_system/src/mod_juno_system.c
index c15f2bf0..243535fa 100644
--- a/product/juno/module/juno_system/src/mod_juno_system.c
+++ b/product/juno/module/juno_system/src/mod_juno_system.c
@@ -8,12 +8,12 @@
 #include <stdint.h>
 #include <fmw_cmsis.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_juno_system.h>
 #include <mod_juno_xrp7724.h>
 #include <mod_scmi.h>
diff --git a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c
index bc0f710e..ca7f5cf5 100644
--- a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c
+++ b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c
@@ -7,11 +7,11 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_multi_thread.h>
+#include <fwk_status.h>
 #include <mod_i2c.h>
 #include <mod_juno_xrp7724.h>
 #include <mod_timer.h>
diff --git a/product/juno/src/juno_id.c b/product/juno/src/juno_id.c
index 09d28b52..bf3b3bfc 100644
--- a/product/juno/src/juno_id.c
+++ b/product/juno/src/juno_id.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <juno_id.h>
 #include <juno_scc.h>
 #include <v2m_sys_regs.h>
diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c
index c1cb1f9b..d16e9ce2 100644
--- a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c
+++ b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c
@@ -10,11 +10,11 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/n1sdp_ddr_phy.h>
 #include <mod_n1sdp_ddr_phy.h>
 #include <mod_n1sdp_dmc620.h>
diff --git a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c
index f418dbf7..122e6135 100644
--- a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c
+++ b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_log.h>
 #include <mod_n1sdp_dmc620.h>
diff --git a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c
index e34e88a2..09126f3b 100644
--- a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c
+++ b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c
@@ -11,10 +11,10 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_n1sdp_flash.h>
 #include <internal/n1sdp_flash_layout.h>
 
diff --git a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c
index 0c8888ef..b7a42ce9 100644
--- a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c
+++ b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c
@@ -9,9 +9,9 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <internal/n1sdp_i2c.h>
 #include <mod_log.h>
 #include <mod_n1sdp_i2c.h>
diff --git a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c
index 95be1c97..be5e34de 100644
--- a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c
+++ b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c
@@ -10,12 +10,12 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/mhu.h>
 #include <mod_smt.h>
 
diff --git a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
index 0cc7c3a7..70ae5b11 100644
--- a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
+++ b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c
@@ -7,13 +7,13 @@
 
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_math.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_n1sdp_pcie.h>
 #include <mod_log.h>
diff --git a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c
index 1ec2dc9a..f29594bf 100644
--- a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c
+++ b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <internal/pcie_ctrl_apb_reg.h>
 #include <mod_n1sdp_pcie.h>
 #include <mod_timer.h>
diff --git a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c
index fa359949..43935f49 100644
--- a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c
+++ b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_macros.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_n1sdp_pll.h>
 #include <mod_power_domain.h>
diff --git a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c
index c24cbac5..c73e4426 100644
--- a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c
+++ b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_n1sdp_flash.h>
 #include <mod_n1sdp_rom.h>
diff --git a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
index b30c7080..042dcab5 100644
--- a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
+++ b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
@@ -8,12 +8,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_power_domain.h>
 #include <mod_smt.h>
diff --git a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c
index 9c412583..76168143 100644
--- a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c
+++ b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c
@@ -11,11 +11,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <internal/mod_scmi_ccix_config.h>
 #include <mod_n1sdp_pcie.h>
diff --git a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c
index 329adba8..7a27ebea 100644
--- a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c
+++ b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c
@@ -10,11 +10,11 @@
 
 #include <stdint.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <internal/scmi.h>
 #include <mod_scmi.h>
 #include <mod_scmi_management.h>
diff --git a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c
index 86f51f5b..05135a86 100644
--- a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c
+++ b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_rdn1e1_rom.h>
diff --git a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c
index fde51226..4150fdcd 100644
--- a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c
+++ b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_sgi575_rom.h>
diff --git a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c
index 8a187c0e..6a6263d5 100644
--- a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c
+++ b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c
@@ -9,11 +9,11 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_sgm775_ddr_phy500.h>
 #include <mod_sgm775_dmc500.h>
 
diff --git a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c
index 6d88ebcc..02f67678 100644
--- a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c
+++ b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c
@@ -9,10 +9,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_sgm775_dmc500.h>
 
 #define COL_BITS 1
diff --git a/product/synquacer/module/ccn512/src/mod_ccn512.c b/product/synquacer/module/ccn512/src/mod_ccn512.c
index 7e13e807..d1b3ccc4 100644
--- a/product/synquacer/module/ccn512/src/mod_ccn512.c
+++ b/product/synquacer/module/ccn512/src/mod_ccn512.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_ccn512.h>
 #include <mod_log.h>
 #include <synquacer_ddr.h>
diff --git a/product/synquacer/module/f_i2c/src/mod_f_i2c.c b/product/synquacer/module/f_i2c/src/mod_f_i2c.c
index a49c58bc..844f8287 100644
--- a/product/synquacer/module/f_i2c/src/mod_f_i2c.c
+++ b/product/synquacer/module/f_i2c/src/mod_f_i2c.c
@@ -6,10 +6,10 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_f_i2c.h>
 #include <mod_log.h>
diff --git a/product/synquacer/module/f_uart3/src/mod_f_uart3.c b/product/synquacer/module/f_uart3/src/mod_f_uart3.c
index 881c95b2..5c8ae347 100644
--- a/product/synquacer/module/f_uart3/src/mod_f_uart3.c
+++ b/product/synquacer/module/f_uart3/src/mod_f_uart3.c
@@ -7,10 +7,10 @@
 
 #include <fmw_cmsis.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_f_uart3.h>
 #include <mod_log.h>
diff --git a/product/synquacer/module/hsspi/src/mod_hsspi.c b/product/synquacer/module/hsspi/src/mod_hsspi.c
index f4a49b29..8f96d82c 100644
--- a/product/synquacer/module/hsspi/src/mod_hsspi.c
+++ b/product/synquacer/module/hsspi/src/mod_hsspi.c
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <fmw_cmsis.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_hsspi.h>
 #include <mod_log.h>
diff --git a/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c b/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c
index 4bb8498e..7d4f1ebe 100644
--- a/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c
+++ b/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <fwk_assert.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <ppu_v0.h>
 
 void ppu_v0_init(struct ppu_v0_reg *ppu)
diff --git a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c
index 7adfae2c..e5bf6a53 100644
--- a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c
+++ b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c
@@ -8,11 +8,11 @@
 #include <string.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_scmi.h>
 #include <ddr_init.h>
diff --git a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c
index 9ccc5230..eced93a9 100644
--- a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c
+++ b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c
@@ -6,9 +6,9 @@
  */
 
 #include <fwk_assert.h>
-#include <fwk_errno.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_log.h>
 #include <mod_synquacer_memc.h>
 #include <synquacer_ddr.h>
diff --git a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c
index 4a1137d1..6dabecbe 100644
--- a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c
+++ b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <mod_f_i2c.h>
 #include <synquacer_config.h>
 #include <synquacer_ddr.h>
diff --git a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
index 85cfcaca..d18074a9 100644
--- a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
+++ b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 #include <fwk_assert.h>
 #include <fwk_element.h>
-#include <fwk_errno.h>
 #include <fwk_mm.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <mod_clock.h>
 #include <mod_css_clock.h>
 #include <mod_power_domain.h>
diff --git a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c
index 462ee3f6..fd92226f 100644
--- a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c
+++ b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <fwk_errno.h>
 #include <fwk_interrupt.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
+#include <fwk_status.h>
 #include <fwk_thread.h>
 #include <mod_log.h>
 #include <mod_synquacer_rom.h>
diff --git a/product/synquacer/module/synquacer_system/src/synquacer_main.c b/product/synquacer/module/synquacer_system/src/synquacer_main.c
index f979b5b2..41bf2e1a 100644
--- a/product/synquacer/module/synquacer_system/src/synquacer_main.c
+++ b/product/synquacer/module/synquacer_system/src/synquacer_main.c
@@ -9,12 +9,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <fwk_errno.h>
 #include <fwk_id.h>
 #include <fwk_macros.h>
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 #include <fwk_notification.h>
+#include <fwk_status.h>
 
 #include <mod_f_i2c.h>
 #include <mod_hsspi.h>
diff --git a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c
index 87ab6c70..706ea870 100644
--- a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c
+++ b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 
 #include <fmw_cmsis.h>
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 #include <synquacer_core.h>
 #include <synquacer_debug.h>
diff --git a/product/synquacer/module/synquacer_system/src/sysoc.c b/product/synquacer/module/synquacer_system/src/sysoc.c
index 5e056222..abb9f6d8 100644
--- a/product/synquacer/module/synquacer_system/src/sysoc.c
+++ b/product/synquacer/module/synquacer_system/src/sysoc.c
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <fwk_errno.h>
+#include <fwk_status.h>
 
 #include <synquacer_debug.h>
 #include <synquacer_mmap.h>
diff --git a/product/synquacer/module/synquacer_system/src/thermal_sensor.c b/product/synquacer/module/synquacer_system/src/thermal_sensor.c
index 86d9ffa6..39d1c919 100644
--- a/product/synquacer/module/synquacer_system/src/thermal_sensor.c
+++ b/product/synquacer/module/synquacer_system/src/thermal_sensor.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <fwk_errno.h>
+#include <fwk_status.h>
 #include <cmsis_os2.h>
 
 #include <synquacer_debug.h>