• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff -uparN open-amp-2022.10.1/cmake/depends.cmake open-amp/cmake/depends.cmake
2--- open-amp-2022.10.1/cmake/depends.cmake	2022-12-13 11:21:05.000000000 +0800
3+++ open-amp/cmake/depends.cmake	2023-02-24 16:36:38.000000000 +0800
4@@ -1,5 +1,5 @@
5 if (WITH_LIBMETAL_FIND)
6-  find_package (Libmetal REQUIRED)
7+  #find_package (Libmetal REQUIRED)
8   collect (PROJECT_INC_DIRS "${LIBMETAL_INCLUDE_DIR}")
9   collect (PROJECT_LIB_DIRS "${LIBMETAL_LIB_DIR}")
10   collect (PROJECT_LIB_DEPS "${LIBMETAL_LIB}")
11diff -uparN open-amp-2022.10.1/cmake/platforms/uniproton_arm64_gcc.cmake open-amp/cmake/platforms/uniproton_arm64_gcc.cmake
12--- open-amp-2022.10.1/cmake/platforms/uniproton_arm64_gcc.cmake	1970-01-01 08:00:00.000000000 +0800
13+++ open-amp/cmake/platforms/uniproton_arm64_gcc.cmake	2023-02-20 14:24:50.000000000 +0800
14@@ -0,0 +1,14 @@
15+#cross-compilation config
16+
17+set(CMAKE_SYSTEM_PROCESSOR arm)
18+set(PROJECT_SYSTEM uniproton)
19+
20+set(CMAKE_C_COMPILER_WORKS 1)
21+set(CMAKE_CXX_COMPILER_WORKS 1)
22+
23+set(CROSS_PREFIX "/opt/buildtools/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin/aarch64-none-elf-" CACHE STRING "")
24+set(CMAKE_C_COMPILER "${CROSS_PREFIX}gcc" CACHE STRING "")
25+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER CACHE STRING "")
26+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER CACHE STRING "")
27+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER CACHE STRING "")
28+# vim: expandtab:ts=2:sw=2:smartindent
29diff -uparN open-amp-2022.10.1/CMakeLists.txt open-amp/CMakeLists.txt
30--- open-amp-2022.10.1/CMakeLists.txt	2022-12-13 11:21:05.000000000 +0800
31+++ open-amp/CMakeLists.txt	2023-02-24 16:27:30.000000000 +0800
32@@ -6,7 +6,8 @@ endif()
33 if (POLICY CMP0077)
34   cmake_policy(SET CMP0077 NEW)
35 endif()
36-
37+include_directories(../../build/libmetal/output/usr/local/include ../../component/open-amp/lib/include ../../include ../../config)
38+set (CMAKE_SYSTEM_NAME Uniproton)
39 set (OPENAMP_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
40 set (OPENAMP_BIN_ROOT "${CMAKE_CURRENT_BINARY_DIR}")
41
42diff -uparN open-amp-2022.10.1/lib/remoteproc/rsc_table_parser.c open-amp/lib/remoteproc/rsc_table_parser.c
43--- open-amp-2022.10.1/lib/remoteproc/rsc_table_parser.c	2022-12-13 11:21:05.000000000 +0800
44+++ open-amp/lib/remoteproc/rsc_table_parser.c	2023-02-24 16:16:20.000000000 +0800
45@@ -144,6 +144,8 @@ int handle_vdev_rsc(struct remoteproc *r
46
47 	num_vrings = vdev_rsc->num_of_vrings;
48 	for (i = 0; i < num_vrings; i++) {
49+		struct fw_rsc_vdev_vring *vring_rsc;
50+
51 		vring_rsc = &vdev_rsc->vring[i];
52 		notifyid = vring_rsc->notifyid;
53 		notifyid = remoteproc_allocate_id(rproc,
54diff -uparN open-amp-2022.10.1/VERSION open-amp/VERSION
55--- open-amp-2022.10.1/VERSION	2022-12-13 11:21:05.000000000 +0800
56+++ open-amp/VERSION	2023-02-24 15:51:04.000000000 +0800
57@@ -1,3 +1,3 @@
58 VERSION_MAJOR = 1
59 VERSION_MINOR = 3
60-VERSION_PATCH = 1
61+VERSION_PATCH = 0
62