Merge pull request #275 from mithro/more-flash-fixes

Disable the lm32 firmware from SPI flash for now

Makefile

@@ -152,8 +152,11 @@ load: load-gateware $(addprefix load-,$(TARGETS))
 # Flash
 flash-gateware: gateware-submodules
 	$(MAKEPY_CMD) flash-bitstream
+	@echo ""
+	@echo ""
+	@echo "Gateware has been flashed."
 
-flash: flash-gateware  $(addprefix flash-,$(TARGETS))
+flash: flash-gateware $(addprefix flash-,$(TARGETS))
 	@echo ""
 	@echo ""
 	@echo "Power cycle your board to boot newly flashed stuff."

Makefile.lm32

@@ -64,9 +64,20 @@ image-lm32: firmware-lm32
 	$(MAKEIMAGE_CMD) --fbi --output $(HDMI2USBDIR)/firmware/lm32/firmware.fbi $(HDMI2USBDIR)/firmware/lm32/firmware.bin
 
 flash-lm32: image-lm32
+	@echo
+	@echo "Skipping writing lm32 firmware to flash."
+	@echo "(Loading lm32 firmware from flash is current disabled --"
+	@echo " see https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/274)"
+	@echo "Booting will use lm32 firmware embedded in the gateware."
+	@echo
+#	export FIRMWARE_ADDRESS=$$($(PYTHON) -c "import platforms.$(BOARD) as b; print(b.Platform.gateware_size)"); \
+#	echo "Flashing to $$($(PYTHON) -c "print(hex($$FIRMWARE_ADDRESS))") ($$FIRMWARE_ADDRESS)"; \
+#	$(FLASHEXTRA_CMD) $(HDMI2USBDIR)/firmware/lm32/firmware.fbi $$FIRMWARE_ADDRESS
+
+clear-flash-lm32:
 	export FIRMWARE_ADDRESS=$$($(PYTHON) -c "import platforms.$(BOARD) as b; print(b.Platform.gateware_size)"); \
-	echo "Flashing to $$($(PYTHON) -c "print(hex($$FIRMWARE_ADDRESS))") ($$FIRMWARE_ADDRESS)"; \
-	$(FLASHEXTRA_CMD) $(HDMI2USBDIR)/firmware/lm32/firmware.fbi $$FIRMWARE_ADDRESS
+	echo "Zeroing $$($(PYTHON) -c "print(hex($$FIRMWARE_ADDRESS))") ($$FIRMWARE_ADDRESS)"; \
+	$(FLASHEXTRA_CMD) $(HDMI2USBDIR)/firmware/zero.bin $$FIRMWARE_ADDRESS
 
 clean-lm32:
 	if [ -f $(MSCDIR)/software/include/generated/cpu.mak ]; then \