From 76be7c9a79da62e0a52d932bdfdf56671c82e33d Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Mon, 31 Jan 2022 22:22:19 +0100
Subject: build fix

---
 ecp/platform/common.mk             | 3 +++
 ecp/platform/fe310.mk              | 7 -------
 ecp/platform/fe310/Makefile        | 3 +--
 ecp/platform/fe310/platform.mk     | 3 +++
 ecp/platform/fe310/platform_obj.mk | 1 +
 ecp/platform/fe310_obj.mk          | 1 -
 ecp/platform/posix.mk              | 4 ----
 ecp/platform/posix/Makefile        | 3 +--
 ecp/platform/posix/platform.mk     | 2 ++
 ecp/platform/posix/platform_obj.mk | 2 ++
 ecp/platform/posix_obj.mk          | 2 --
 11 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 ecp/platform/common.mk
 delete mode 100644 ecp/platform/fe310.mk
 create mode 100644 ecp/platform/fe310/platform.mk
 create mode 100644 ecp/platform/fe310/platform_obj.mk
 delete mode 100644 ecp/platform/fe310_obj.mk
 delete mode 100644 ecp/platform/posix.mk
 create mode 100644 ecp/platform/posix/platform.mk
 create mode 100644 ecp/platform/posix/platform_obj.mk
 delete mode 100644 ecp/platform/posix_obj.mk

(limited to 'ecp/platform')

diff --git a/ecp/platform/common.mk b/ecp/platform/common.mk
new file mode 100644
index 0000000..d49792b
--- /dev/null
+++ b/ecp/platform/common.mk
@@ -0,0 +1,3 @@
+platform ?= posix
+src_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../src)
+include $(src_dir)/common.mk
diff --git a/ecp/platform/fe310.mk b/ecp/platform/fe310.mk
deleted file mode 100644
index fd3e6dd..0000000
--- a/ecp/platform/fe310.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-FE310_HOME ?= $(PWD)/../../fw/fe310
-export FE310_HOME
-
-include $(FE310_HOME)/common.mk
-CFLAGS	+= -I$(FE310_HOME) -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -D__FE310__
-
-platform = fe310
diff --git a/ecp/platform/fe310/Makefile b/ecp/platform/fe310/Makefile
index 340effa..1a3502a 100644
--- a/ecp/platform/fe310/Makefile
+++ b/ecp/platform/fe310/Makefile
@@ -1,5 +1,4 @@
-include ../fe310.mk
-CFLAGS += -I../../src
+include ../common.mk
 
 obj_tr = transport.o
 obj_tm = time.o
diff --git a/ecp/platform/fe310/platform.mk b/ecp/platform/fe310/platform.mk
new file mode 100644
index 0000000..0230f29
--- /dev/null
+++ b/ecp/platform/fe310/platform.mk
@@ -0,0 +1,3 @@
+fe310_dir = $(abspath $(src_dir)/../../fw/fe310)
+include $(fe310_dir)/platform.mk
+CFLAGS += -I$(fe310_dir) -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -D__FE310__
diff --git a/ecp/platform/fe310/platform_obj.mk b/ecp/platform/fe310/platform_obj.mk
new file mode 100644
index 0000000..52e4bb1
--- /dev/null
+++ b/ecp/platform/fe310/platform_obj.mk
@@ -0,0 +1 @@
+subdirs	+= vconn
diff --git a/ecp/platform/fe310_obj.mk b/ecp/platform/fe310_obj.mk
deleted file mode 100644
index 52e4bb1..0000000
--- a/ecp/platform/fe310_obj.mk
+++ /dev/null
@@ -1 +0,0 @@
-subdirs	+= vconn
diff --git a/ecp/platform/posix.mk b/ecp/platform/posix.mk
deleted file mode 100644
index 7e7daeb..0000000
--- a/ecp/platform/posix.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CFLAGS	+= -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_WITH_DIRSRV -DECP_DEBUG=1
-LDFLAGS	+= -lm -pthread
-
-platform = posix
diff --git a/ecp/platform/posix/Makefile b/ecp/platform/posix/Makefile
index aebb994..1a3502a 100644
--- a/ecp/platform/posix/Makefile
+++ b/ecp/platform/posix/Makefile
@@ -1,5 +1,4 @@
-include ../posix.mk
-CFLAGS += -I../../src
+include ../common.mk
 
 obj_tr = transport.o
 obj_tm = time.o
diff --git a/ecp/platform/posix/platform.mk b/ecp/platform/posix/platform.mk
new file mode 100644
index 0000000..0370c58
--- /dev/null
+++ b/ecp/platform/posix/platform.mk
@@ -0,0 +1,2 @@
+CFLAGS	+= -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_WITH_DIRSRV -DECP_DEBUG=1
+LDFLAGS	+= -lm -pthread
diff --git a/ecp/platform/posix/platform_obj.mk b/ecp/platform/posix/platform_obj.mk
new file mode 100644
index 0000000..6ca3b8d
--- /dev/null
+++ b/ecp/platform/posix/platform_obj.mk
@@ -0,0 +1,2 @@
+obj	+= rbuf.o rbuf_send.o rbuf_recv.o msgq.o
+subdirs	+= htable vconn
diff --git a/ecp/platform/posix_obj.mk b/ecp/platform/posix_obj.mk
deleted file mode 100644
index 6ca3b8d..0000000
--- a/ecp/platform/posix_obj.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-obj	+= rbuf.o rbuf_send.o rbuf_recv.o msgq.o
-subdirs	+= htable vconn
-- 
cgit v1.2.3