From 7ec95d649b34bf1c7b621ed3791e5c125c81d43e Mon Sep 17 00:00:00 2001 From: "Andreas K. Berg" Date: Tue, 21 Sep 2021 12:18:15 +0200 Subject: [PATCH] - #3: Move constraints, update makefile and gitignore * Move constraints file away from Vivado controlled directory * Update log file creation in makefile --- .gitignore | 3 +++ Makefile | 14 ++++++++++---- .../Arty-A7-35-Master.xdc | 0 3 files changed, 13 insertions(+), 4 deletions(-) rename {AudioSampler.srcs/constrs_1/imports/digilent-xdc-master => constraints}/Arty-A7-35-Master.xdc (100%) diff --git a/.gitignore b/.gitignore index 00cdc9a..37b2557 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ *.xpr *.hw +# spyware +*webtalk* + ### macOS ### # General .DS_Store diff --git a/Makefile b/Makefile index ada82dd..9ae71f6 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,22 @@ +PROJECT = DMPRO_audio +SYNTH_DIR = logs/synth_$(shell date +"%y%m%d%H%M") +FLASH_DIR = logs/flash_$(shell date +"%y%m%d%H%M") + all: -mkdir -p logs + -mkdir -p $(SYNTHDIR) vivado \ -mode batch \ -source build.tcl \ - -journal logs/vivado_build_$(shell date +"%y%m%d%H%M").jou \ - -log logs/vivado_build_$(shell date +"%y%m%d%H%M").log + -journal $(SYNTH_DIR)/vivado_build.jou \ + -log $(SYNTH_DIR)/vivado_build.log program: -mkdir -p logs + -mkdir -p $(FLASH_DIR) vivado \ -mode batch \ -source program.tcl \ - -journal logs/vivado_program_$(shell date +"%y%m%d%H%M").jou \ - -log logs/vivado_program_$(shell date +"%y%m%d%H%M").log \ No newline at end of file + -journal $(FLASH_DIR)/vivado_program_$(shell date +"%y%m%d%H%M").jou \ + -log $(FLASH_DIR)/vivado_program_$(shell date +"%y%m%d%H%M").log \ No newline at end of file diff --git a/AudioSampler.srcs/constrs_1/imports/digilent-xdc-master/Arty-A7-35-Master.xdc b/constraints/Arty-A7-35-Master.xdc similarity index 100% rename from AudioSampler.srcs/constrs_1/imports/digilent-xdc-master/Arty-A7-35-Master.xdc rename to constraints/Arty-A7-35-Master.xdc