Update for splited system/machine implementation

Adjust the lib/Makefile and the apps demos for the updated
system/machine implementation.

Signed-off-by: Wendy Liang <jliang@xilinx.com>

diff --git a/apps/Makefile.common b/apps/Makefile.common
index 300efeac69bfcdf70f1094cd33a550ce86e8063f..575532177fcfa152aeb12568308b36945a3b26a6 100644 (file)
--- a/apps/Makefile.common
+++ b/apps/Makefile.common
@@ -1,8 +1,8 @@
 local_dir = $(dir $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))))$(1)
 
 -include $(OHOME)/lib/system/$(SYSTEM)/machine/$(MACHINE)/Makefile.platform
--include $(SRCROOT)/system/$(SYSTEM)/machine/$(MACHINE)/Makefile.include
 -include $(SRCROOT)/machine/$(MACHINE)/Makefile.include
+-include $(SRCROOT)/system/$(SYSTEM)/machine/$(MACHINE)/Makefile.include
 
 CFLAGS += -I"$(OHOME)/lib/include"
 CFLAGS += -I"$(OHOME)/lib/include/openamp/system/$(SYSTEM)/machine/$(MACHINE)"

diff --git a/apps/echo_test/echo_testd.c b/apps/echo_test/echo_testd.c
index 7be30ae66b736e59206aa2c8310c45a9aa278fb1..9aa42e9ae53b5617350ca6ebc189823177b09d30 100644 (file)
--- a/apps/echo_test/echo_testd.c
+++ b/apps/echo_test/echo_testd.c
@@ -7,7 +7,10 @@ This application echoes back data that was sent to it by the master core. */
 #include <string.h>
 #include "openamp/open_amp.h"
 #include "rsc_table.h"
-#include "machine.h"
+
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
 
 #define SHUTDOWN_MSG   0xEF56A55A
 
@@ -16,8 +19,6 @@ static void rpmsg_channel_created(struct rpmsg_channel *rp_chnl);
 static void rpmsg_channel_deleted(struct rpmsg_channel *rp_chnl);
 static void rpmsg_read_cb(struct rpmsg_channel *, void *, int, void *,
                          unsigned long);
-static void init_system();
-
 /* Globals */
 static struct rpmsg_channel *app_rp_chnl;
 static struct rpmsg_endpoint *rp_ept;
@@ -25,12 +26,15 @@ static struct remote_proc *proc = NULL;
 static struct rsc_table_info rsc_info;
 extern const struct remote_resource_table resources;
 
+/* External functions */
+extern void init_system();
+
 /* Application entry point */
 int main()
 {
        int status = 0;
 
-#ifdef ZYNQ_A9
+#ifdef ZYNQ7_BAREMETAL
        SWITCH_TO_SYS_MODE();
 #endif
 
@@ -81,25 +85,3 @@ static void rpmsg_read_cb(struct rpmsg_channel *rp_chnl, void *data, int len,
        }
 }
 
-static void init_system()
-{
-
-#ifdef ZYNQMP_R5
-       /* Initilaize GIC */
-       zynqMP_r5_gic_initialize();
-#else
-#ifdef ZYNQ_A9
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-#endif
-#endif
-}

diff --git a/apps/echo_test/echo_testd_remoteproc_master.c b/apps/echo_test/echo_testd_remoteproc_master.c
index 041a1574be9fa6eb317a708bfbf6da739ff2e10c..e81450e14c662dbec4c21952edf3590beab2031d 100644 (file)
--- a/apps/echo_test/echo_testd_remoteproc_master.c
+++ b/apps/echo_test/echo_testd_remoteproc_master.c
@@ -15,9 +15,9 @@ Linux to gracefully shutdown. */
 #include <string.h>
 #include "openamp/open_amp.h"
 
-#define BAREMETAL_MASTER 1
-
-#include "machine.h"
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
 
 #define SHUTDOWN_MSG   0xEF56A55A
 
@@ -27,7 +27,6 @@ static void rpmsg_channel_deleted(struct rpmsg_channel *rp_chnl);
 static void rpmsg_read_cb(struct rpmsg_channel *, void *, int, void *,
                          unsigned long);
 static void sleep();
