Move porting/system/ to system/
authorWendy Liang <jliang@xilinx.com>
Fri, 8 Jan 2016 02:15:37 +0000 (18:15 -0800)
committerWendy Liang <jliang@xilinx.com>
Tue, 9 Feb 2016 19:54:22 +0000 (11:54 -0800)
extra porting/ directory is not required.

Signed-off-by: Wendy Liang <jliang@xilinx.com>
12 files changed:
Makefile
Makefile.commons
include/openamp/system/generic/machine/zynq7/machine.h [moved from include/openamp/porting/system/generic/machine/zynq7/machine.h with 100% similarity]
include/openamp/system/generic/machine/zynqmp_r5/machine.h [moved from include/openamp/porting/system/generic/machine/zynqmp_r5/machine.h with 100% similarity]
system/generic/bm_env.c [moved from porting/system/generic/bm_env.c with 100% similarity]
system/generic/machine/zynq7/Makefile.platform [moved from porting/system/generic/machine/zynq7/Makefile.platform with 100% similarity]
system/generic/machine/zynq7/machine.c [moved from porting/system/generic/machine/zynq7/machine.c with 100% similarity]
system/generic/machine/zynq7/remoteproc_zynq7.c [moved from porting/system/generic/machine/zynq7/remoteproc_zynq7.c with 100% similarity]
system/generic/machine/zynq7/zynq_trampoline.S [moved from porting/system/generic/machine/zynq7/zynq_trampoline.S with 100% similarity]
system/generic/machine/zynqmp_r5/Makefile.platform [moved from porting/system/generic/machine/zynqmp_r5/Makefile.platform with 100% similarity]
system/generic/machine/zynqmp_r5/machine.c [moved from porting/system/generic/machine/zynqmp_r5/machine.c with 100% similarity]
system/generic/machine/zynqmp_r5/remoteproc_zynqmp.c [moved from porting/system/generic/machine/zynqmp_r5/remoteproc_zynqmp.c with 100% similarity]

index b6b91e4bb3d4a2f555206bd5f48c1e54a2811079..653fe7bda49d253c5e0c9c838145dea6fac36120 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ include Makefile.commons
 
 LIB := libs/open_amp/libopen_amp.a
 
-INCLUDES := -I"include" -I"include/openamp/porting/system/$(SYSTEM)/machine/$(MACHINE)"
+INCLUDES := -I"include" -I"include/openamp/system/$(SYSTEM)/machine/$(MACHINE)"
 INCLUDES += -I"libs/system/$(MACHINE)/$(SYSTEM)"
 CFLAGS += $(INCLUDES)
 
@@ -15,12 +15,12 @@ $(wildcard virtio/*.c) \
 $(wildcard rpmsg/*.c) \
 $(wildcard common/*.c) \
 $(wildcard proxy/*.c) \
-$(wildcard porting/system/$(SYSTEM)/*.c) \
-$(wildcard porting/system/$(SYSTEM)/machine/$(MACHINE)/*.c) \
-$(wildcard porting/machine/$(MACHINE)/*.c)
+$(wildcard system/$(SYSTEM)/*.c) \
+$(wildcard system/$(SYSTEM)/machine/$(MACHINE)/*.c) \
+$(wildcard machine/$(MACHINE)/*.c)
 
 AS_SRCFILES += \
-$(wildcard porting/system/$(SYSTEM)/machine/$(MACHINE)/*.S)
+$(wildcard system/$(SYSTEM)/machine/$(MACHINE)/*.S)
 
 OBJFILES := $(patsubst %.c, %.o, $(C_SRCFILES)) $(patsubst %.S, %.o, $(AS_SRCFILES))
 
index b3afbfba233782c7267aa642d9e7fd9ddbe49ee4..36506bf6a585df627b8e026ae457f786d9c330c2 100644 (file)
@@ -14,7 +14,7 @@ ifeq ($(OHOME),)
 export OHOME := $(CURDIR)
 endif
 
-include porting/system/$(SYSTEM)/machine/$(MACHINE)/Makefile.platform
+include system/$(SYSTEM)/machine/$(MACHINE)/Makefile.platform
 
 ifeq ($(SYSTEM),baremetal)\r
 CFLAGS +=-D"ENV=1"\r