summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUros Majstorovic <majstor@majstor.org>2022-08-09 22:34:12 +0200
committerUros Majstorovic <majstor@majstor.org>2022-08-09 22:34:12 +0200
commit76ed6228dc0b88840d01f99761ca09323bf11c51 (patch)
tree7d996dac5c1bbdde8a86929e17e1cac67d76220d
parent3b560c931c0d452b048c7a715e245e23f15d9924 (diff)
parentd61f8dd66ff2337319aa61e4ce2fd72a90c20b76 (diff)
fixed conflict
-rw-r--r--fw/fe310/test/Makefile27
-rw-r--r--fw/fe310/test/main.c2
2 files changed, 0 insertions, 29 deletions
diff --git a/fw/fe310/test/Makefile b/fw/fe310/test/Makefile
deleted file mode 100644
index 323bce0..0000000
--- a/fw/fe310/test/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include ../common.mk
-CFLAGS += -DECP_WITH_VCONN=1 -DECP_WITH_DIR=1 -DECP_DEBUG=1 -I$(bsp_dir)/include -I$(bsp_dir)/drivers -I$(ext_dir)/crypto -I$(ext_dir)/fsfat -I$(ecp_dir)/src -I$(ecp_dir)/src/platform/fe310 -I..
-LDFLAGS = app/*.o $(CFLAGS) -L.. -L$(ecp_dir)/build-fe310 -Wl,--gc-sections -nostartfiles -nostdlib -Wl,--start-group -lc -lm -lgcc -leos -lecp -lecpcr -lecptr -lecptm -lecpdir -lecpvconn -Wl,--end-group -T../bsp/default.lds
-
-DEPS = main.o mem.o cell_dev.o cell_pdp.o phone.o modem.o wifi.o cam.o fs.o test.o
-# DEPS += ecp2.o ecp_init.o audio.o
-TARGET = phone
-
-
-all: $(TARGET)
-
-app_:
- (cd app && $(MAKE)) || exit;
-
-%.o: %.c
- $(CC) $(CFLAGS) -c $<
-
-$(TARGET): app_ $(DEPS)
- $(CC) $(DEPS) $(LDFLAGS) -o $@
-
-clean:
- (cd app && $(MAKE) clean) || exit;
- rm -f *.o *.a $(TARGET)
-
-upload: $(TARGET)
- ../bsp/upload --elf ./$(TARGET) --openocd $(RISCV_OPENOCD_HOME)/bin/openocd --gdb $(RISCV_HOME)/bin/riscv64-unknown-elf-gdb --openocd-config ../bsp/openocd.cfg
-
diff --git a/fw/fe310/test/main.c b/fw/fe310/test/main.c
index 36ad5b8..2fc1a04 100644
--- a/fw/fe310/test/main.c
+++ b/fw/fe310/test/main.c
@@ -28,8 +28,6 @@
#include "wifi.h"
#include "cam.h"
#include "fs.h"
-#include "audio.h"
-#include "ecp.h"
#include "test.h"
const uint32_t _eos_touch_matrix[6] = {0xf7ac,0x440,0x3e704,0xfffff718,0x108a3,0xfff76d42};