apps:echo_test:zynq7: generic remoteproc master

Add remoteproc master support to zynq7 generic echo_test.

diff --git a/apps/echo_test/Makefile b/apps/echo_test/Makefile
index 6e4cad988d8ce56f46edb879475fe3e749d8d85b..06ab4bd6e9552f25a34556e0c81ff549687513a6 100644 (file)
--- a/apps/echo_test/Makefile
+++ b/apps/echo_test/Makefile
@@ -8,6 +8,8 @@ EXES := $(BUILD)/echo_testd.out
 
 ifeq ($(REMOTEPROC_MASTER),y)
 ECHO_TEST_D_SRCS := echo_testd_remoteproc_master.c
+EXES := $(BUILD)/echo_testd.bin
+BUILDSHARE := $(PBUILD)/share
 else
 ECHO_TEST_D_SRCS := echo_testd.c
 endif
@@ -19,7 +21,7 @@ C_COMMON_OBJS := $(foreach f,$(C_COMMON_SRCS),$(BUILD)/$(patsubst %c,%o,$(shell
 # Create obj files dependencies
 $(foreach f,$(ECHO_TEST_D_SRCS) $(C_COMMON_SRCS),$(eval $(patsubst %.c,%.o,$(BUILD)/$(shell basename $(f)))_dep := $(f)))
 
-ECHO_TEST_D_MAP := $(patsubst %.out,%.map, $(EXES))
+ECHO_TEST_D_MAP := $(patsubst %.out,%.map,$(BUILD)/echo_testd.out)
 
 LIBS := -lopen_amp $(DEPS)
 
@@ -27,11 +29,19 @@ LIBS := -lopen_amp $(DEPS)
 
 all: $(EXES)
 
+ifeq ($(REMOTEPROC_MASTER),y)
 $(BUILD)/echo_testd.out: $(ECHO_TEST_D_OBJS) $(C_COMMON_OBJS)
-
        @echo 'Building echo test for baremetal : $@'
+       $(LD)  -Wl,-Map=$(ECHO_TEST_D_MAP) -Wl,--gc-sections -T"$(LINKERSCRIPT)" $(LDFLAGS) -o "$@" $^ -Wl,--start-group $(BUILDSHARE)/firmware1.o $(BUILDSHARE)/firmware2.o -lstdc++ $(LIBS) -Wl,--end-group
 
+$(BUILD)/echo_testd.bin: $(BUILD)/echo_testd.out
+       $(CROSS)objcopy -O binary $(BUILD)/echo_testd.out $(BUILD)/echo_testd.bin
+
+else
+$(BUILD)/echo_testd.out: $(ECHO_TEST_D_OBJS) $(C_COMMON_OBJS)
+       @echo 'Building echo test for baremetal : $@'
        $(LD)  -Wl,-Map=$(ECHO_TEST_D_MAP) -Wl,--gc-sections -T"$(LINKERSCRIPT)" $(LDFLAGS) -o "$@"  $^ -Wl,--start-group $(LIBS) -Wl,--end-group
+endif
 
 clean:
        rm -rf $(BUILD)