Merge branch 'cleanup' into david-libertm-devel

0bb0630c · Juan David González Cobas · b2caeba1 · 9c717f90 · 0bb0630c · 0bb0630c
Commit 0bb0630c authored Mar 19, 2021 by Juan David González Cobas
Showing with 438 additions and 809 deletions

board.c boards/ertm14/board.c +0 -1

Makefile libertm/Makefile +6 -18

cli libertm/cli +1 -395

cli libertm/cli +1 -395

deploy.mk libertm/deploy.mk +12 -0

ertm-cli libertm/ertm-cli +418 -0

No files found.
--- a/boards/ertm14/board.c
+++ b/boards/ertm14/board.c
@@ -1090,7 +1090,6 @@ static void subscribe_nco(struct ertm14_nco_reset *nco)

 	dds->sync_count = 0;
 	dds->sync_source = nco->sync_source;
-	pp_printf("subscribing %s in mode %d\n", ddss, nco->sync_source);
 	event_post(WRC_ERTM14_EVENT_RECONFIGURED);
 }


--- a/libertm/Makefile
+++ b/libertm/Makefile
@@ -11,11 +11,10 @@ WRC_INCLUDES = ../include
 CFLAGS += -I $(ERTM_UART_LOCATION) -I $(ERTM_BOARD_LOCATION)
 CFLAGS += -I $(WRC_INCLUDES)

-all: libs main
+LIBS = $(TARGET).a $(TARGET).so libertm_display.so

-libs: static-lib so-lib display.so
-static-lib: $(TARGET).a
-so-lib: $(TARGET).so
+all: libs main
+libs: $(LIBS)

 $(TARGET).a $(TARGET).so: $(TARGET).o linux-uart-link.o common-uart-link.o
 $(TARGET).so:
@@ -27,29 +26,18 @@ $(TARGET).o: $(TARGET).h
 main: main.o libertm.a display.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) $(LDFLAGS) -lm

-serial: serial.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) $(LDFLAGS)
-serial.o: $(TARGET).h
-
-ertm-serial: ertm-serial.o libertm.a display.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) $(LDFLAGS) -lm
-
 common-uart-link.o: $(ERTM_BOARD_LOCATION)/common-uart-link.c
 	$(CC) $(CFLAGS) -o $@ -c $^
-
 ertm14-uart-link.o: $(ERTM_UART_LOCATION)/ertm14-uart-link.c
 	$(CC) $(CFLAGS) -c -o $@ $^ $(LDLIBS) $(LDFLAGS)
-
 linux-uart-link.o: $(ERTM_BOARD_LOCATION)/common-uart-link.h
-ertm-serial.o: $(WRC_INCLUDES)/hw/wrc_diags_regs.h
-ertm-serial.o: $(ERTM_BOARD_LOCATION)/psnmp-proto.h $(ERTM_BOARD_LOCATION)/board-state.h
-ertm-serial.o: $(ERTM_BOARD_LOCATION)/common-uart-link.h $(ERTM_BOARD_LOCATION)/ertm15_rf_distr.h
-ertm-serial.o: private.h libertm.h
 libertm.o: libertm.h private.h

-display.so: display.o
+libertm_display.so: display.o
 	$(LD) -shared -o $@ $^

 clean:
 	rm -f *.o *.a *.so
 	rm -f serial ertm-serial main
+
+include deploy.mk
--- a/libertm/cli
+++ b/libertm/cli
--- a/libertm/cli
+++ b/libertm/cli
+ertm-cli
\ No newline at end of file
--- a/libertm/deploy.mk
+++ b/libertm/deploy.mk
+VERSION = 1.0.0
+DEPLOY_TARGET ?= /acc/local/L867/drv/ertm/$(VERSION)
+TOOLS = ../tools/uart-bootloader/usb-bootloader.py ertm-cli
+
+deploy: $(LIBS) libertm.h $(TOOLS) ../wrc.bin ertm-setup
+	mkdir -p $(DEPLOY_TARGET)/lib $(DEPLOY_TARGET)/include \
+		$(DEPLOY_TARGET)/tools $(DEPLOY_TARGET)/bin
+	install -b ../wrc.bin $(LIBS) -C $(DEPLOY_TARGET)/lib
+	install -b libertm.h -C $(DEPLOY_TARGET)/include
+	install -b $(TOOLS) -C $(DEPLOY_TARGET)/tools
+	(cd $(DEPLOY_TARGET)/bin ; ln -sf ../tools/* .)
+	install -b ertm-setup -C $(DEPLOY_TARGET)/bin
--- a/libertm/ertm-cli
+++ b/libertm/ertm-cli