Remove incremental sp_layout.json build
The merging of sp_layout.json is moved to the build repository because
it needs control over the order of the JSON fragments. The merge_json.py
remains in trusted-services to help integrations avoid duplicating the
tool.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I3c56d8348a3b45d766dad4c5ecbed42887511f9d
diff --git a/tools/cmake/common/ExportSp.cmake b/tools/cmake/common/ExportSp.cmake
index 124489e..e5652c5 100644
--- a/tools/cmake/common/ExportSp.cmake
+++ b/tools/cmake/common/ExportSp.cmake
@@ -102,11 +102,5 @@
if (DEFINED EXPORT_JSON_IN)
configure_file(${EXPORT_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_SP_NAME}.json @ONLY NEWLINE_STYLE UNIX)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_SP_NAME}.json DESTINATION ${TS_ENV}/json)
-
- find_package(Python3 REQUIRED COMPONENTS Interpreter)
- execute_process(COMMAND ${Python3_EXECUTABLE} ${TS_ROOT}/tools/python/merge_json.py
- ${CMAKE_INSTALL_PREFIX}/${TS_ENV}/json/sp_layout.json
- ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_SP_NAME}.json
- )
endif()
endfunction()