patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

ext: open-amp: Update import of open-amp

Browse source 
Pull in a slightly more recent version of open-amp with changes
to the build system to improve integration with Zephyr.  The recent
changes let us embedded open-amp without having to use recursive
building.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2018-05-22 17:41:31 -05:00 committed by Kumar Gala
parent 6a86b02642
commit e3e8c83bd9
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/lib/ipc/open-amp/README
View file

@ -5,11 +5,10 @@ Origin:
https://github.com/OpenAMP/open-amp
Status:
de361adee09cd31793c60218a0ec49bc307a7410 [v2018.04]
db6de3ffb0a43b50e3a10af23a3d80eebd6db008
When we import open-amp we removed the apps dir to reduce the amount of
code imported.
Purpose:
IPC layer that implements rpmsg communication between cores.
@ -41,7 +40,7 @@ URL:
https://github.com/OpenAMP/open-amp/
commit:
de361adee09cd31793c60218a0ec49bc307a7410
db6de3ffb0a43b50e3a10af23a3d80eebd6db008
Maintained-by:
External

10
ext/lib/ipc/open-amp/open-amp/CMakeLists.txt
View file

@ -1,14 +1,16 @@
cmake_minimum_required (VERSION 2.6)
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
endif()
# The version number
set (OPENAMP_VERSION_MAJOR 1)
set (OPENAMP_VERSION_MINOR 0)
list (APPEND CMAKE_MODULE_PATH
"${CMAKE_SOURCE_DIR}/cmake"
"${CMAKE_SOURCE_DIR}/cmake/modules"
"${CMAKE_SOURCE_DIR}/cmake/platforms")
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms")
include (syscheck)
project (open_amp C)

4
ext/lib/ipc/open-amp/open-amp/cmake/options.cmake
View file

@ -70,6 +70,10 @@ if ("${PROJECT_SYSTEM}" STREQUAL "linux")
option (WITH_SHARED_LIB "Build with a shared library" ON)
endif ("${PROJECT_SYSTEM}" STREQUAL "linux")
if (WITH_ZEPHYR)
option (WITH_ZEPHYR_LIB "Build open-amp as a zephyr library" OFF)
endif (WITH_ZEPHYR)
option (WITH_LIBMETAL_FIND "Check Libmetal library can be found" ON)
option (WITH_EXT_INCLUDES_FIND "Check other external includes are found" ON)

5
ext/lib/ipc/open-amp/open-amp/cmake/syscheck.cmake
View file

@ -4,8 +4,9 @@ if (WITH_ZEPHYR)
set (CMAKE_SYSTEM_NAME "Generic" CACHE STRING "")
string (TOLOWER "Zephyr" PROJECT_SYSTEM)
string (TOUPPER "Zephyr" PROJECT_SYSTEM_UPPER)
set(IS_TEST 1)
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
if (NOT WITH_ZEPHYR_LIB)
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
endif ()
if (CONFIG_CPU_CORTEX_M)
set (MACHINE "cortexm" CACHE STRING "")
endif (CONFIG_CPU_CORTEX_M)

1
ext/lib/ipc/open-amp/open-amp/lib/CMakeLists.txt
View file

@ -37,6 +37,7 @@ if (WITH_ZEPHYR)
zephyr_library_named(${OPENAMP_LIB})
add_dependencies(${OPENAMP_LIB} offsets_h)
target_sources (${OPENAMP_LIB} PRIVATE ${_sources})
zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
else (WITH_ZEPHYR)
if (WITH_SHARED_LIB)
set (_lib ${OPENAMP_LIB}-shared)