noHDK_Makefile supports own psl_fpga
@@ -107,9 +107,15 @@ copy $(BUILD_DIR)/Checkpoint/b_route_design.dcp:
@ln -s $(BUILD_NAME) build;
@ln -s $(DONUT_HARDWARE_ROOT)/setup/noHDK_build.tcl $(BUILD_DIR)/noHDK_build.tcl;
@ln -s $(DONUT_HARDWARE_ROOT)/setup/fw_xpr_build.tcl $(BUILD_DIR)/fw_xpr_build.tcl;
+<<<<<<< HEAD
@cp -p $(PSL_DCP) $(BUILD_DIR)/Checkpoint/;
@if [ $(FPGACARD) = "KU3" ]; then ln -f -s $(DONUT_HDL_CORE)/psl_fpga_ku3.vhd_source $(DONUT_HDL_CORE)/psl_fpga.vhd_source; fi
@if [ $(FPGACARD) = "FGT" ]; then ln -f -s $(DONUT_HDL_CORE)/psl_fpga_fgt.vhd_source $(DONUT_HDL_CORE)/psl_fpga.vhd_source; fi
+=======
+ @cp -ra $(PSL_DCP) $(BUILD_DIR)/Checkpoint/;
+ @if [ $(FPGACARD) = "KU3" ]; then ln -f -s $(DONUT_HARDWARE_ROOT)/hdl/core/psl_fpga_ku3.vhd_source $(DONUT_HARDWARE_ROOT)/hdl/core/psl_fpga.vhd_source; fi
+ @if [ $(FPGACARD) = "FGT" ]; then ln -f -s $(DONUT_HARDWARE_ROOT)/hdl/core/psl_fpga_fgt.vhd_source $(DONUT_HARDWARE_ROOT)/hdl/core/psl_fpga.vhd_source; fi
+>>>>>>> noHDK_Makefile supports own psl_fpga
%.vhd: %.vhd_source
@echo "Creating $@"; $(DONUT_HARDWARE_ROOT)/setup/snap_config.sh $@_source $@
