URL
https://opencores.org/ocsvn/minsoc/minsoc/trunk
Subversion Repositories minsoc
Compare Revisions
- This comparison shows the changes necessary to convert path
/minsoc/trunk/prj
- from Rev 104 to Rev 97
- ↔ Reverse comparison
Rev 104 → Rev 97
/scripts/simverilog.sh
File deleted
scripts/simverilog.sh
Property changes :
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: scripts/simvhdl.sh
===================================================================
--- scripts/simvhdl.sh (revision 104)
+++ scripts/simvhdl.sh (nonexistent)
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-#system workings
-MINSOC_DIR=`pwd`/..
-
-PROJECT=$1
-OUTPUT=$2
-
-if [ ! -f $PROJECT ]
-then
- echo "Unexistent project file."
- exit 1
-fi
-
-if [ -z "$OUTPUT" ]
-then
- echo "Second argument should be the destintion file for the file and directory inclusions."
- exit 1
-fi
-echo -n "" > $OUTPUT
-
-source $PROJECT
-
-for file in "${PROJECT_SRC[@]}"
-do
- FOUND=0
-
- for dir in "${PROJECT_DIR[@]}"
- do
- if [ -f $MINSOC_DIR/$dir/$file ]
- then
- echo "$MINSOC_DIR/$dir/$file" >> $OUTPUT
- FOUND=1
- break
- fi
- done
-
- if [ $FOUND != 1 ]
- then
- echo "FILE NOT FOUND"
- exit 1
- fi
-done
scripts/simvhdl.sh
Property changes :
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: scripts/simprj.sh
===================================================================
--- scripts/simprj.sh (nonexistent)
+++ scripts/simprj.sh (revision 97)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+#system workings
+MINSOC_DIR=`pwd`/..
+
+PROJECT=$1
+OUTPUT=$2
+
+if [ ! -f $PROJECT ]
+then
+ echo "Unexistent project file."
+ exit 1
+fi
+
+if [ -z "$OUTPUT" ]
+then
+ echo "Second argument should be the destintion file for the file and directory inclusions."
+ exit 1
+fi
+echo -n "" > $OUTPUT
+
+source $PROJECT
+
+for dir in "${PROJECT_DIR[@]}"
+do
+ echo "+incdir+$MINSOC_DIR/$dir" >> $OUTPUT
+done
+
+for file in "${PROJECT_SRC[@]}"
+do
+ FOUND=0
+
+ for dir in "${PROJECT_DIR[@]}"
+ do
+ if [ -f $MINSOC_DIR/$dir/$file ]
+ then
+ echo "$MINSOC_DIR/$dir/$file" >> $OUTPUT
+ FOUND=1
+ break
+ fi
+ done
+
+ if [ $FOUND != 1 ]
+ then
+ echo "FILE NOT FOUND"
+ exit 1
+ fi
+done
scripts/simprj.sh
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: Makefile
===================================================================
--- Makefile (revision 104)
+++ Makefile (revision 97)
@@ -1,7 +1,5 @@
-VERILOG_PROJECTS = minsoc_bench.prj minsoc_top.prj or1200_top.prj adbg_top.prj jtag_top.prj uart_top.prj ethmac.prj
-VHDL_PROJECTS = altera_virtual_jtag.prj
+PROJECTS = minsoc_bench.prj minsoc_top.prj or1200_top.prj adbg_top.prj jtag_top.prj uart_top.prj ethmac.prj altera_virtual_jtag.prj
-PROJECTS = $(VERILOG_PROJECTS) $(VHDL_PROJECTS)
SRC_DIR = src
SCRIPTS_DIR = scripts
@@ -9,16 +7,15 @@
XILINX_DIR = xilinx
ALTERA_DIR = altera
-SIM_VERILOG_FILES = $(addprefix $(SIMULATION_DIR)/, $(addsuffix .verilog, $(basename $(VERILOG_PROJECTS))))
-SIM_VHDL_FILES = $(addprefix $(SIMULATION_DIR)/, $(addsuffix .vhdl, $(basename $(VHDL_PROJECTS))))
+SIMULATION_FILES = $(addprefix $(SIMULATION_DIR)/, $(addsuffix .src, $(basename $(PROJECTS))))
XILINX_PRJ_FILES = $(addprefix $(XILINX_DIR)/, $(addsuffix .prj, $(basename $(PROJECTS))))
XILINX_XST_FILES = $(addprefix $(XILINX_DIR)/, $(addsuffix .xst, $(basename $(PROJECTS))))
ALTERA_PRJ_FILES = $(addprefix $(ALTERA_DIR)/, $(addsuffix .prj, $(basename $(PROJECTS))))
-all: $(SIMULATION_DIR)/minsoc_verilog.src $(SIMULATION_DIR)/minsoc_vhdl.src $(XILINX_PRJ_FILES) $(XILINX_XST_FILES) $(ALTERA_PRJ_FILES)
+all: $(SIMULATION_DIR)/minsoc.src $(XILINX_PRJ_FILES) $(XILINX_XST_FILES) $(ALTERA_PRJ_FILES)
clean:
- rm -rf $(SIMULATION_DIR)/*.verilog $(SIMULATION_DIR)/*.vhdl $(SIMULATION_DIR)/*.src $(XILINX_DIR)/*.prj $(XILINX_DIR)/*.xst $(ALTERA_DIR)/*.prj
+ rm -rf $(SIMULATION_DIR)/*.src $(XILINX_DIR)/*.prj $(XILINX_DIR)/*.xst $(ALTERA_DIR)/*.prj
$(XILINX_DIR)/minsoc_top.xst: $(SRC_DIR)/minsoc_top.prj
bash $(SCRIPTS_DIR)/xilinxxst.sh $^ $@ minsoc_top.prj minsoc_top topmodule
@@ -35,15 +32,9 @@
$(ALTERA_DIR)/%.prj: $(SRC_DIR)/%.prj
bash $(SCRIPTS_DIR)/altprj.sh $^ $@
-$(SIMULATION_DIR)/minsoc_verilog.src: $(SIM_VERILOG_FILES)
- cat $(SIM_VERILOG_FILES) > $(SIMULATION_DIR)/minsoc_verilog.src
+$(SIMULATION_DIR)/minsoc.src: $(SIMULATION_FILES)
+ cat $(SIMULATION_FILES) > $(SIMULATION_DIR)/minsoc.src
-$(SIMULATION_DIR)/minsoc_vhdl.src: $(SIM_VHDL_FILES)
- cat $(SIM_VHDL_FILES) > $(SIMULATION_DIR)/minsoc_vhdl.src
+$(SIMULATION_DIR)/%.src: $(SRC_DIR)/%.prj
+ bash $(SCRIPTS_DIR)/simprj.sh $^ $@
-$(SIMULATION_DIR)/%.verilog: $(SRC_DIR)/%.prj
- bash $(SCRIPTS_DIR)/simverilog.sh $^ $@
-
-$(SIMULATION_DIR)/%.vhdl: $(SRC_DIR)/%.prj
- bash $(SCRIPTS_DIR)/simvhdl.sh $^ $@
-