From dbb4fea690017cb9735ca4a6802f8f2fa3a8e951 Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Wed, 2 Feb 2022 07:36:56 +0100
Subject: fsfat moved to ext dir

---
 fw/fe310/Makefile             | 3 ++-
 fw/fe310/bsp/drivers/Makefile | 2 +-
 fw/fe310/bsp/gloss/Makefile   | 2 +-
 fw/fe310/bsp/metal/Makefile   | 2 +-
 fw/fe310/common.mk            | 2 +-
 fw/fe310/eos/Makefile         | 2 +-
 fw/fe310/test/Makefile        | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'fw')

diff --git a/fw/fe310/Makefile b/fw/fe310/Makefile
index 4ac5372..a4f5d1e 100644
--- a/fw/fe310/Makefile
+++ b/fw/fe310/Makefile
@@ -1,10 +1,11 @@
 include common.mk
+crypto_dir = $(ext_dir)/crypto
 MAKEFLAGS += -I$(fe310_dir)
 
 include $(crypto_dir)/crypto_obj.mk
 obj_crypto = $(addprefix $(crypto_dir)/,$(obj_dep))
 
-subdirs = bsp/drivers bsp/gloss bsp/metal eos eos/i2c eos/eve eos/eve/screen eos/eve/widget eos/app fsfat
+subdirs = bsp/drivers bsp/gloss bsp/metal eos eos/i2c eos/eve eos/eve/screen eos/eve/widget eos/app $(ext_dir)/fsfat
 
 all: libeos.a
 
diff --git a/fw/fe310/bsp/drivers/Makefile b/fw/fe310/bsp/drivers/Makefile
index 14fed05..1fb45ba 100644
--- a/fw/fe310/bsp/drivers/Makefile
+++ b/fw/fe310/bsp/drivers/Makefile
@@ -1,5 +1,5 @@
 include ../../common.mk
-CFLAGS += -I../include -include sys/cdefs.h
+CFLAGS += -I$(bsp_dir)/include -include sys/cdefs.h
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
diff --git a/fw/fe310/bsp/gloss/Makefile b/fw/fe310/bsp/gloss/Makefile
index 4376dce..168c9fc 100644
--- a/fw/fe310/bsp/gloss/Makefile
+++ b/fw/fe310/bsp/gloss/Makefile
@@ -1,5 +1,5 @@
 include ../../common.mk
-CFLAGS += -I../include
+CFLAGS += -I$(bsp_dir)/include
 
 src = sys_access.c sys_chdir.c sys_chmod.c sys_chown.c sys_close.c sys_execve.c sys_exit.c sys_faccessat.c sys_fork.c sys_fstat.c sys_fstatat.c sys_ftime.c sys_getcwd.c sys_getpid.c \
 	sys_isatty.c sys_kill.c sys_link.c sys_lseek.c sys_lstat.c sys_open.c sys_openat.c sys_read.c sys_sbrk.c sys_stat.c sys_sysconf.c sys_unlink.c sys_utime.c sys_wait.c sys_write.c
diff --git a/fw/fe310/bsp/metal/Makefile b/fw/fe310/bsp/metal/Makefile
index 32acfd2..962d3bc 100644
--- a/fw/fe310/bsp/metal/Makefile
+++ b/fw/fe310/bsp/metal/Makefile
@@ -1,5 +1,5 @@
 include ../../common.mk
-CFLAGS += -I../include -I../drivers
+CFLAGS += -I$(bsp_dir)/include -I$(bsp_dir)/drivers
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
diff --git a/fw/fe310/common.mk b/fw/fe310/common.mk
index 8145ef0..80a34a9 100644
--- a/fw/fe310/common.mk
+++ b/fw/fe310/common.mk
@@ -1,7 +1,7 @@
 fe310_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 bsp_dir := $(abspath $(fe310_dir)/bsp)
 eos_dir := $(abspath $(fe310_dir)/eos)
-crypto_dir := $(abspath $(fe310_dir)/../../ext/crypto)
+ext_dir := $(abspath $(fe310_dir)/../../ext)
 
 include $(fe310_dir)/platform.mk
 CFLAGS += -I$(eos_dir)
diff --git a/fw/fe310/eos/Makefile b/fw/fe310/eos/Makefile
index fe5bb5e..01318de 100644
--- a/fw/fe310/eos/Makefile
+++ b/fw/fe310/eos/Makefile
@@ -1,5 +1,5 @@
 include ../common.mk
-CFLAGS += -I. -I$(bsp_dir)/include -I$(bsp_dir)/drivers -I$(crypto_dir)
+CFLAGS += -I. -I$(bsp_dir)/include -I$(bsp_dir)/drivers -I$(ext_dir)/crypto
 
 obj = trap_entry.o eos.o msgq.o event.o interrupt.o timer.o pwr.o i2s.o i2c.o uart.o spi.o spi_dev.o lcd.o sdcard.o sdc_crypto.o cam.o net.o wifi.o cell.o sock.o unicode.o
 
diff --git a/fw/fe310/test/Makefile b/fw/fe310/test/Makefile
index 5f7f86f..3b32c73 100644
--- a/fw/fe310/test/Makefile
+++ b/fw/fe310/test/Makefile
@@ -1,5 +1,5 @@
 include ../common.mk
-CFLAGS += -I$(bsp_dir)/include -I$(bsp_dir)/drivers -I$(crypto_dir)
+CFLAGS += -I$(bsp_dir)/include -I$(bsp_dir)/drivers -I$(ext_dir)/crypto
 LDFLAGS = $(CFLAGS) -L.. -Wl,--gc-sections -nostartfiles -nostdlib -Wl,--start-group -lc -lm -lgcc -leos -Wl,--end-group -T../bsp/default.lds
 
 DEPS = main.o status.o cell_dev.o cell_pdp.o phone.o modem.o wifi.o cam.o audio.o test.o
-- 
cgit v1.2.3