File tree 4 files changed +15
-22
lines changed
4 files changed +15
-22
lines changed Original file line number Diff line number Diff line change @@ -67,6 +67,14 @@ FLASHEXTRA_CMD = \
67
67
$(PROGRAMMER_OPTION ) \
68
68
$(BOARD )
69
69
70
+ MODESWITCH_CMD = \
71
+ hdmi2usb-mode-switch \
72
+ --by-type=$(BOARD ) \
73
+ --verbose
74
+
75
+ MODEINFO_CMD = \
76
+ hdmi2usb-find-board \
77
+ --by-type=$(BOARD )
70
78
71
79
ifeq ($(OS ) ,Windows_NT)
72
80
FLTERM = $(PYTHON) $(MSCDIR)/tools/flterm.py
@@ -146,13 +154,15 @@ download-prebuilt:
146
154
147
155
# Load
148
156
load-gateware :
157
+ $(MODESWITCH_CMD ) --mode=jtag
149
158
$(MAKEPY_CMD ) load-bitstream
150
159
151
160
load : load-gateware $(addprefix load-,$(TARGETS ) )
152
161
@true
153
162
154
163
# Flash
155
164
flash-gateware : gateware-submodules
165
+ $(MODESWITCH_CMD ) --mode=jtag
156
166
$(MAKEPY_CMD ) flash-bitstream
157
167
@echo " "
158
168
@echo " "
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ embed-fx2: firmware/lm32/fx2_fw_hdmi2usb.c
34
34
@true
35
35
36
36
load-fx2: firmware/fx2/hdmi2usb.hex
37
- firmware/ fx2/download.sh firmware/fx2/hdmi2usb.hex
37
+ $(MODESWITCH_CMD) --load- fx2-firmware firmware/fx2/hdmi2usb.hex
38
38
39
39
flash-fx2:
40
40
@true
Original file line number Diff line number Diff line change @@ -16,19 +16,15 @@ TARGETS += lm32
16
16
17
17
RAM_ADDR ?= 0x20000000
18
18
19
- ifeq ($(BOARD),atlys)
20
- SERIAL ?= /dev/ttyVIZ0
21
- else
22
19
ifeq ($(BOARD),minispartan6)
23
20
SERIAL ?= /dev/ttyUSB1
24
21
RAM_ADDR = 0x40000000
25
22
else
26
23
ifeq ($(BOARD),pipistrello)
27
24
SERIAL ?= /dev/ttyUSB1
28
25
else
29
- # Opsis fall through
30
- SERIAL ?= /dev/ttyACM0
31
- endif
26
+ # Atlys/Opsis use modeswitch to find the serial port
27
+ SERIAL ?= $$($(MODEINFO_CMD) --get-serial)
32
28
endif
33
29
endif
34
30
@@ -70,11 +66,13 @@ flash-lm32: image-lm32
70
66
@echo " see https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/274)"
71
67
@echo "Booting will use lm32 firmware embedded in the gateware."
72
68
@echo
69
+ # $(MODESWITCH_CMD) --mode=jtag
73
70
# export FIRMWARE_ADDRESS=$$($(PYTHON) -c "import platforms.$(BOARD) as b; print(b.Platform.gateware_size)"); \
74
71
# echo "Flashing to $$($(PYTHON) -c "print(hex($$FIRMWARE_ADDRESS))") ($$FIRMWARE_ADDRESS)"; \
75
72
# $(FLASHEXTRA_CMD) $(HDMI2USBDIR)/firmware/lm32/firmware.fbi $$FIRMWARE_ADDRESS
76
73
77
74
clear-flash-lm32:
75
+ $(MODESWITCH_CMD) --mode=jtag
78
76
export FIRMWARE_ADDRESS=$$($(PYTHON) -c "import platforms.$(BOARD) as b; print(b.Platform.gateware_size)"); \
79
77
echo "Zeroing $$($(PYTHON) -c "print(hex($$FIRMWARE_ADDRESS))") ($$FIRMWARE_ADDRESS)"; \
80
78
$(FLASHEXTRA_CMD) $(HDMI2USBDIR)/firmware/zero.bin $$FIRMWARE_ADDRESS
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments