Change to vivado 2020.1

Author: Nikolaj P. Danilyuk

Makefile.x86

@@ -149,7 +149,7 @@ ifeq ($(FPGA_MODEL), Z10)
 endif
 else
 	cp $(INSTALL_DIR)/fpga/v0.94_250/fpga.bit    $(INSTALL_DIR)/fpga/fpga_0.94.bit
-	mv $(INSTALL_DIR)/fpga/v0.94_250 $(INSTALL_DIR)/fpga/v0.94
+	mv $(INSTALL_DIR)/fpga/v0.94_250/ $(INSTALL_DIR)/fpga/v0.94/
 endif
 
 ################################################################################
@@ -188,7 +188,7 @@ $(UBOOT_SCRIPT): $(INSTALL_DIR) $(UBOOT_DIR) $(UBOOT)
 
 LINUX = $(LINUX_DIR)/arch/arm/boot/uImage
 
-.PHONY: linux linux-install $(LINUX_DIR)
+.PHONY: linux linux-install $(LINUX_DIR) $(LINUX)
 
 linux: $(LINUX)
 
@@ -239,7 +239,8 @@ $(DEVICETREE): $(DTREE_DIR) $(INSTALL_DIR)/fpga $(TMP)
 ifneq ($(MODEL),Z20_250_12)
 	patch $(TMP)/dts/pl.dtsi < fpga/dts/pl.dtsi.patch
 endif
-	tools/dtc/dtc -@ -I dts -O dtb -o $(DEVICETREE) -i $(TMP)/dts -i fpga/$(DTS_PATH) $(TMP)/dts/system-top.dts
+	gcc -I $(TMP)/dts -E -nostdinc -undef -D__DTS__ -x assembler-with-cpp -o $(TMP)/dts/system-top.dts.tmp $(TMP)/dts/system-top.dts
+	tools/dtc/dtc -@ -I dts -O dtb -o $(DEVICETREE) -i $(TMP)/dts -i fpga/$(DTS_PATH) $(TMP)/dts/system-top.dts.tmp
 	# create device tree source from binary for reference
 	tools/dtc/dtc -I dtb -O dts --sort -o $(TMP)/dts/dtraw.dts $(DEVICETREE)
 

build_scripts/build_OS.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-PATH_XILINX_SDK=/opt/Xilinx/SDK/2017.2
-PATH_XILINX_VIVADO=/opt/Xilinx/Vivado/2017.2
+PATH_XILINX_SDK=/opt/Xilinx/SDK/2019.1
+PATH_XILINX_VIVADO=/opt/Xilinx/Vivado/2020.1
 RP_UBUNTU=redpitaya_ubuntu_13-14-23_25-sep-2017.tar.gz
 SCHROOT_CONF_PATH=/etc/schroot/chroot.d/red-pitaya-ubuntu.conf
 
@@ -64,7 +64,7 @@ if [[ -d "$PATH_XILINX_SDK" ]]
 then
     echo -n "$PATH_XILINX_SDK exists on your filesystem. "
     print_ok
-else 
+else
     echo -n "Can't find $PATH_XILINX_SDK on your PC. "
     print_fail
     echo "Check the correct path to Xilinx SDK"
@@ -75,7 +75,7 @@ if [[ -d "$PATH_XILINX_VIVADO" ]]
 then
     echo -n "$PATH_XILINX_VIVADO exists on your filesystem. "
     print_ok
-else 
+else
     echo -n "Can't find $PATH_XILINX_VIVADO on your PC. "
     print_fail
     echo "Check the correct path to Xilinx Vivado"

settings.sh

@@ -2,7 +2,7 @@
 # setup Xilinx Vivado FPGA tools
 ################################################################################
 
-. /opt/Xilinx/Vivado/2017.2/settings64.sh
+. /opt/Xilinx/Vivado/2020.1/settings64.sh
 
 ################################################################################
 # setup cross compiler toolchain