Merge pull request #124 from timvideos/opsis-fixes

Making the Opsis board work
timvideos · Nov 3, 2015 · fb3d8ad · fb3d8ad
2 parents 36b6341 + 48477f3
commit fb3d8ad
Show file tree

Hide file tree

Showing 24 changed files with 555 additions and 1,808 deletions.
diff --git a/Makefile.lm32 b/Makefile.lm32
@@ -13,7 +13,12 @@
 #  * http://m-labs.hk/gateware.html
 
 TARGETS += lm32
+
+ifeq ($(BOARD),atlys)
 SERIAL ?= /dev/ttyVIZ0
+else
+SERIAL ?= /dev/ttyACM0
+endif
 
 help-lm32:
 	@echo "  Set lm32 serial port with SERIAL=/dev/ttyXXXX"

diff --git a/firmware/fx2/Makefile b/firmware/fx2/Makefile
@@ -37,13 +37,14 @@ LIBS := $(FX2LIBDIR)/lib/fx2.lib
 INCS := -I sdcc -I$(FX2LIBDIR)/include -I.
 
 # Settings specific for the TimVideo hdmi2usb firmware
-FLAGS +="-DDEBUG"
+BOARD ?= atlys
+FLAGS +=-DDEBUG -DBOARD_${BOARD}
 USE_16K := 1
 
 # Must only be hex numbers
 FIRMWARE_VERSION := $(shell date +%Y%m%d)
 
-CC_SRCS := app.c cdc.c debug.c livePatch.c prog.c prom.c softserial.c uvc.c firmware.c
+CC_SRCS := app.c cdc.c debug.c softserial.c uvc.c firmware.c read-serialno.c to-uart.c
 AS_SRCS := descriptors_hdmi2usb.a51
 CC_OBJS := $(CC_SRCS:%.c=%.rel)
 AS_OBJS := $(AS_SRCS:%.a51=%.rel)
@@ -60,9 +61,20 @@ else
 	CFLAGS += --code-size 0x1e00 --xram-size 0x0200 -Wl"-b DSCR_AREA=0x1e00" -Wl"-b INT2JT=0x1f00"
 endif
 
+ifeq (${BOARD},atlys)
 VID := 1D50
 PID := 60B7
 DID := 0002
+else
+ifeq (${BOARD},opsis)
+VID := 2A19
+PID := 5442
+DID := 0002
+else
+$(error "Unknown board type '$(BOARD)'")
+endif
+endif
+
 
 # Use make V=1 for a verbose build.
 ifndef V

diff --git a/firmware/fx2/README.md b/firmware/fx2/README.md
@@ -55,7 +55,7 @@ FIXME: Check this is correct!!!
 |     1    | IN and OUT | INT/BULK      | 64-byte buffers for smaller payloads |
 |     2    | IN or OUT  | BULK/ISO/INT  | 512 or 1024 byte buffers for larger payloads |
 |     4    | IN or OUT  | BULK/ISO/INT  |  |
-|     6    | IN or OUT  | BULK/ISOINT   |  |
+|     6    | IN or OUT  | BULK/ISO/INT  |  |
 |     8    | IN or OUT  | BULK/ISO/INT  |  |