-static void init_system();
 
 /* Globals */
 static struct rpmsg_channel *app_rp_chnl;
@@ -37,6 +36,9 @@ char fw_name[] = "firmware1";
 
 static int shutdown_called = 0;
 
+/* External functions */
+extern void init_system();
+
 /* Application entry point */
 int main()
 {
@@ -46,8 +48,10 @@ int main()
        int shutdown_msg = SHUTDOWN_MSG;
        int i;
 
+#ifdef ZYNQ7_BAREMETAL
        /* Switch to System Mode */
        SWITCH_TO_SYS_MODE();
+#endif
 
        /* Initialize HW system components */
        init_system();
@@ -116,18 +120,3 @@ void sleep()
        for (i = 0; i < 100000; i++) ;
 }
 
-static void init_system()
-{
-
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-}

diff --git a/apps/func_test_suite/func_test_suite.c b/apps/func_test_suite/func_test_suite.c
index 72d7ae8f3fa5dce98bd367b0492d3923f2ba712c..a996883dd00ee674c0c072c663db33093995258c 100644 (file)
--- a/apps/func_test_suite/func_test_suite.c
+++ b/apps/func_test_suite/func_test_suite.c
@@ -8,7 +8,10 @@
 #include "openamp/open_amp.h"
 #include "rsc_table.h"
 #include "test_suite.h"
-#include "machine.h"
+
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
 
 #define EPT_ADDR        59
 
@@ -21,7 +24,6 @@ void rpmsg_read_ept_cb(struct rpmsg_channel *rp_chnl, void *data, int len,
                       void *pric, unsigned long src);
 
 static void sleep();
-static void init_system();
 
 /* Globals */
 static volatile int intr_flag = 0;
@@ -34,14 +36,19 @@ static char r_buffer[512];
 static struct rsc_table_info rsc_info;
 extern const struct remote_resource_table resources;
 
+/* External functions */
+extern void init_system();
+
 int main()
 {
        struct remote_proc *proc;
        int uninit = 0;
        struct ept_cmd_data *ept_data;
 
+#ifdef ZYNQ7_BAREMETAL
        /* Switch to System Mode */
        SWITCH_TO_SYS_MODE();
+#endif
 
        /* Initialize HW system components */
        init_system();
@@ -149,18 +156,3 @@ void sleep()
        for (i = 0; i < 1000; i++) ;
 }
 
-static void init_system()
-{
-
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-}

diff --git a/apps/func_test_suite/func_test_suite_remoteproc_master.c b/apps/func_test_suite/func_test_suite_remoteproc_master.c
index e3cf3d98a5ac65f8b6781d9aa5a671897a8e39de..821565f2abb14dadb7d75f8e3d532cb142f393a2 100644 (file)
--- a/apps/func_test_suite/func_test_suite_remoteproc_master.c
+++ b/apps/func_test_suite/func_test_suite_remoteproc_master.c
@@ -12,9 +12,10 @@ the rpmsg APIs and shutsdown the core once the test has been completed.*/
 #include "openamp/open_amp.h"
 #include "test_suite.h"
 
-#define BAREMETAL_MASTER 1
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
 
-#include "machine.h"
 
 /* Application provided callbacks */
 void rpmsg_channel_created(struct rpmsg_channel *rp_chnl);
@@ -38,7 +39,6 @@ int test_rpmsg_remote_channel_deletion(struct rpmsg_channel *rpmsg_chnl,
                                       char *channel_name);
 int test_execute_suite(char *firmware_name);
 static void sleep();
-static void init_system();
 
 int int_flag;
 
@@ -49,32 +49,21 @@ char fw_name1[] = "firmware1";
 struct _payload *p_payload = NULL;
 struct _payload *r_payload = NULL;
 
+/* External functions */
+extern void init_system();
+
 void sleep()
 {
        int i;
        for (i = 0; i < 10000; i++) ;
 }
 
