apps: move nocopy ping test to example

Move the test to exemple folder to prepare an exemple that involves the TX and RX nocopy API. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
OpenAMP · Apr 16, 2021 · b8691c8 · b8691c8
1 parent 60b77cb
commit b8691c8
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/apps/examples/CMakeLists.txt b/apps/examples/CMakeLists.txt
@@ -5,6 +5,7 @@ if (MACHINE MATCHES ".*microblaze.*")
 add_subdirectory (echo)
 else ()
 add_subdirectory (echo)
+add_subdirectory (nocopy_echo)
 add_subdirectory (rpmsg_sample_echo)
 add_subdirectory (matrix_multiply)
 if (WITH_LOAD_FW)

diff --git a/apps/examples/nocopy_echo/CMakeLists.txt b/apps/examples/nocopy_echo/CMakeLists.txt
@@ -0,0 +1,42 @@
+
+set (_cflags "${CMAKE_C_FLAGS} ${APP_EXTRA_C_FLAGS} -fdata-sections -ffunction-sections")
+set (_fw_dir "${APPS_SHARE_DIR}")
+
+collector_list (_list PROJECT_INC_DIRS)
+collector_list (_app_list APP_INC_DIRS)
+include_directories (${_list} ${_app_list} ${CMAKE_CURRENT_SOURCE_DIR})
+
+collector_list (_list PROJECT_LIB_DIRS)
+collector_list (_app_list APP_LIB_DIRS)
+link_directories (${_list} ${_app_list})
+
+get_property (_linker_opt GLOBAL PROPERTY APP_LINKER_OPT)
+collector_list (_deps PROJECT_LIB_DEPS)
+
+set (OPENAMP_LIB open_amp)
+
+foreach (_app pmsg-nocopy-ping)
+  collector_list (_sources APP_COMMON_SOURCES)
+    list (APPEND _sources "${CMAKE_CURRENT_SOURCE_DIR}/rpmsg-nocopy-ping.c")
+
+  if (WITH_SHARED_LIB)
+    add_executable (${_app}-shared ${_sources})
+    target_link_libraries (${_app}-shared ${OPENAMP_LIB}-shared ${_deps})
+    install (TARGETS ${_app}-shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+  endif (WITH_SHARED_LIB)
+
+  if (WITH_STATIC_LIB)
+    if (${PROJECT_SYSTEM} STREQUAL "linux")
+      add_executable (${_app}-static ${_sources})
+      target_link_libraries (${_app}-static ${OPENAMP_LIB}-static ${_deps})
+      install (TARGETS ${_app}-static RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    else (${PROJECT_SYSTEM})
+      add_executable (${_app}.out ${_sources})
+      set_source_files_properties(${_sources} PROPERTIES COMPILE_FLAGS "${_cflags}")
+
+      target_link_libraries(${_app}.out -Wl,-Map=${_app}.map -Wl,--gc-sections ${_linker_opt} -Wl,--start-group ${OPENAMP_LIB}-static ${_deps} -Wl,--end-group)
+
+      install (TARGETS ${_app}.out RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    endif (${PROJECT_SYSTEM} STREQUAL "linux" )
+  endif (WITH_STATIC_LIB)
+endforeach(_app)
diff --git a/apps/examples/nocopy_echo/rpmsg-echo.h b/apps/examples/nocopy_echo/rpmsg-echo.h
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef RPMSG_ECHO_H
+#define RPMSG_ECHO_H
+
+#define RPMSG_SERVICE_NAME         "rpmsg-openamp-demo-channel"
+
+#endif /* RPMSG_ECHO_H */
diff --git a/apps/tests/msg/rpmsg-nocopy-ping.c → .../examples/nocopy_echo/rpmsg-nocopy-ping.c b/apps/tests/msg/rpmsg-nocopy-ping.c → .../examples/nocopy_echo/rpmsg-nocopy-ping.c
@@ -11,7 +11,7 @@
 #include <openamp/open_amp.h>
 #include <metal/alloc.h>
 #include "platform_info.h"
-#include "rpmsg-ping.h"
+#include "rpmsg-echo.h"
 
 #define LPRINTF(format, ...) printf(format, ##__VA_ARGS__)
 #define LPERROR(format, ...) LPRINTF("ERROR: " format, ##__VA_ARGS__)
@@ -32,10 +32,6 @@ static int rnum;
 static int err_cnt;
 static int ept_deleted;
 
-/* External functions */
-extern int init_system(void);
-extern void cleanup_system(void);
-
 static int rpmsg_endpoint_cb(struct rpmsg_endpoint *ept, void *data, size_t len,
 			     uint32_t src, void *priv)
 {

diff --git a/apps/tests/msg/CMakeLists.txt b/apps/tests/msg/CMakeLists.txt
@@ -15,16 +15,14 @@ collector_list (_deps PROJECT_LIB_DEPS)
 
 set (OPENAMP_LIB open_amp)
 
-foreach (_app msg-test-rpmsg-ping msg-test-rpmsg-update msg-test-rpmsg-flood-ping msg-test-rpmsg-nocopy-ping)
+foreach (_app msg-test-rpmsg-ping msg-test-rpmsg-update msg-test-rpmsg-flood-ping)
   collector_list (_sources APP_COMMON_SOURCES)
   if (${_app} STREQUAL "msg-test-rpmsg-ping")
     list (APPEND _sources "${CMAKE_CURRENT_SOURCE_DIR}/rpmsg-ping.c")
   elseif (${_app} STREQUAL "msg-test-rpmsg-update")
     list (APPEND _sources "${CMAKE_CURRENT_SOURCE_DIR}/rpmsg-update.c")
   elseif (${_app} STREQUAL "msg-test-rpmsg-flood-ping")
     list (APPEND _sources "${CMAKE_CURRENT_SOURCE_DIR}/rpmsg-flood-ping.c")
-  elseif (${_app} STREQUAL "msg-test-rpmsg-nocopy-ping")
-    list (APPEND _sources "${CMAKE_CURRENT_SOURCE_DIR}/rpmsg-nocopy-ping.c")
   endif (${_app} STREQUAL "msg-test-rpmsg-ping")
 
   if (WITH_SHARED_LIB)