Apps: move linux helper to linux/machine
authorWendy Liang <jliang@xilinx.com>
Thu, 1 Sep 2016 22:26:33 +0000 (15:26 -0700)
committerWendy Liang <jliang@xilinx.com>
Thu, 13 Oct 2016 05:01:49 +0000 (22:01 -0700)
As the application initialization is system dependent,
move the helper.c which for the system initialization
to linux/machine.

Signed-off-by: Wendy Liang <jliang@xilinx.com>
apps/system/linux/CMakeLists.txt
apps/system/linux/machine/CMakeLists.txt [new file with mode: 0644]
apps/system/linux/machine/zynqmp/CMakeLists.txt [new file with mode: 0644]
apps/system/linux/machine/zynqmp/helper.c [moved from apps/system/linux/helper.c with 98% similarity]

index 210ac56935d3e91f34fd9ae2e9630cd6b4923b5d..ea643a46d00e77c2630c5c7b58506d0531e40192 100644 (file)
@@ -1,13 +1 @@
-collect (APP_COMMON_SOURCES helper.c)
-
-if (WITH_REMOTEPROC_MASTER)
-  message(FATAL_ERROR "Remoteproc master is not currently supported on ${MACHINE}/${SYSTEM}.")
-else (WITH_REMOTEPROC_MASTER)
-  set (_linker_script "${CMAKE_CURRENT_SOURCE_DIR}/linker_remote.ld")
-endif (WITH_REMOTEPROC_MASTER)
-
-set_property (GLOBAL PROPERTY APP_LINKER_SCRIPT "${_linker_script}")
-
-find_library(LIBXIL_LIB NAMES xil PATHS ${CMAKE_FIND_ROOT_PATH})
-get_filename_component(LIBXIL_LIB_DIR ${LIBXIL_LIB} DIRECTORY)
-collect(PROJECT_LIB_DIRS ${LIBXIL_LIB_DIR})
+add_subdirectory (machine)
diff --git a/apps/system/linux/machine/CMakeLists.txt b/apps/system/linux/machine/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9720224
--- /dev/null
@@ -0,0 +1,3 @@
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE}/CMakeLists.txt")
+  add_subdirectory (${PROJECT_MACHINE})
+endif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE}/CMakeLists.txt")
diff --git a/apps/system/linux/machine/zynqmp/CMakeLists.txt b/apps/system/linux/machine/zynqmp/CMakeLists.txt
new file mode 100644 (file)
index 0000000..eee8c6d
--- /dev/null
@@ -0,0 +1,6 @@
+collect (APP_COMMON_SOURCES helper.c)
+
+if (WITH_REMOTEPROC_MASTER)
+  message(FATAL_ERROR "Remoteproc master is not currently supported on ${MACHINE}/${SYSTEM}.")
+endif (WITH_REMOTEPROC_MASTER)
+
similarity index 98%
rename from apps/system/linux/helper.c
rename to apps/system/linux/machine/zynqmp/helper.c
index b5d5fea8d1479a9cea2ca38d9f5f651e8d02a0d8..b19894aa5d098be70807737e798eb4d866dcd191 100644 (file)
@@ -36,7 +36,7 @@
 #include "metal/device.h"
 #include "metal/io.h"
 
 #include "metal/device.h"
 #include "metal/io.h"
 
-#define SHM_DEV_NAME "3ed10000.shm"
+#define SHM_DEV_NAME "3ed80000.shm"
 #define SHM_BUS_NAME "platform"
 
 static struct metal_device *shm_dev;
 #define SHM_BUS_NAME "platform"
 
 static struct metal_device *shm_dev;