-static void init_system()
-{
-
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-}
-
 int main()
 {
+#ifdef ZYNQ7_BAREMETAL
        /* Switch to System Mode */
        SWITCH_TO_SYS_MODE();
+#endif
 
        /* Initialize HW system components */
        init_system();

diff --git a/apps/linux_firmware_remoteproc_slave/Makefile b/apps/linux_firmware_remoteproc_slave/Makefile
index b164d20e1edbab733f60ca6f2f896a5f8e2b1a41..a8b5f47b3c988241b7e524e35727743fef5ab032 100644 (file)
--- a/apps/linux_firmware_remoteproc_slave/Makefile
+++ b/apps/linux_firmware_remoteproc_slave/Makefile
@@ -28,11 +28,7 @@ BOOTSTRAP_OBJS := $(patsubst %.c,$(BUILD)/%.o,$(BOOTSTRAP_SRCS)) $(patsubst %.S,
 
 LINKERSCRIPT := link_remote.ld
 
-ifeq ($(EXTRA_INCLUDES),)
-EXTRA_INCLUDES += -I"$(OHOME)/obsolete/system/$(SYSTEM)/machine/$(MACHINE)/linux_firmware"
-endif
-
-CFLAGS += $(EXTRA_INCLUDES)
+CFLAGS += -I"$(OHOME)/obsolete/system/$(SYSTEM)/machine/$(MACHINE)/linux_firmware"
 
 all: $(BOOTSTRAP_OUT)
        cp $(BOOTSTRAP_OUT) $(BUILD)/firmware1

diff --git a/apps/matrix_multiply/matrix_multiplyd.c b/apps/matrix_multiply/matrix_multiplyd.c
index ce678b04704de2e09a8f8658c7dcd940d2c0b45b..bf7e14a993eb6dacba51c282e2949f9f7d0d34d7 100644 (file)
--- a/apps/matrix_multiply/matrix_multiplyd.c
+++ b/apps/matrix_multiply/matrix_multiplyd.c
@@ -8,7 +8,10 @@ multiplies them and returns the result to the master core. */
 #include <string.h>
 #include "openamp/open_amp.h"
 #include "rsc_table.h"
-#include "machine.h"
+
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
 
 #define        MAX_SIZE                6
 #define NUM_MATRIX              2
@@ -25,7 +28,6 @@ static void rpmsg_channel_deleted(struct rpmsg_channel *rp_chnl);
 static void rpmsg_read_cb(struct rpmsg_channel *, void *, int, void *,
                          unsigned long);
 static void Matrix_Multiply(const matrix * m, const matrix * n, matrix * r);
-static void init_system();
 
 /* Globals */
 static struct rpmsg_channel *app_rp_chnl;
@@ -38,13 +40,16 @@ static struct remote_proc *proc = NULL;
 static struct rsc_table_info rsc_info;
 extern const struct remote_resource_table resources;
 
+/* External functions */
+extern void init_system();
+
 /* Application entry point */
 int main()
 {
 
        int status = 0;
 
-#ifdef ZYNQ_A9
+#ifdef ZYNQ7_BAREMETAL
        SWITCH_TO_SYS_MODE();
 #endif
 
@@ -115,25 +120,3 @@ static void Matrix_Multiply(const matrix * m, const matrix * n, matrix * r)
        }
 }
 
-static void init_system()
-{
-
-#ifdef ZYNQMP_R5
-       /* Initilaize GIC */
-       zynqMP_r5_gic_initialize();
-#else
-#ifdef ZYNQ_A9
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-#endif
-#endif
-}

diff --git a/apps/matrix_multiply/matrix_multiplyd_remoteproc_master.c b/apps/matrix_multiply/matrix_multiplyd_remoteproc_master.c
index 7186f969acb6664b8523b2c7b3fe11ee5244edb4..b94848a8b7364a24d7decedbd77a91efaf0e65c7 100644 (file)
--- a/apps/matrix_multiply/matrix_multiplyd_remoteproc_master.c
+++ b/apps/matrix_multiply/matrix_multiplyd_remoteproc_master.c
@@ -18,7 +18,10 @@ Linux to gracefully shutdown. */
 
 #define BAREMETAL_MASTER 1
 
-#include "machine.h"
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
+
 
 #define MAX_SIZE        6
 #define NUM_MATRIX      2
@@ -35,8 +38,6 @@ static matrix matrix_array[NUM_MATRIX];
 static matrix matrix_result;
 
 /* Prototypes */
-static void init_system();
-
 void sleep();
 
 /* Application provided callbacks */
@@ -54,6 +55,9 @@ int int_flag;
 
 static int shutdown_called = 0;
 
+/* External functions */
+extern void init_system();
+
 static void Matrix_Multiply(const matrix * m, const matrix * n, matrix * r)
 {
        int i, j, k;
@@ -85,8 +89,10 @@ int main()
        int i;
        int shutdown_msg = SHUTDOWN_MSG;
 
+#ifdef ZYNQ7_BAREMETAL
        /* Switch to System Mode */
        SWITCH_TO_SYS_MODE();
+#endif
 
        /* Initialize HW system components */
        init_system();
@@ -177,18 +183,3 @@ void sleep()
        for (i = 0; i < 10000000; i++) ;
 }
 
-static void init_system()
-{
-
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-}

diff --git a/apps/rpc_demo/rpc_demo.c b/apps/rpc_demo/rpc_demo.c
index ae351798f86319643be9a8befb8bfd25ec31da02..17caccf89643cd4506474b0a380b15693f72b8be 100755 (executable)
--- a/apps/rpc_demo/rpc_demo.c
+++ b/apps/rpc_demo/rpc_demo.c
@@ -9,11 +9,13 @@
 #include <unistd.h>
 #include "openamp/open_amp.h"
 #include "rsc_table.h"
-#include "machine.h"
 #include "openamp/rpmsg_retarget.h"
 
+#ifdef ZYNQ7_BAREMETAL
+#include "baremetal.h"
+#endif
+
 /* Internal functions */
-static void init_system();
 static void rpmsg_channel_created(struct rpmsg_channel *rp_chnl);
 static void rpmsg_channel_deleted(struct rpmsg_channel *rp_chnl);
 static void rpmsg_read_cb(struct rpmsg_channel *, void *, int, void *,
@@ -27,6 +29,9 @@ static struct remote_proc *proc = NULL;
 static struct rsc_table_info rsc_info;
 extern const struct remote_resource_table resources;
 
+/* External functions */
+extern void init_system();
+
 #define REDEF_O_CREAT 100
 #define REDEF_O_EXCL 200
 #define REDEF_O_RDONLY 0
@@ -50,7 +55,7 @@ int main()
        int ret;
        int status;
 
-#ifdef ZYNQ_A9
+#ifdef ZYNQ7_BAREMETAL
        SWITCH_TO_SYS_MODE();
 #endif
 
@@ -191,24 +196,3 @@ static void shutdown_cb(struct rpmsg_channel *rp_chnl)
        remoteproc_resource_deinit(proc);
 }
 
-static void init_system()
-{
-#ifdef ZYNQMP_R5
-       /* Initilaize GIC */
-       zynqMP_r5_gic_initialize();
-#else
-#ifdef ZYNQ_A9
-       /* Place the vector table at the image entry point */
-       arm_arch_install_isr_vector_table(RAM_VECTOR_TABLE_ADDR);
-
-       /* Enable MMU */
-       arm_ar_mem_enable_mmu();
-
-       /* Initialize ARM stacks */
-       init_arm_stacks();
-
-       /* Initialize GIC */
-       zc702evk_gic_initialize();
-#endif
-#endif
-}

diff --git a/lib/Makefile b/lib/Makefile
index 4484c6688208cd8e2cae3f3f439ef27c88c68f86..044a90472f4b880d17887f60bfc22753976a3276 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -36,6 +36,9 @@ INCLUDES += -I"include"
 ifneq ("$(wildcard include/openamp/system/$(SYSTEM))","")
 INCLUDES += -I"include/openamp/system/$(SYSTEM)"
 endif
+ifneq ("$(wildcard include/openamp/machine/$(MACHINE))","")
+INCLUDES += -I"include/openamp/machine/$(MACHINE)"
+endif
 ifneq ("$(wildcard include/openamp/system/$(SYSTEM)/machine/$(MACHINE))","")
 INCLUDES += -I"include/openamp/system/$(SYSTEM)/machine/$(MACHINE)"
 endif