URL
https://opencores.org/ocsvn/minsoc/minsoc/trunk
Subversion Repositories minsoc
Compare Revisions
- This comparison shows the changes necessary to convert path
/minsoc/branches/rc-1.0/prj
- from Rev 109 to Rev 110
- ↔ Reverse comparison
Rev 109 → Rev 110
/scripts/altprj.sh
File deleted
scripts/altprj.sh
Property changes :
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: scripts/simvhdl.sh
===================================================================
--- scripts/simvhdl.sh (revision 109)
+++ scripts/simvhdl.sh (revision 110)
@@ -52,7 +52,7 @@
if [ $FOUND != 1 ]
then
- echo "FILE NOT FOUND"
+ echo "FILE NOT FOUND: $file"
exit 1
fi
done
/scripts/xilinxprj.sh
54,7 → 54,7
|
if [ $FOUND != 1 ] |
then |
echo "FILE NOT FOUND" |
echo "FILE NOT FOUND: $file" |
exit 1 |
fi |
done |
/scripts/altvhdprj.sh
0,0 → 1,64
#!/bin/bash |
|
#system workings |
MINSOC_DIR=`pwd`/.. |
|
PROJECT=$1 |
OUTPUT=$2 |
|
ENV=`uname -o` |
|
function adaptpath |
{ |
if [ "$ENV" == "Cygwin" ] |
then |
local cygpath=`cygpath -w $1` |
local result=`echo $cygpath | sed 's/\\\\/\\//g'` |
echo "$result" |
else |
echo "$1" |
fi |
} |
|
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 |
adapted_dir=`adaptpath $MINSOC_DIR/$dir` |
echo "set_global_assignment -name SEARCH_PATH $adapted_dir" >> $OUTPUT |
done |
|
for file in "${PROJECT_SRC[@]}" |
do |
FOUND=0 |
|
for dir in "${PROJECT_DIR[@]}" |
do |
if [ -f $MINSOC_DIR/$dir/$file ] |
then |
adapted_file=`adaptpath $MINSOC_DIR/$dir/$file` |
echo "set_global_assignment -name VHDL_FILE $adapted_file" >> $OUTPUT |
FOUND=1 |
break |
fi |
done |
|
if [ $FOUND != 1 ] |
then |
echo "FILE NOT FOUND: $file" |
exit 1 |
fi |
done |
scripts/altvhdprj.sh
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: scripts/simverilog.sh
===================================================================
--- scripts/simverilog.sh (revision 109)
+++ scripts/simverilog.sh (revision 110)
@@ -58,7 +58,7 @@
if [ $FOUND != 1 ]
then
- echo "FILE NOT FOUND"
+ echo "FILE NOT FOUND: $file"
exit 1
fi
done
/scripts/altvprj.sh
0,0 → 1,64
#!/bin/bash |
|
#system workings |
MINSOC_DIR=`pwd`/.. |
|
PROJECT=$1 |
OUTPUT=$2 |
|
ENV=`uname -o` |
|
function adaptpath |
{ |
if [ "$ENV" == "Cygwin" ] |
then |
local cygpath=`cygpath -w $1` |
local result=`echo $cygpath | sed 's/\\\\/\\//g'` |
echo "$result" |
else |
echo "$1" |
fi |
} |
|
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 |
adapted_dir=`adaptpath $MINSOC_DIR/$dir` |
echo "set_global_assignment -name SEARCH_PATH $adapted_dir" >> $OUTPUT |
done |
|
for file in "${PROJECT_SRC[@]}" |
do |
FOUND=0 |
|
for dir in "${PROJECT_DIR[@]}" |
do |
if [ -f $MINSOC_DIR/$dir/$file ] |
then |
adapted_file=`adaptpath $MINSOC_DIR/$dir/$file` |
echo "set_global_assignment -name VERILOG_FILE $adapted_file" >> $OUTPUT |
FOUND=1 |
break |
fi |
done |
|
if [ $FOUND != 1 ] |
then |
echo "FILE NOT FOUND: $file" |
exit 1 |
fi |
done |
scripts/altvprj.sh
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: src/or1200_top.prj
===================================================================
--- src/or1200_top.prj (revision 109)
+++ src/or1200_top.prj (revision 110)
@@ -57,8 +57,4 @@
or1200_spram_128x32.v
or1200_dc_fsm.v
or1200_wb_biu.v
-or1200_spram_64x22.v
-or1200_fpu.v
-or1200_spram.v
-or1200_spram_32_bw.v
-or1200_dpram.v)
+or1200_spram_64x22.v)
Index: Makefile
===================================================================
--- Makefile (revision 109)
+++ Makefile (revision 110)
@@ -11,15 +11,19 @@
SIM_VERILOG_FILES = $(addprefix $(SIMULATION_DIR)/, $(addsuffix .verilog, $(basename $(VERILOG_PROJECTS))))
SIM_VHDL_FILES = $(addprefix $(SIMULATION_DIR)/, $(addsuffix .vhdl, $(basename $(VHDL_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)
+ALTERA_VERILOG_PRJ_FILES = $(addprefix $(ALTERA_DIR)/, $(addsuffix .vprj, $(basename $(VERILOG_PROJECTS))))
+ALTERA_VHD_PRJ_FILES = $(addprefix $(ALTERA_DIR)/, $(addsuffix .vhdprj, $(basename $(VHDL_PROJECTS))))
+all: $(SIMULATION_DIR)/minsoc_verilog.src $(SIMULATION_DIR)/minsoc_vhdl.src $(XILINX_PRJ_FILES) $(XILINX_XST_FILES) $(ALTERA_VERILOG_PRJ_FILES) $(ALTERA_VHDL_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)/*.verilog $(SIMULATION_DIR)/*.vhdl $(SIMULATION_DIR)/*.src $(XILINX_DIR)/*.prj $(XILINX_DIR)/*.xst $(ALTERA_DIR)/*.vprj $(ALTERA_DIR)/*.vhdprj
+
$(XILINX_DIR)/minsoc_top.xst: $(SRC_DIR)/minsoc_top.prj
bash $(SCRIPTS_DIR)/xilinxxst.sh $^ $@ minsoc_top.prj minsoc_top topmodule
@@ -32,9 +36,14 @@
$(XILINX_DIR)/%.prj: $(SRC_DIR)/%.prj
bash $(SCRIPTS_DIR)/xilinxprj.sh $^ $@
-$(ALTERA_DIR)/%.prj: $(SRC_DIR)/%.prj
- bash $(SCRIPTS_DIR)/altprj.sh $^ $@
+$(ALTERA_DIR)/%.vprj: $(SRC_DIR)/%.prj
+ bash $(SCRIPTS_DIR)/altvprj.sh $^ $@
+
+$(ALTERA_DIR)/%.vhdprj: $(SRC_DIR)/%.prj
+ bash $(SCRIPTS_DIR)/altvhdprj.sh $^ $@
+
+
$(SIMULATION_DIR)/minsoc_verilog.src: $(SIM_VERILOG_FILES)
cat $(SIM_VERILOG_FILES) > $(SIMULATION_DIR)/minsoc_verilog.src