diff --git a/product/host/fw/Firmware.cmake b/product/host/fw/Firmware.cmake
index ed0c086d114f914f1a85a70aeb34c0d71c2506d8..233aec93cb530ce2d485921f3e5f3154b4d54fe5 100644
--- a/product/host/fw/Firmware.cmake
+++ b/product/host/fw/Firmware.cmake
@@ -8,8 +8,6 @@
set(SCP_FIRMWARE "host")
set(SCP_FIRMWARE_TARGET "host")
-set(SCP_ENABLE_MULTITHREADING FALSE)
-
set(SCP_ARCHITECTURE "none")
list(APPEND SCP_MODULES "stdio")
diff --git a/product/host/fw/firmware.mk b/product/host/fw/firmware.mk
index 38dd2598e0dff15659a96ac9f828cfffb3c693e0..143a9556e504de6d2319c9e70239146726f659d1 100644
--- a/product/host/fw/firmware.mk
+++ b/product/host/fw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := host
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULES := stdio
diff --git a/product/juno/scp_ramfw/CMakeLists.txt b/product/juno/scp_ramfw/CMakeLists.txt
index 186038ab521ccc5dc6c086df4327fb82e265ea4f..7276343936fb655b30ca8c94b07d586b22ec3e03 100644
--- a/product/juno/scp_ramfw/CMakeLists.txt
+++ b/product/juno/scp_ramfw/CMakeLists.txt
@@ -54,11 +54,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/../src/juno_id.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../src/juno_scmi_clock.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(juno-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(juno-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
if(SCP_ENABLE_DEBUG_UNIT)
target_sources(
juno-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_juno_debug.c"
diff --git a/product/juno/scp_ramfw/Firmware.cmake b/product/juno/scp_ramfw/Firmware.cmake
index 24dc10082a96abaf61804ba0a14b3807877c25ea..06d99869469804eb0eea959d67ea6ff2cca28118 100644
--- a/product/juno/scp_ramfw/Firmware.cmake
+++ b/product/juno/scp_ramfw/Firmware.cmake
@@ -16,8 +16,6 @@ set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_SCMI_NOTIFICATIONS_INIT FALSE)
diff --git a/product/juno/scp_ramfw/RTX_Config.h b/product/juno/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 777b014d150a9ccb08ffc8163c3472c1733f65e7..0000000000000000000000000000000000000000
--- a/product/juno/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/juno/scp_ramfw/firmware.mk b/product/juno/scp_ramfw/firmware.mk
index ccae1949dfe35df31c6e17f27035bbd5b10e3002..55c0bf04ded2926f86a4b0f4b9ff3ec5d7e11fa4 100644
--- a/product/juno/scp_ramfw/firmware.mk
+++ b/product/juno/scp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_SCMI_NOTIFICATIONS := no
BS_FIRMWARE_HAS_FAST_CHANNELS := no
@@ -106,10 +105,6 @@ BS_FIRMWARE_SOURCES := \
config_scmi_power_domain.c \
juno_scmi_clock.c
-ifeq ($(BS_FIRMWARE_HAS_MULTITHREADING),yes)
- BS_FIRMWARE_SOURCES += rtx_config.c
-endif
-
ifeq ($(BS_FIRMWARE_HAS_DEBUG_UNIT),yes)
BS_FIRMWARE_SOURCES += config_juno_debug.c config_debug.c
endif
diff --git a/product/juno/scp_ramfw/rtx_config.c b/product/juno/scp_ramfw/rtx_config.c
deleted file mode 100644
index ccb81dbebcb17895d1908c859092c48f02137c57..0000000000000000000000000000000000000000
--- a/product/juno/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2015-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- (void)argument;
-
- while (true) {
- __WFI();
- }
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- (void)object_id;
-
- switch (code) {
- case osRtxErrorStackUnderflow:
- /*
- * Stack underflow detected for thread
- * thread_id=object_id
- */
- break;
-
- case osRtxErrorISRQueueOverflow:
- /*
- * ISR Queue overflow detected when inserting object
- * object_id
- */
- break;
-
- case osRtxErrorTimerQueueOverflow:
- /*
- * User Timer Callback Queue overflow detected for timer
- * timer_id=object_id
- */
- break;
-
- case osRtxErrorClibSpace:
- /*
- * Standard C/C++ library libspace not available:
- * increase OS_THREAD_LIBSPACE_NUM
- */
- break;
-
- case osRtxErrorClibMutex:
- /*
- * Standard C/C++ library mutex initialization failed
- */
- break;
-
- default:
- break;
- }
-
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/juno/scp_romfw/Firmware.cmake b/product/juno/scp_romfw/Firmware.cmake
index 1223aacbd8f2f39a49be43f1d17359ae6edb2e05..df01f2863e88dff5e495557e68ad472a29ede68b 100644
--- a/product/juno/scp_romfw/Firmware.cmake
+++ b/product/juno/scp_romfw/Firmware.cmake
@@ -15,8 +15,6 @@ set(SCP_FIRMWARE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/juno/scp_romfw/firmware.mk b/product/juno/scp_romfw/firmware.mk
index 18fc8f99dc4c19725a742451dd129210069c525f..6f198922cbd34bbee7e31ded7cfe950d6c779699 100644
--- a/product/juno/scp_romfw/firmware.mk
+++ b/product/juno/scp_romfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/juno/scp_romfw_bypass/Firmware.cmake b/product/juno/scp_romfw_bypass/Firmware.cmake
index b3555d9eefe01ab4871ea43f975e4266f421ee8c..9a150d8a47d74d18b03dd7954096c4d734bb0ece 100644
--- a/product/juno/scp_romfw_bypass/Firmware.cmake
+++ b/product/juno/scp_romfw_bypass/Firmware.cmake
@@ -17,7 +17,6 @@ set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING FALSE)
set(SCP_ENABLE_NOTIFICATIONS TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/juno/scp_romfw_bypass/firmware.mk b/product/juno/scp_romfw_bypass/firmware.mk
index eb788787a48512bb4caf04493d1558ee3ec5e342..44aec07e713d511b12452d602b9c91570d67771c 100644
--- a/product/juno/scp_romfw_bypass/firmware.mk
+++ b/product/juno/scp_romfw_bypass/firmware.mk
@@ -11,7 +11,6 @@
DEFINES += SCP_ROM_BYPASS=1
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/morello/mcp_ramfw_fvp/CMakeLists.txt b/product/morello/mcp_ramfw_fvp/CMakeLists.txt
index f7bdfc688c08c4421d482988c54803505150ac32..7b9920250788c12b8e82fcdcf84afca1e68b1194 100644
--- a/product/morello/mcp_ramfw_fvp/CMakeLists.txt
+++ b/product/morello/mcp_ramfw_fvp/CMakeLists.txt
@@ -19,8 +19,7 @@ target_include_directories(
target_sources(
morello-fvp-mcp-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_pik_clock.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_clock.c"
@@ -28,12 +27,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/config_smt.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_scmi_agent.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(morello-fvp-mcp-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(morello-fvp-mcp-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/morello/mcp_ramfw_fvp/Firmware.cmake b/product/morello/mcp_ramfw_fvp/Firmware.cmake
index a780f615fa4ca782e8743ac509b1fa85d3c8d21f..d97e51e01352ee5303ba872bc5a428654c9e65e0 100644
--- a/product/morello/mcp_ramfw_fvp/Firmware.cmake
+++ b/product/morello/mcp_ramfw_fvp/Firmware.cmake
@@ -16,8 +16,6 @@ set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
list(PREPEND SCP_MODULE_PATHS
diff --git a/product/morello/mcp_ramfw_fvp/RTX_Config.h b/product/morello/mcp_ramfw_fvp/RTX_Config.h
deleted file mode 100644
index 1d7c08ae08f342c5f1f8b4dfcf8b1a0bb2749eb4..0000000000000000000000000000000000000000
--- a/product/morello/mcp_ramfw_fvp/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by an RTX
- * file in order to create an object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/morello/mcp_ramfw_fvp/firmware.mk b/product/morello/mcp_ramfw_fvp/firmware.mk
index a1c4a788c8d3a8e174da1e4b2a012cff9aef93ac..778e84f5ae10cdb7c274bbcc583d072db40f6ab4 100644
--- a/product/morello/mcp_ramfw_fvp/firmware.mk
+++ b/product/morello/mcp_ramfw_fvp/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
@@ -28,7 +27,6 @@ BS_FIRMWARE_MODULES := \
morello_mcp_system
BS_FIRMWARE_SOURCES := \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_pik_clock.c \
diff --git a/product/morello/mcp_ramfw_fvp/rtx_config.c b/product/morello/mcp_ramfw_fvp/rtx_config.c
deleted file mode 100644
index 1ff52b426f5523dad1d72b6a0749a31cd1a30de6..0000000000000000000000000000000000000000
--- a/product/morello/mcp_ramfw_fvp/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "morello_system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/morello/mcp_romfw/firmware.mk b/product/morello/mcp_romfw/firmware.mk
index f1326fcf2349bdaaa1c3e1a4a03f4931ca5d0a63..53cf840e744cbaa1f3a924de73115ddcaac7f23a 100644
--- a/product/morello/mcp_romfw/firmware.mk
+++ b/product/morello/mcp_romfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/morello/scp_ramfw_fvp/CMakeLists.txt b/product/morello/scp_ramfw_fvp/CMakeLists.txt
index 0eada826f7c6e363d15ea0f8a700405ed6462352..7e49d919fe36c9fb5195827eb719f1a735b39101 100644
--- a/product/morello/scp_ramfw_fvp/CMakeLists.txt
+++ b/product/morello/scp_ramfw_fvp/CMakeLists.txt
@@ -19,8 +19,7 @@ target_include_directories(
target_sources(
morello-fvp-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_ssc.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_system_info.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_power_domain.c"
@@ -50,11 +49,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/config_resource_perms.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../src/morello_core.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(morello-fvp-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(morello-fvp-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
if(SCP_ENABLE_DEBUGGER_INIT)
target_compile_definitions(morello-fvp-bl2 PRIVATE BUILD_HAS_DEBUGGER)
diff --git a/product/morello/scp_ramfw_fvp/Firmware.cmake b/product/morello/scp_ramfw_fvp/Firmware.cmake
index 0ad32f4f801dca482d47d16cb356fe0abbb45267..aec39a32eb4c40992bd98fff6a57bccfff038413 100644
--- a/product/morello/scp_ramfw_fvp/Firmware.cmake
+++ b/product/morello/scp_ramfw_fvp/Firmware.cmake
@@ -17,14 +17,10 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/morello/scp_ramfw_fvp/RTX_Config.h b/product/morello/scp_ramfw_fvp/RTX_Config.h
deleted file mode 100644
index 1d7c08ae08f342c5f1f8b4dfcf8b1a0bb2749eb4..0000000000000000000000000000000000000000
--- a/product/morello/scp_ramfw_fvp/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by an RTX
- * file in order to create an object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/morello/scp_ramfw_fvp/firmware.mk b/product/morello/scp_ramfw_fvp/firmware.mk
index 7a87fabd83bab7e1a4232832e79c5605a6d6155d..dec24a0c49f31aa72815111b6940d7da968b8ec7 100644
--- a/product/morello/scp_ramfw_fvp/firmware.mk
+++ b/product/morello/scp_ramfw_fvp/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
@@ -49,7 +48,6 @@ BS_FIRMWARE_MODULES := \
resource_perms
BS_FIRMWARE_SOURCES := \
- rtx_config.c \
morello_core.c \
config_armv7m_mpu.c \
config_ssc.c \
diff --git a/product/morello/scp_ramfw_fvp/rtx_config.c b/product/morello/scp_ramfw_fvp/rtx_config.c
deleted file mode 100644
index 1ff52b426f5523dad1d72b6a0749a31cd1a30de6..0000000000000000000000000000000000000000
--- a/product/morello/scp_ramfw_fvp/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "morello_system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/morello/scp_romfw/firmware.mk b/product/morello/scp_romfw/firmware.mk
index f1326fcf2349bdaaa1c3e1a4a03f4931ca5d0a63..53cf840e744cbaa1f3a924de73115ddcaac7f23a 100644
--- a/product/morello/scp_romfw/firmware.mk
+++ b/product/morello/scp_romfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/rcar/scp_ramfw/Firmware.cmake b/product/rcar/scp_ramfw/Firmware.cmake
index 3a1839ee03e5e9451b5a5884f789fbccad1b6793..f4f50e9371500223eed0901fecfc94a60b48f480 100644
--- a/product/rcar/scp_ramfw/Firmware.cmake
+++ b/product/rcar/scp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_SCMI_RESET_INIT TRUE)
diff --git a/product/rcar/scp_ramfw/firmware.mk b/product/rcar/scp_ramfw/firmware.mk
index 70799c2b762c6c18b6bf31a055fe32846fafcc5d..f2e41b2b5ee7244a343663cff6364645cb8bd9bc 100644
--- a/product/rcar/scp_ramfw/firmware.mk
+++ b/product/rcar/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-a57.cortex-a53
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_SCMI_NOTIFICATIONS := no
BS_FIRMWARE_HAS_FAST_CHANNELS := no
diff --git a/product/rdn1e1/mcp_ramfw/firmware.mk b/product/rdn1e1/mcp_ramfw/firmware.mk
index 8a16191ba5cce02764c0dea3a76e17ae45d9082d..d3a87817438d220807d717845f065fb68a2bb3aa 100644
--- a/product/rdn1e1/mcp_ramfw/firmware.mk
+++ b/product/rdn1e1/mcp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain \
diff --git a/product/rdn1e1/mcp_romfw/Firmware.cmake b/product/rdn1e1/mcp_romfw/Firmware.cmake
index a7a7f915778cbc34b899d8ef9abbdc8b025e27a0..562c72e8c699125f9ce1e2462fb4b02c37dfd346 100644
--- a/product/rdn1e1/mcp_romfw/Firmware.cmake
+++ b/product/rdn1e1/mcp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdn1e1/mcp_romfw/firmware.mk b/product/rdn1e1/mcp_romfw/firmware.mk
index faf9217d05f82e0fe53417c6b5eaf614a69e6da7..feea3605dc8f54edc167c11b0490745c70ae84be 100644
--- a/product/rdn1e1/mcp_romfw/firmware.mk
+++ b/product/rdn1e1/mcp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/rdn1e1/scp_ramfw/CMakeLists.txt b/product/rdn1e1/scp_ramfw/CMakeLists.txt
index ea1514caf4aec538f32f91de661a69f9b07a848f..f352244f8180c2067bda8cf72e5b536ae853077d 100644
--- a/product/rdn1e1/scp_ramfw/CMakeLists.txt
+++ b/product/rdn1e1/scp_ramfw/CMakeLists.txt
@@ -20,7 +20,6 @@ target_include_directories(
target_sources(
rdn1e1-bl2
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_system_power.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_power_domain.c"
@@ -51,12 +50,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_system_info.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_sid.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdn1e1-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdn1e1-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/rdn1e1/scp_ramfw/Firmware.cmake b/product/rdn1e1/scp_ramfw/Firmware.cmake
index 70c47e5d0c6fa2a6c6178eb6c942900c08103376..88fdd0b472a0d3906aa184b5294860ef226b6c4d 100644
--- a/product/rdn1e1/scp_ramfw/Firmware.cmake
+++ b/product/rdn1e1/scp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ARCHITECTURE "armv7-m")
diff --git a/product/rdn1e1/scp_ramfw/RTX_Config.h b/product/rdn1e1/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 777b014d150a9ccb08ffc8163c3472c1733f65e7..0000000000000000000000000000000000000000
--- a/product/rdn1e1/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/rdn1e1/scp_ramfw/firmware.mk b/product/rdn1e1/scp_ramfw/firmware.mk
index d4685cd8e39c7b2db8b42fb82fa76d4ea5dd5294..ec272aa75724675bd517ccea24d329b3e4c350e2 100644
--- a/product/rdn1e1/scp_ramfw/firmware.mk
+++ b/product/rdn1e1/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
@@ -54,7 +53,6 @@ BS_FIRMWARE_SOURCES := \
config_system_power.c \
config_sid.c \
config_system_info.c \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_power_domain.c \
diff --git a/product/rdn1e1/scp_ramfw/rtx_config.c b/product/rdn1e1/scp_ramfw/rtx_config.c
deleted file mode 100644
index 788b690de04704bb6c46c7a9cb66aedcdd2434a4..0000000000000000000000000000000000000000
--- a/product/rdn1e1/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/rdn1e1/scp_romfw/Firmware.cmake b/product/rdn1e1/scp_romfw/Firmware.cmake
index 627ee2bc3275693e947768d9dda7667a27025655..d07c3c2dc4565bb75af6472613ebd16a5e3f0f27 100644
--- a/product/rdn1e1/scp_romfw/Firmware.cmake
+++ b/product/rdn1e1/scp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdn1e1/scp_romfw/firmware.mk b/product/rdn1e1/scp_romfw/firmware.mk
index 2b791be045f804c8a29061ef1b59e6f320bb08af..a5ca902dcbfe83c791b0ae0c89a1909df0eb8cb2 100644
--- a/product/rdn1e1/scp_romfw/firmware.mk
+++ b/product/rdn1e1/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/rdn2/mcp_ramfw/CMakeLists.txt b/product/rdn2/mcp_ramfw/CMakeLists.txt
index b5650b907cfe66f9ce20f978a0fdfd249a7dbf1e..a96abe06871d0cad696af2481b848bd4b8007518 100644
--- a/product/rdn2/mcp_ramfw/CMakeLists.txt
+++ b/product/rdn2/mcp_ramfw/CMakeLists.txt
@@ -29,18 +29,12 @@ target_include_directories(
target_sources(
rdn2-mcp-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_clock.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_timer.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_gtimer.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdn2-mcp-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdn2-mcp-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
if(SCP_ENABLE_DEBUGGER_INIT)
target_compile_definitions(rdn2-mcp-bl2 PRIVATE BUILD_HAS_DEBUGGER)
target_sources(rdn2-mcp-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_debugger_cli.c")
diff --git a/product/rdn2/mcp_ramfw/Firmware.cmake b/product/rdn2/mcp_ramfw/Firmware.cmake
index f8458103d7d05ecd308b3dbd44bd1b5004aedc5d..f8802fd037d16dc57a946115f99bca3d75debbbe 100644
--- a/product/rdn2/mcp_ramfw/Firmware.cmake
+++ b/product/rdn2/mcp_ramfw/Firmware.cmake
@@ -19,8 +19,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdn2/mcp_ramfw/RTX_Config.h b/product/rdn2/mcp_ramfw/RTX_Config.h
deleted file mode 100644
index beb0d9d6a80bba5be3ad6f3389a833353906fc80..0000000000000000000000000000000000000000
--- a/product/rdn2/mcp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/rdn2/mcp_ramfw/firmware.mk b/product/rdn2/mcp_ramfw/firmware.mk
index 478041734e06df8fd6686af96bac655ec84b66a3..d3a87817438d220807d717845f065fb68a2bb3aa 100644
--- a/product/rdn2/mcp_ramfw/firmware.mk
+++ b/product/rdn2/mcp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain \
@@ -25,7 +24,6 @@ BS_FIRMWARE_MODULES := \
mcp_platform
BS_FIRMWARE_SOURCES := \
- rtx_config.c \
config_armv7m_mpu.c \
config_clock.c \
config_pl011.c \
diff --git a/product/rdn2/mcp_ramfw/rtx_config.c b/product/rdn2/mcp_ramfw/rtx_config.c
deleted file mode 100644
index e5c345af0abbd5212741da5093e896885cf236a7..0000000000000000000000000000000000000000
--- a/product/rdn2/mcp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/rdn2/mcp_romfw/Firmware.cmake b/product/rdn2/mcp_romfw/Firmware.cmake
index c82e77580d405931307d9049d61e9cbae1dc5bf6..21948ee548d7700fdb89ee09c148a7e916b10a45 100644
--- a/product/rdn2/mcp_romfw/Firmware.cmake
+++ b/product/rdn2/mcp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdn2/mcp_romfw/firmware.mk b/product/rdn2/mcp_romfw/firmware.mk
index 92cb44d25ea6495356d3f8ce064397138f79c616..cae11fa2f95189e5fc2496e88903128d845f9191 100644
--- a/product/rdn2/mcp_romfw/firmware.mk
+++ b/product/rdn2/mcp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain
diff --git a/product/rdn2/scp_ramfw/CMakeLists.txt b/product/rdn2/scp_ramfw/CMakeLists.txt
index 8f53154f6a7c35e3f4ec5aeb3caa6ecf35c9d82c..f708071e3a0a22e0fe5a55e7689528f4ca7291ce 100644
--- a/product/rdn2/scp_ramfw/CMakeLists.txt
+++ b/product/rdn2/scp_ramfw/CMakeLists.txt
@@ -36,7 +36,6 @@ target_include_directories(
target_sources(
rdn2-bl2
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_system_power.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_power_domain.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_ppu_v1.c"
@@ -60,11 +59,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_sid.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdn2-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdn2-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/rdn2/scp_ramfw/Firmware.cmake b/product/rdn2/scp_ramfw/Firmware.cmake
index 65c1d11226f8fa758f97e54842e32f2fb6f0a549..aa6f29051b3d394abf21e698ddcb32a99a815d8a 100644
--- a/product/rdn2/scp_ramfw/Firmware.cmake
+++ b/product/rdn2/scp_ramfw/Firmware.cmake
@@ -16,9 +16,6 @@ set(SCP_FIRMWARE_TARGET "rdn2-bl2")
set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdn2/scp_ramfw/RTX_Config.h b/product/rdn2/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 4e5dc5e4450ac2120ad1a6b568b2b116162fe77e..0000000000000000000000000000000000000000
--- a/product/rdn2/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/rdn2/scp_ramfw/firmware.mk b/product/rdn2/scp_ramfw/firmware.mk
index e3829cfe2938abeec83cba36e4936312cddc0cdb..88664c74081e382f0c101e0a96481dcb1ae165c6 100644
--- a/product/rdn2/scp_ramfw/firmware.mk
+++ b/product/rdn2/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_FAST_CHANNELS := yes
@@ -46,7 +45,6 @@ BS_FIRMWARE_SOURCES := \
config_apremap.c \
config_sid.c \
config_system_info.c \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_power_domain.c \
diff --git a/product/rdn2/scp_ramfw/rtx_config.c b/product/rdn2/scp_ramfw/rtx_config.c
deleted file mode 100644
index 2ec1549a92e3a02843820f4750e5a3918c0e8c9b..0000000000000000000000000000000000000000
--- a/product/rdn2/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true) {
- __WFI();
- }
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/rdn2/scp_romfw/Firmware.cmake b/product/rdn2/scp_romfw/Firmware.cmake
index fbb321774b846fd40486cbfb970e5ceba134107c..a1c52a730edf0f038e12d8f34ffaf30b62ef4c1a 100644
--- a/product/rdn2/scp_romfw/Firmware.cmake
+++ b/product/rdn2/scp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdn2/scp_romfw/firmware.mk b/product/rdn2/scp_romfw/firmware.mk
index b0fcdea834cb52f1bdcf603c235e2f7071d2955f..0b466cc3cbb9732e5d21b94b73dcf2dc97197046 100644
--- a/product/rdn2/scp_romfw/firmware.mk
+++ b/product/rdn2/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain \
diff --git a/product/rdv1/mcp_ramfw/CMakeLists.txt b/product/rdv1/mcp_ramfw/CMakeLists.txt
index 1ec41bcc587e4b5a747982fb4879ce7a14d97531..a63f1b98ccce2d69f423c81cfbfd0293ffa14ba6 100644
--- a/product/rdv1/mcp_ramfw/CMakeLists.txt
+++ b/product/rdv1/mcp_ramfw/CMakeLists.txt
@@ -25,11 +25,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/config_timer.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_gtimer.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdv1-mcp-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdv1-mcp-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
if(SCP_ENABLE_DEBUGGER_INIT)
target_compile_definitions(rdv1-mcp-bl2 PRIVATE BUILD_HAS_DEBUGGER)
target_sources(rdv1-mcp-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_debugger_cli.c")
diff --git a/product/rdv1/mcp_ramfw/Firmware.cmake b/product/rdv1/mcp_ramfw/Firmware.cmake
index 377bcdecfa4c1a9b4396b4e6ae7ae217bf1c7924..d76f00f99cb1d859668745d0ae0e8e9cf0b590cb 100644
--- a/product/rdv1/mcp_ramfw/Firmware.cmake
+++ b/product/rdv1/mcp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdv1/mcp_ramfw/RTX_Config.h b/product/rdv1/mcp_ramfw/RTX_Config.h
deleted file mode 100644
index beb0d9d6a80bba5be3ad6f3389a833353906fc80..0000000000000000000000000000000000000000
--- a/product/rdv1/mcp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/rdv1/mcp_ramfw/firmware.mk b/product/rdv1/mcp_ramfw/firmware.mk
index 478041734e06df8fd6686af96bac655ec84b66a3..d3a87817438d220807d717845f065fb68a2bb3aa 100644
--- a/product/rdv1/mcp_ramfw/firmware.mk
+++ b/product/rdv1/mcp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain \
@@ -25,7 +24,6 @@ BS_FIRMWARE_MODULES := \
mcp_platform
BS_FIRMWARE_SOURCES := \
- rtx_config.c \
config_armv7m_mpu.c \
config_clock.c \
config_pl011.c \
diff --git a/product/rdv1/mcp_ramfw/rtx_config.c b/product/rdv1/mcp_ramfw/rtx_config.c
deleted file mode 100644
index e5c345af0abbd5212741da5093e896885cf236a7..0000000000000000000000000000000000000000
--- a/product/rdv1/mcp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/rdv1/mcp_romfw/Firmware.cmake b/product/rdv1/mcp_romfw/Firmware.cmake
index 477ea7f1164bd2c4ecdeb92192513ae3c36f08b0..d44248d20b6d801b0e38ac4d67021ee761d1a056 100755
--- a/product/rdv1/mcp_romfw/Firmware.cmake
+++ b/product/rdv1/mcp_romfw/Firmware.cmake
@@ -15,8 +15,6 @@ set(SCP_FIRMWARE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdv1/mcp_romfw/firmware.mk b/product/rdv1/mcp_romfw/firmware.mk
index e48992aff65eabf54c0c0d360b05e80564cb9b45..9e1b499a7a8ac28958b9c3bdad4905777b611829 100644
--- a/product/rdv1/mcp_romfw/firmware.mk
+++ b/product/rdv1/mcp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/rdv1/scp_ramfw/CMakeLists.txt b/product/rdv1/scp_ramfw/CMakeLists.txt
index 1e6a4b035ed7983cac950fabac234a50081260bd..eee5d9b08538c88fd9f236a041c3bf8dc20fff68 100755
--- a/product/rdv1/scp_ramfw/CMakeLists.txt
+++ b/product/rdv1/scp_ramfw/CMakeLists.txt
@@ -20,7 +20,6 @@ target_include_directories(
target_sources(
rdv1-bl2
PRIVATE "config_system_power.c"
- "rtx_config.c"
"config_armv7m_mpu.c"
"config_power_domain.c"
"config_ppu_v1.c"
@@ -42,11 +41,6 @@ target_sources(
"../src/config_pl011.c"
"../src/config_sid.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdv1-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdv1-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/rdv1/scp_ramfw/Firmware.cmake b/product/rdv1/scp_ramfw/Firmware.cmake
index fe5d021eeac9486a92fe5ba97827f3b49827dfb2..c0cf78e1888a33d438e81432571437bcc9d1b712 100755
--- a/product/rdv1/scp_ramfw/Firmware.cmake
+++ b/product/rdv1/scp_ramfw/Firmware.cmake
@@ -15,7 +15,6 @@ set(SCP_FIRMWARE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING TRUE)
set(SCP_ENABLE_NOTIFICATIONS TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdv1/scp_ramfw/RTX_Config.h b/product/rdv1/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 4e5dc5e4450ac2120ad1a6b568b2b116162fe77e..0000000000000000000000000000000000000000
--- a/product/rdv1/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/rdv1/scp_ramfw/firmware.mk b/product/rdv1/scp_ramfw/firmware.mk
index 819432ab17bb3eacdf7a07f5dc3370e7b9ebe322..8fda724e495e132ad92d48cee6305c10d8275969 100644
--- a/product/rdv1/scp_ramfw/firmware.mk
+++ b/product/rdv1/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
BS_FIRMWARE_HAS_FAST_CHANNELS := yes
@@ -44,7 +43,6 @@ BS_FIRMWARE_SOURCES := \
config_system_power.c \
config_sid.c \
config_system_info.c \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_power_domain.c \
diff --git a/product/rdv1/scp_ramfw/rtx_config.c b/product/rdv1/scp_ramfw/rtx_config.c
deleted file mode 100644
index cfcd53ac542fddac4908409b9a5f4d0fcf9fc292..0000000000000000000000000000000000000000
--- a/product/rdv1/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/rdv1/scp_romfw/Firmware.cmake b/product/rdv1/scp_romfw/Firmware.cmake
index 48d1b9c12414ab6276299d59446d8389066fe4cc..86c0143abb7d530363fc0de20fe49c27415d153c 100755
--- a/product/rdv1/scp_romfw/Firmware.cmake
+++ b/product/rdv1/scp_romfw/Firmware.cmake
@@ -15,8 +15,6 @@ set(SCP_FIRMWARE_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ARCHITECTURE "armv7-m")
-set(SCP_ENABLE_MULTITHREADING FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdv1/scp_romfw/firmware.mk b/product/rdv1/scp_romfw/firmware.mk
index 72adc5997e166156a7df66efaa5ba6fe9897ea21..08477828df230fd4003ffb2fa2788be77f72b606 100644
--- a/product/rdv1/scp_romfw/firmware.mk
+++ b/product/rdv1/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/rdv1mc/mcp_ramfw/firmware.mk b/product/rdv1mc/mcp_ramfw/firmware.mk
index 8a16191ba5cce02764c0dea3a76e17ae45d9082d..d3a87817438d220807d717845f065fb68a2bb3aa 100644
--- a/product/rdv1mc/mcp_ramfw/firmware.mk
+++ b/product/rdv1mc/mcp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain \
diff --git a/product/rdv1mc/mcp_romfw/firmware.mk b/product/rdv1mc/mcp_romfw/firmware.mk
index e48992aff65eabf54c0c0d360b05e80564cb9b45..9e1b499a7a8ac28958b9c3bdad4905777b611829 100644
--- a/product/rdv1mc/mcp_romfw/firmware.mk
+++ b/product/rdv1mc/mcp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/rdv1mc/scp_ramfw/CMakeLists.txt b/product/rdv1mc/scp_ramfw/CMakeLists.txt
index 933118784b2ad515da92eb5597fff14cee85b332..314507707b6f2d134b20131aa5e1142e4d47fa66 100755
--- a/product/rdv1mc/scp_ramfw/CMakeLists.txt
+++ b/product/rdv1mc/scp_ramfw/CMakeLists.txt
@@ -20,7 +20,6 @@ target_include_directories(
target_sources(
rdv1mc-bl2
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_system_power.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_power_domain.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_ppu_v1.c"
@@ -42,12 +41,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_sid.c")
-
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdv1mc-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdv1mc-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/rdv1mc/scp_ramfw/Firmware.cmake b/product/rdv1mc/scp_ramfw/Firmware.cmake
index b61d27cf93c1d78a4bdf5af2fe62039571cb3aff..0d752a4fbdc397cc8ec22b4274cd47b43427c49a 100755
--- a/product/rdv1mc/scp_ramfw/Firmware.cmake
+++ b/product/rdv1mc/scp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdv1mc/scp_ramfw/RTX_Config.h b/product/rdv1mc/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 4e5dc5e4450ac2120ad1a6b568b2b116162fe77e..0000000000000000000000000000000000000000
--- a/product/rdv1mc/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/rdv1mc/scp_ramfw/firmware.mk b/product/rdv1mc/scp_ramfw/firmware.mk
index 11cf8adcce356a63cf7b66c1f343cebb8555f2fe..2e8d877df01371a245672d17d20e2d6dda0b2b67 100644
--- a/product/rdv1mc/scp_ramfw/firmware.mk
+++ b/product/rdv1mc/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
BS_FIRMWARE_HAS_FAST_CHANNELS := yes
@@ -44,7 +43,6 @@ BS_FIRMWARE_SOURCES := \
config_system_power.c \
config_sid.c \
config_system_info.c \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_power_domain.c \
diff --git a/product/rdv1mc/scp_ramfw/rtx_config.c b/product/rdv1mc/scp_ramfw/rtx_config.c
deleted file mode 100644
index cfcd53ac542fddac4908409b9a5f4d0fcf9fc292..0000000000000000000000000000000000000000
--- a/product/rdv1mc/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/rdv1mc/scp_romfw/CMakeLists.txt b/product/rdv1mc/scp_romfw/CMakeLists.txt
index ddf3549880840618971c1c7e2a9dda54a5f4dd72..682f55c77188f64ab8713869029a3fbc2e446b3f 100755
--- a/product/rdv1mc/scp_romfw/CMakeLists.txt
+++ b/product/rdv1mc/scp_romfw/CMakeLists.txt
@@ -25,11 +25,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/../src/config_sid.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_bootloader.c")
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(rdv1mc-bl1 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(rdv1mc-bl1 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/rdv1mc/scp_romfw/Firmware.cmake b/product/rdv1mc/scp_romfw/Firmware.cmake
index 15f26a8503573927deb32e9b7e1bb3fedf8685f2..5236b66b21c0ccae58cfec27bc01fab3b21a5598 100755
--- a/product/rdv1mc/scp_romfw/Firmware.cmake
+++ b/product/rdv1mc/scp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/rdv1mc/scp_romfw/firmware.mk b/product/rdv1mc/scp_romfw/firmware.mk
index 40c82b108ce0e895070a1cb73eee36965df476a2..b829f688e872ed78777f61e9a3dde0fdf28004fd 100644
--- a/product/rdv1mc/scp_romfw/firmware.mk
+++ b/product/rdv1mc/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/sgi575/mcp_ramfw/firmware.mk b/product/sgi575/mcp_ramfw/firmware.mk
index 8a16191ba5cce02764c0dea3a76e17ae45d9082d..d3a87817438d220807d717845f065fb68a2bb3aa 100644
--- a/product/sgi575/mcp_ramfw/firmware.mk
+++ b/product/sgi575/mcp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_MODULE_HEADERS_ONLY := \
power_domain \
diff --git a/product/sgi575/mcp_romfw/Firmware.cmake b/product/sgi575/mcp_romfw/Firmware.cmake
index 3080356db3b9ee7096a34cf4bd5b75bdf71aedb6..e1d6b0bde8c3ad437565173c7082cdeac8351d0d 100644
--- a/product/sgi575/mcp_romfw/Firmware.cmake
+++ b/product/sgi575/mcp_romfw/Firmware.cmake
@@ -13,7 +13,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
set(SCP_ENABLE_DEBUGGER_INIT FALSE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT FALSE)
diff --git a/product/sgi575/mcp_romfw/firmware.mk b/product/sgi575/mcp_romfw/firmware.mk
index 53c51fb378bac7e4fd98d48209d72e49bc14a005..97f5a333e9eb467447f0f7c2a83726404f34dfc2 100644
--- a/product/sgi575/mcp_romfw/firmware.mk
+++ b/product/sgi575/mcp_romfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/sgi575/scp_ramfw/CMakeLists.txt b/product/sgi575/scp_ramfw/CMakeLists.txt
index 4e8e1e382c6a68c581b66e0d2df6d95a25813b92..9a95c3de0549f70afdf6813b4fcc04bb79170253 100644
--- a/product/sgi575/scp_ramfw/CMakeLists.txt
+++ b/product/sgi575/scp_ramfw/CMakeLists.txt
@@ -55,12 +55,6 @@ if(SCP_ENABLE_RESOURCE_PERMISSIONS)
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_resource_perms.c")
endif()
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(sgi575-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(sgi575-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/sgi575/scp_ramfw/Firmware.cmake b/product/sgi575/scp_ramfw/Firmware.cmake
index efea0b8588cbe7673898b53e540145e53ea6e688..f451583db3dbb74db94827c50632750b6d371384 100644
--- a/product/sgi575/scp_ramfw/Firmware.cmake
+++ b/product/sgi575/scp_ramfw/Firmware.cmake
@@ -12,7 +12,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT TRUE)
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
diff --git a/product/sgi575/scp_ramfw/RTX_Config.h b/product/sgi575/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 523c75e0256c0971a96bc00cea2c430ae3822284..0000000000000000000000000000000000000000
--- a/product/sgi575/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2018-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by a RTX file
- * in order to create an object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/sgi575/scp_ramfw/firmware.mk b/product/sgi575/scp_ramfw/firmware.mk
index 904565d5942fa96a39e213dd093357753d1bb6e8..10c7ec4086d8814abb68103954379216035f5049 100644
--- a/product/sgi575/scp_ramfw/firmware.mk
+++ b/product/sgi575/scp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
@@ -53,7 +52,6 @@ BS_FIRMWARE_MODULES := \
resource_perms
BS_FIRMWARE_SOURCES := \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_cmn600.c \
diff --git a/product/sgi575/scp_ramfw/rtx_config.c b/product/sgi575/scp_ramfw/rtx_config.c
deleted file mode 100644
index 34b68dd6cae201d816910297a2ecb939cdeddd04..0000000000000000000000000000000000000000
--- a/product/sgi575/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2018-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true) {
- __WFI();
- }
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/sgi575/scp_romfw/Firmware.cmake b/product/sgi575/scp_romfw/Firmware.cmake
index 39416c69482bef2b188a990ed149624f4b407a53..43cf29c5c1081031cddae89e9fa4a1b83fe87e0e 100644
--- a/product/sgi575/scp_romfw/Firmware.cmake
+++ b/product/sgi575/scp_romfw/Firmware.cmake
@@ -13,7 +13,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
set(SCP_ENABLE_DEBUGGER_INIT FALSE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT FALSE)
diff --git a/product/sgi575/scp_romfw/firmware.mk b/product/sgi575/scp_romfw/firmware.mk
index 83e9bc8156c779e50d1480daa9d5780a7077d2b8..1abbb0c6fb49c783408d15269384fa73b24fc979 100644
--- a/product/sgi575/scp_romfw/firmware.mk
+++ b/product/sgi575/scp_romfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m7
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := no
diff --git a/product/sgm775/scp_ramfw/CMakeLists.txt b/product/sgm775/scp_ramfw/CMakeLists.txt
index a9a5ec093dfa69e3e91d5f3f5f379bd7ac3449e4..d504c92cebc60618ea3d00cdbd299e1b35607497 100644
--- a/product/sgm775/scp_ramfw/CMakeLists.txt
+++ b/product/sgm775/scp_ramfw/CMakeLists.txt
@@ -61,13 +61,6 @@ if(SCP_ENABLE_RESOURCE_PERMISSIONS)
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_resource_perms.c")
endif()
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(sgm775-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
-
- target_link_libraries(sgm775-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/sgm775/scp_ramfw/Firmware.cmake b/product/sgm775/scp_ramfw/Firmware.cmake
index 989f17ff34da04d2b2ea8c45806d10e4c43aa257..6ee05605763055cb3948a4b98a278ef562a5367f 100644
--- a/product/sgm775/scp_ramfw/Firmware.cmake
+++ b/product/sgm775/scp_ramfw/Firmware.cmake
@@ -13,7 +13,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ENABLE_DEBUGGER_INIT FALSE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT TRUE)
set(SCP_ENABLE_NOTIFICATIONS TRUE)
diff --git a/product/sgm775/scp_ramfw/RTX_Config.h b/product/sgm775/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 777b014d150a9ccb08ffc8163c3472c1733f65e7..0000000000000000000000000000000000000000
--- a/product/sgm775/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/sgm775/scp_ramfw/firmware.mk b/product/sgm775/scp_ramfw/firmware.mk
index b0f02a7d58825e97118fc43711b6f56d0e9573fb..cf647da18361d43092d719e136de76e16ddb26ac 100644
--- a/product/sgm775/scp_ramfw/firmware.mk
+++ b/product/sgm775/scp_ramfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
@@ -82,10 +81,6 @@ BS_FIRMWARE_SOURCES := \
config_system_info.c \
config_scmi_power_domain.c
-ifeq ($(BS_FIRMWARE_HAS_MULTITHREADING),yes)
- BS_FIRMWARE_SOURCES += rtx_config.c
-endif
-
ifeq ($(BUILD_HAS_DEBUGGER),yes)
BS_FIRMWARE_MODULES += debugger_cli
BS_FIRMWARE_SOURCES += config_debugger_cli.c
diff --git a/product/sgm775/scp_ramfw/rtx_config.c b/product/sgm775/scp_ramfw/rtx_config.c
deleted file mode 100644
index 4eb391964451b93fa98a408071ec52f1c1ad8e4c..0000000000000000000000000000000000000000
--- a/product/sgm775/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2015-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- (void)argument;
-
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- (void)object_id;
-
- switch (code) {
- case osRtxErrorStackUnderflow:
- /*
- * Stack underflow detected for thread
- * thread_id=object_id
- */
- break;
-
- case osRtxErrorISRQueueOverflow:
- /*
- * ISR Queue overflow detected when inserting object
- * object_id
- */
- break;
-
- case osRtxErrorTimerQueueOverflow:
- /*
- * User Timer Callback Queue overflow detected for timer
- * timer_id=object_id
- */
- break;
-
- case osRtxErrorClibSpace:
- /*
- * Standard C/C++ library libspace not available:
- * increase OS_THREAD_LIBSPACE_NUM
- */
- break;
-
- case osRtxErrorClibMutex:
- /*
- * Standard C/C++ library mutex initialization failed
- */
- break;
-
- default:
- break;
- }
-
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/sgm775/scp_romfw/Firmware.cmake b/product/sgm775/scp_romfw/Firmware.cmake
index 6f5567153c3ea67a3a6899c13a355f3a59fa46a5..7abaf93e609f8977fecc69cfebe39302e439f6a9 100644
--- a/product/sgm775/scp_romfw/Firmware.cmake
+++ b/product/sgm775/scp_romfw/Firmware.cmake
@@ -13,7 +13,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY TRUE)
set(SCP_ENABLE_DEBUGGER FALSE)
-set(SCP_ENABLE_MULTITHREADING FALSE)
set(SCP_ENABLE_NOTIFICATIONS TRUE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS FALSE)
diff --git a/product/sgm775/scp_romfw/firmware.mk b/product/sgm775/scp_romfw/firmware.mk
index ff0379cebcdb9c27817a440da91be3bda2465d84..fdd3ed47742c4d7964e13509e2a08c25afe2a3ae 100644
--- a/product/sgm775/scp_romfw/firmware.mk
+++ b/product/sgm775/scp_romfw/firmware.mk
@@ -9,7 +9,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/sgm776/scp_ramfw/CMakeLists.txt b/product/sgm776/scp_ramfw/CMakeLists.txt
index 181f07e8dd6e1f24d06299dcc0db033bb7599c9c..a02b5a399da738abb770d1560652aa79cc535d2d 100644
--- a/product/sgm776/scp_ramfw/CMakeLists.txt
+++ b/product/sgm776/scp_ramfw/CMakeLists.txt
@@ -53,13 +53,6 @@ if(SCP_ENABLE_RESOURCE_PERMISSIONS)
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_resource_perms.c")
endif()
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(sgm776-bl2
- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
-
- target_link_libraries(sgm776-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
#
# Some of our firmware includes require CMSIS.
#
diff --git a/product/sgm776/scp_ramfw/Firmware.cmake b/product/sgm776/scp_ramfw/Firmware.cmake
index 0351aa3904d51325b49491d33b515476537edd26..7a357a30be99e52eecf5071c01e1b747fe8c21b2 100644
--- a/product/sgm776/scp_ramfw/Firmware.cmake
+++ b/product/sgm776/scp_ramfw/Firmware.cmake
@@ -12,7 +12,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT TRUE)
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
diff --git a/product/sgm776/scp_ramfw/RTX_Config.h b/product/sgm776/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 434700283581f189c375e8dd1bb06ec56796c71a..0000000000000000000000000000000000000000
--- a/product/sgm776/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by an RTX file
- * in order to create an object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/sgm776/scp_ramfw/firmware.mk b/product/sgm776/scp_ramfw/firmware.mk
index ddadd2250a29085ff958b0b45865a61182441596..a3d3930021b07383ca7ddada2b9a3f0856101077 100644
--- a/product/sgm776/scp_ramfw/firmware.mk
+++ b/product/sgm776/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
@@ -77,10 +76,6 @@ BS_FIRMWARE_SOURCES := \
config_system_info.c \
config_scmi_power_domain.c
-ifeq ($(BS_FIRMWARE_HAS_MULTITHREADING),yes)
- BS_FIRMWARE_SOURCES += rtx_config.c
-endif
-
ifeq ($(BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS),yes)
BS_FIRMWARE_SOURCES += config_resource_perms.c
endif
diff --git a/product/sgm776/scp_ramfw/rtx_config.c b/product/sgm776/scp_ramfw/rtx_config.c
deleted file mode 100644
index 505a07f3acf1f9cc78927c9d36b208de003866dc..0000000000000000000000000000000000000000
--- a/product/sgm776/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2017-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "system_clock.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- (void)argument;
-
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- (void)object_id;
-
- switch (code) {
- case osRtxErrorStackUnderflow:
- /*
- * Stack underflow detected for thread
- * thread_id=object_id
- */
- break;
-
- case osRtxErrorISRQueueOverflow:
- /*
- * ISR Queue overflow detected when inserting object
- * object_id
- */
- break;
-
- case osRtxErrorTimerQueueOverflow:
- /*
- * User Timer Callback Queue overflow detected for timer
- * timer_id=object_id
- */
- break;
-
- case osRtxErrorClibSpace:
- /*
- * Standard C/C++ library libspace not available:
- * increase OS_THREAD_LIBSPACE_NUM
- */
- break;
-
- case osRtxErrorClibMutex:
- /*
- * Standard C/C++ library mutex initialization failed
- */
- break;
-
- default:
- break;
- }
-
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/sgm776/scp_romfw/Firmware.cmake b/product/sgm776/scp_romfw/Firmware.cmake
index 73cf4112042115d86222f73b3dfc0c3032dcced2..f3ee2b6a302f341c9504fbcc8df8abef18cd1c6d 100644
--- a/product/sgm776/scp_romfw/Firmware.cmake
+++ b/product/sgm776/scp_romfw/Firmware.cmake
@@ -12,7 +12,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT FALSE)
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
diff --git a/product/sgm776/scp_romfw/firmware.mk b/product/sgm776/scp_romfw/firmware.mk
index 715e3eaa7ed299fe09c74e76a3a6e960148a5dd3..59daca04a8495a736b75836b66653165501b2083 100644
--- a/product/sgm776/scp_romfw/firmware.mk
+++ b/product/sgm776/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/synquacer/scp_ramfw/Firmware.cmake b/product/synquacer/scp_ramfw/Firmware.cmake
index 0f670a43cf06e36fc4e7d4fdecf4418afd9ecba0..8dda098f61ae5bafebd169cf2e5166897ce3d12c 100644
--- a/product/synquacer/scp_ramfw/Firmware.cmake
+++ b/product/synquacer/scp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/synquacer/scp_ramfw/firmware.mk b/product/synquacer/scp_ramfw/firmware.mk
index a6d4d0b6c2917247ec4d1408297a141a625fe1cf..7441334b2cf97094305bb56d29a0a8a15ab9cc5e 100644
--- a/product/synquacer/scp_ramfw/firmware.mk
+++ b/product/synquacer/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/synquacer/scp_romfw/Firmware.cmake b/product/synquacer/scp_romfw/Firmware.cmake
index 39d2166e7e013d8cc817a86d582fc92888983993..5a5a0cdce91b61bc475fae5c06cbe982e644b465 100644
--- a/product/synquacer/scp_romfw/Firmware.cmake
+++ b/product/synquacer/scp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/synquacer/scp_romfw/firmware.mk b/product/synquacer/scp_romfw/firmware.mk
index 2fe1ecbc20e4e8b3f33ab7ffc9b3eb2e524b4db7..cb43a88a17a1f396c71119b1607b9b0a514f06fb 100644
--- a/product/synquacer/scp_romfw/firmware.mk
+++ b/product/synquacer/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/tc0/scp_ramfw/CMakeLists.txt b/product/tc0/scp_ramfw/CMakeLists.txt
index 1cfdd3f05debe6a4ec5334a8592d8c262b7e120c..9400a64e89d6823a1dafce82daf18f774094e6eb 100644
--- a/product/tc0/scp_ramfw/CMakeLists.txt
+++ b/product/tc0/scp_ramfw/CMakeLists.txt
@@ -20,7 +20,6 @@ target_include_directories(
target_sources(
tc0-bl2
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_system_power.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_power_domain.c"
@@ -46,12 +45,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/config_clock.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_scmi_power_domain.c")
-
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(tc0-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(tc0-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
if(SCP_ENABLE_RESOURCE_PERMISSIONS)
target_sources(tc0-bl2 PRIVATE "config_resource_perms.c")
endif()
diff --git a/product/tc0/scp_ramfw/Firmware.cmake b/product/tc0/scp_ramfw/Firmware.cmake
index bb5d819ccdc2c52a9a70e1b1e8338540b8fb4d12..cefc208ae645dd8ec34f8d57df9c10357454e9e5 100644
--- a/product/tc0/scp_ramfw/Firmware.cmake
+++ b/product/tc0/scp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT TRUE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT TRUE)
diff --git a/product/tc0/scp_ramfw/RTX_Config.h b/product/tc0/scp_ramfw/RTX_Config.h
deleted file mode 100644
index 60c7714b987132d9132a16734acd1f50cd0b120e..0000000000000000000000000000000000000000
--- a/product/tc0/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/tc0/scp_ramfw/firmware.mk b/product/tc0/scp_ramfw/firmware.mk
index f77f6676589563db5427478c8e7ea142a35fc45b..ec6e6679b360c5f632f8a22d5dae4cac5d2526f9 100644
--- a/product/tc0/scp_ramfw/firmware.mk
+++ b/product/tc0/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := yes
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
@@ -47,7 +46,6 @@ endif
BS_FIRMWARE_SOURCES := \
config_system_power.c \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_power_domain.c \
diff --git a/product/tc0/scp_ramfw/rtx_config.c b/product/tc0/scp_ramfw/rtx_config.c
deleted file mode 100644
index 2ec1549a92e3a02843820f4750e5a3918c0e8c9b..0000000000000000000000000000000000000000
--- a/product/tc0/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <rtx_lib.c>
-#include <rtx_os.h>
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true) {
- __WFI();
- }
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/tc0/scp_romfw/Firmware.cmake b/product/tc0/scp_romfw/Firmware.cmake
index 3b4269cf0a2c927ae7e22f110b99e5897a39de76..1a8895d06ea62fca98651433155595c991c3c5c7 100644
--- a/product/tc0/scp_romfw/Firmware.cmake
+++ b/product/tc0/scp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/tc0/scp_romfw/firmware.mk b/product/tc0/scp_romfw/firmware.mk
index d4f1f7f51db4fc92d6a509603ace81bcae7bc3a3..9977712f46e2079360c71af26bb1a549add1b8c6 100644
--- a/product/tc0/scp_romfw/firmware.mk
+++ b/product/tc0/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/product/tc1/scp_ramfw/CMakeLists.txt b/product/tc1/scp_ramfw/CMakeLists.txt
index 678f0fb2cf8f4059503c3993dc6625c94b666eda..dd4f3095e34ef7f6518762f5dbaa3c293c81793e 100644
--- a/product/tc1/scp_ramfw/CMakeLists.txt
+++ b/product/tc1/scp_ramfw/CMakeLists.txt
@@ -20,7 +20,6 @@ target_include_directories(
target_sources(
tc1-bl2
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/config_system_power.c"
- "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_armv7m_mpu.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_pl011.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_power_domain.c"
@@ -43,12 +42,6 @@ target_sources(
"${CMAKE_CURRENT_SOURCE_DIR}/config_clock.c"
"${CMAKE_CURRENT_SOURCE_DIR}/config_scmi_power_domain.c")
-
-if(SCP_ENABLE_MULTITHREADING)
- target_sources(tc1-bl2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/rtx_config.c")
- target_link_libraries(tc1-bl2 PRIVATE cmsis::rtos2-rtx)
-endif()
-
if(SCP_ENABLE_RESOURCE_PERMISSIONS)
target_sources(tc1-bl2 PRIVATE "config_resource_perms.c")
endif()
diff --git a/product/tc1/scp_ramfw/Firmware.cmake b/product/tc1/scp_ramfw/Firmware.cmake
index 41c7c3d474fe357575e34ac2dccf9484b60e2acc..f3a37172c5bb70badbe8ab17e575aeb222991a0a 100644
--- a/product/tc1/scp_ramfw/Firmware.cmake
+++ b/product/tc1/scp_ramfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_RESOURCE_PERMISSIONS_INIT TRUE)
diff --git a/product/tc1/scp_ramfw/RTX_Config.h b/product/tc1/scp_ramfw/RTX_Config.h
deleted file mode 100644
index beb0d9d6a80bba5be3ad6f3389a833353906fc80..0000000000000000000000000000000000000000
--- a/product/tc1/scp_ramfw/RTX_Config.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Description:
- * RTX2 v5 configuration file.
- * The file must be called RTX_Config.h as it is included by the an RTX
- * file in order to create a object file containing the configuration.
- */
-
-#ifndef RTX_CONFIG_H_
-#define RTX_CONFIG_H_
-
-/* System */
-#define OS_DYNAMIC_MEM_SIZE 0
-#define OS_TICK_FREQ 1000 /* Hz */
-#define OS_ROBIN_ENABLE 0
-#define OS_ROBIN_TIMEOUT 0
-#define OS_ISR_FIFO_QUEUE 16
-
-/* Thread */
-#define OS_THREAD_OBJ_MEM 0
-#define OS_THREAD_NUM 1
-#define OS_THREAD_DEF_STACK_NUM 0
-#define OS_THREAD_USER_STACK_SIZE 0
-#define OS_STACK_SIZE 200
-#define OS_IDLE_THREAD_STACK_SIZE 200
-#define OS_STACK_CHECK 1
-#define OS_STACK_WATERMARK 0
-#define OS_PRIVILEGE_MODE 1
-
-/* Timer */
-#define OS_TIMER_OBJ_MEM 0
-#define OS_TIMER_NUM 1
-#define OS_TIMER_THREAD_PRIO 40
-#define OS_TIMER_THREAD_STACK_SIZE 200
-#define OS_TIMER_CB_QUEUE 4
-
-/* Event flags */
-#define OS_EVFLAGS_OBJ_MEM 0
-#define OS_EVFLAGS_NUM 1
-
-#define OS_MUTEX_OBJ_MEM 0
-#define OS_MUTEX_NUM 1
-#define OS_SEMAPHORE_OBJ_MEM 0
-#define OS_SEMAPHORE_NUM 1
-#define OS_MEMPOOL_OBJ_MEM 0
-#define OS_MEMPOOL_NUM 1
-#define OS_MEMPOOL_DATA_SIZE 0
-#define OS_MSGQUEUE_OBJ_MEM 0
-#define OS_MSGQUEUE_NUM 1
-#define OS_MSGQUEUE_DATA_SIZE 0
-
-#endif /* RTX_CONFIG_H_ */
diff --git a/product/tc1/scp_ramfw/firmware.mk b/product/tc1/scp_ramfw/firmware.mk
index 41b58393c3138645c6c6fe2c25725ee05319195b..8e8e3929d18d04cc9adca70cc83f3863fa215bb1 100644
--- a/product/tc1/scp_ramfw/firmware.mk
+++ b/product/tc1/scp_ramfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
@@ -42,7 +41,6 @@ endif
BS_FIRMWARE_SOURCES := \
config_system_power.c \
- rtx_config.c \
config_armv7m_mpu.c \
config_pl011.c \
config_power_domain.c \
diff --git a/product/tc1/scp_ramfw/rtx_config.c b/product/tc1/scp_ramfw/rtx_config.c
deleted file mode 100644
index 42daea964f04de5c8f7b611b8f0fe022bbab9941..0000000000000000000000000000000000000000
--- a/product/tc1/scp_ramfw/rtx_config.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Arm SCP/MCP Software
- * Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "clock_soc.h"
-
-#include <fwk_mm.h>
-
-#include <fmw_cmsis.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/*
- * Required by RTX to configure the SysTick timer.
- */
-uint32_t SystemCoreClock = CLOCK_RATE_REFCLK;
-
-/*
- * Idle thread
- */
-__NO_RETURN void osRtxIdleThread(void *argument)
-{
- while (true)
- __WFI();
-}
-
-/*
- * OS error handler
- */
-uint32_t osRtxErrorNotify(uint32_t code, void *object_id)
-{
- osRtxIdleThread(object_id);
-}
-
-uint32_t osRtxMemoryInit(void *mem, uint32_t size)
-{
- return 1;
-}
-
-void *osRtxMemoryAlloc(void *mem, uint32_t size, uint32_t type)
-{
- return fwk_mm_alloc(1, size);
-}
-
-uint32_t osRtxMemoryFree(void *mem, void *block)
-{
- fwk_mm_free(block);
-
- return 1;
-}
diff --git a/product/tc1/scp_romfw/Firmware.cmake b/product/tc1/scp_romfw/Firmware.cmake
index 7792ff04ade4213ebe3aa7c74dd9d0ce26f4044b..b6770830e1c572765b31ea862317544a3c3256b4 100644
--- a/product/tc1/scp_romfw/Firmware.cmake
+++ b/product/tc1/scp_romfw/Firmware.cmake
@@ -17,8 +17,6 @@ set(SCP_TOOLCHAIN_INIT "GNU")
set(SCP_GENERATE_FLAT_BINARY_INIT TRUE)
-set(SCP_ENABLE_MULTITHREADING_INIT FALSE)
-
set(SCP_ENABLE_NOTIFICATIONS_INIT TRUE)
set(SCP_ENABLE_IPO_INIT FALSE)
diff --git a/product/tc1/scp_romfw/firmware.mk b/product/tc1/scp_romfw/firmware.mk
index 464a8f7ccafab1eaae3228d8bc769f23dbecd788..6cad1407a3fd8785e943d37a1f01ab0a7d668b76 100644
--- a/product/tc1/scp_romfw/firmware.mk
+++ b/product/tc1/scp_romfw/firmware.mk
@@ -6,7 +6,6 @@
#
BS_FIRMWARE_CPU := cortex-m3
-BS_FIRMWARE_HAS_MULTITHREADING := no
BS_FIRMWARE_HAS_NOTIFICATION := yes
BS_FIRMWARE_USE_NEWLIB_NANO_SPECS := yes
diff --git a/tools/build_system/firmware.mk b/tools/build_system/firmware.mk
index e4f215457685a94ce528456d33b5c4911812dcb0..a533e823c3c854dba2064428334f52e6ffa673d6 100644
--- a/tools/build_system/firmware.mk
+++ b/tools/build_system/firmware.mk
@@ -20,11 +20,6 @@ ifeq ($(BS_FIRMWARE_CPU),)
$(error "You must define BS_FIRMWARE_CPU. Aborting...")
endif
-ifeq ($(BS_FIRMWARE_HAS_MULTITHREADING),)
- $(error "You must define BS_FIRMWARE_HAS_MULTITHREADING. \
- Valid options are: 'yes' and 'no'. \
- Aborting...")
-endif
ifeq ($(BS_FIRMWARE_HAS_NOTIFICATION),)
$(error "You must define BS_FIRMWARE_HAS_NOTIFICATION. \
@@ -182,22 +177,23 @@ HEADER_STANDARD_MODULES := $(filter $(BS_FIRMWARE_MODULE_HEADERS_ONLY), \
HEADER_PRODUCT_MODULES := $(filter $(BS_FIRMWARE_MODULE_HEADERS_ONLY), \
$(ALL_PRODUCT_MODULES))
+ifneq ($(findstring $(BS_FIRMWARE_CPU),$(ARMV8A_CPUS)),)
+ INCLUDES += $(OS_DIR)/Include
+ INCLUDES += $(FREERTOS_DIR)/../../Source/include
+ INCLUDES += $(FREERTOS_DIR)/../../Source/portable/GCC/ARM_CA53_64_Rcar
+else
+ INCLUDES += $(OS_DIR)/RTX/Source
+ INCLUDES += $(OS_DIR)/RTX/Include
+ INCLUDES += $(OS_DIR)/../Core/Include
+endif
+
ifeq ($(BS_FIRMWARE_HAS_MULTITHREADING),yes)
BUILD_SUFFIX := $(MULTHREADING_SUFFIX)
BUILD_HAS_MULTITHREADING := yes
-
- ifneq ($(findstring $(BS_FIRMWARE_CPU),$(ARMV8A_CPUS)),)
- INCLUDES += $(OS_DIR)/Include
- INCLUDES += $(FREERTOS_DIR)/../../Source/include
- INCLUDES += $(FREERTOS_DIR)/../../Source/portable/GCC/ARM_CA53_64_Rcar
- else
- INCLUDES += $(OS_DIR)/RTX/Source
- INCLUDES += $(OS_DIR)/RTX/Include
- INCLUDES += $(OS_DIR)/../Core/Include
- endif
else
BUILD_HAS_MULTITHREADING := no
endif
+
export BUILD_HAS_MULTITHREADING
ifeq ($(BS_FIRMWARE_HAS_NOTIFICATION),yes)