Merge pull request #275 from niklasnisbeth/master

Misc fixes
timvideos · Dec 29, 2019 · be80903 · be80903
2 parents f85e1ca + 7b077f5
commit be80903
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/mkimage.py b/mkimage.py
@@ -85,7 +85,7 @@ def main():
             gateware = "Skipped"
 
         print(("Gateware @ 0x{:08x} ({:10} bytes) {:60}"
-               " - Xilinx FPGA Bitstream"
+               " - FPGA Bitstream"
                ).format(gateware_pos, len(gateware_data), gateware))
         print(" ".join("{:02x}".format(i) for i in gateware_data[:64]))
         assert len(gateware_data) < platform.gateware_size

diff --git a/scripts/enter-env.sh b/scripts/enter-env.sh
@@ -63,7 +63,7 @@ fi
 if [ -f /etc/udev/rules.d/99-hdmi2usb-permissions.rules -o -f /lib/udev/rules.d/99-hdmi2usb-permissions.rules -o -f /lib/udev/rules.d/60-hdmi2usb-udev.rules -o ! -z "$HDMI2USB_UDEV_IGNORE" ]; then
 	true
 else
-	echo "Please install the HDMI2USB udev rules, or `export HDMI2USB_UDEV_IGNORE=somevalue` to ignore this."
+	echo "Please install the HDMI2USB udev rules, or 'export HDMI2USB_UDEV_IGNORE=somevalue' to ignore this."
 	echo "On Debian/Ubuntu, these can be installed by running scripts/debian-setup.sh"
 	echo
 	return 1

diff --git a/targets/ice40_hx8k_b_evn/base.py b/targets/ice40_hx8k_b_evn/base.py
@@ -103,6 +103,7 @@ def __init__(self, platform, **kwargs):
         # Disable final deep-sleep power down so firmware words are loaded
         # onto softcore's address bus.
         platform.toolchain.build_template[3] = "icepack -s {build_name}.txt {build_name}.bin"
+        platform.toolchain.nextpnr_build_template[1] += " --placer heap"
         platform.toolchain.nextpnr_build_template[2] = "icepack -s {build_name}.txt {build_name}.bin"