pnr: show full log and do not hide this

1 files changed, 17 insertions, 42 deletions

diff --git a/pnr/makefile b/pnr/makefile
index 163d927..9144be1 100644
--- a/pnr/makefile
+++ b/pnr/makefile
@@ -15,67 +15,42 @@ help:
 	@echo '  "make qproject" to create quartus project only'
 	@echo '  "make compile" to synthesize the design'
 	@echo '  "make prog" to configure programmable device'
-	@echo '  "make warnings to list all warnings'
 	@echo '  "make quartus" to start quartus graphical user interface'
 	@echo '  "make clean" to remove all generated files'
 
 qproject: $(PROJECT).qpf
 
 $(PROJECT).qpf: $(SOURCE_FILES)
-	@echo "Processing ..."
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
-	@# assign VHDL design files
-	@rm -rf quartus_vhdl_source_files.tcl
-	@(for source_file in $(SOURCE_FILES); \
+	# assign VHDL design files
+	rm -rf quartus_vhdl_source_files.tcl
+	(for source_file in $(SOURCE_FILES); \
 	do \
 	    echo set_global_assignment -name VHDL_FILE $$source_file >> quartus_vhdl_source_files.tcl; \
 	done)
-	@# create a default timing constraint file assuming CLOCK_50
-	@echo "create_clock -period 20.000 -name CLOCK_50 CLOCK_50" > $(PROJECT).sdc
-	@# just create a quartus project
-	@quartus_sh -t ../../scripts/create_quartus_project_settings.tcl \
-	-projectname $(PROJECT) -family $(FAMILY) -device $(DEVICE) >> $(LOG_FILE) 2>&1
+	# create a default timing constraint file assuming CLOCK_50
+	echo "create_clock -period 20.000 -name CLOCK_50 CLOCK_50" > $(PROJECT).sdc
+	# just create a quartus project
+	quartus_sh -t ../../scripts/create_quartus_project_settings.tcl \
+	-projectname $(PROJECT) -family $(FAMILY) -device $(DEVICE)
 
 compile: $(PROJECT).qpf flowsummary.log
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
 
 flowsummary.log: $(SOURCE_FILES)  
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
-	@(quartus_sh -t ../../scripts/quartus_project_flow.tcl \
-	  -projectname $(PROJECT) -process compile  >> $(LOG_FILE) 2>&1 \
-	  || (grep "Error (" $(LOG_FILE) && false))
-	@grep "warnings" $(LOG_FILE)
-	@echo
-	@echo "To display all warnings use: make warnings"
-	@echo
+	(quartus_sh -t ../../scripts/quartus_project_flow.tcl \
+	  -projectname $(PROJECT) -process compile
 
 prog: $(PROJECT).qpf flowsummary.log
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
-	@quartus_pgm -c USB-Blaster --mode jtag --operation="p;$(PROJECT).$(PROGFILEEXT)" \
-	  >> $(LOG_FILE) 2>&1
+	quartus_pgm -c USB-Blaster --mode jtag --operation="p;$(PROJECT).$(PROGFILEEXT)"
 
 quartus: $(PROJECT).qpf
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
 	@quartus $(PROJECT).qpf &
 
-warnings: $(LOG_FILE)
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
-	@grep "Warning (" $(LOG_FILE)
-
 rtlview: $(PROJECT).qpf
-	@echo "---- $@"  >> $(LOG_FILE) 2>&1
-	@$(TIME_STAMP)
-	@quartus_sh -t ../../scripts/quartus_project_flow.tcl -projectname $(PROJECT) \
-	 -process compile  >> $(LOG_FILE) 2>&1 || (grep "Error (" $(LOG_FILE) && false)
-	@quartus_map --read_settings_files=on --write_settings_files=off \
-	  $(PROJECT) -c $(PROJECT) --analysis_and_elaboration >> $(LOG_FILE) 2>&1
-	@quartus $(PROJECT).qpf &
+	quartus_sh -t ../../scripts/quartus_project_flow.tcl -projectname $(PROJECT) \
+	 -process compile
+	quartus_map --read_settings_files=on --write_settings_files=off \
+	  $(PROJECT) -c $(PROJECT) --analysis_and_elaboration
+	quartus $(PROJECT).qpf &
 
 clean:
-	@rm -rf *.rpt *.chg *.log quartus_vhdl_source_files.tcl *.htm *.eqn *.pin *.sof *.pof db incremental_db *.qpf *.qsf *.summary $(PROJECT).* *.sdc
+	rm -rf *.rpt *.chg *.log quartus_vhdl_source_files.tcl *.htm *.eqn *.pin *.sof *.pof db incremental_db *.qpf *.qsf *.summary $(PROJECT).* *.sdc