adjusted path names

diff --git a/amps/compile_padiwa_amps_frankfurt.pl b/amps/compile_padiwa_amps_frankfurt.pl
index dca7adfa52e50be5a4e56ed9e2b554dd44a47d92..681a99aa98d7b737f446f1ed54b8b68a9ac7ffa5 100755 (executable)
--- a/amps/compile_padiwa_amps_frankfurt.pl
+++ b/amps/compile_padiwa_amps_frankfurt.pl
@@ -51,7 +51,7 @@ system("ln -sfT $lattice_path $WORKDIR/lattice-diamond");
 
 
 #create full lpf file
-system("cp ../base/".$TOPNAME.".lpf $WORKDIR/$TOPNAME.lpf");
+system("cp ../pinout/".$TOPNAME.".lpf $WORKDIR/$TOPNAME.lpf");
 system("cat ".$TOPNAME."_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 
 

diff --git a/amps/compile_padiwa_amps_gsi.pl b/amps/compile_padiwa_amps_gsi.pl
index d4db404090775332dc0f7c08e9eaee87bc42194b..69d233ba79fba7f36e0af229db8ace5044f2887d 100755 (executable)
--- a/amps/compile_padiwa_amps_gsi.pl
+++ b/amps/compile_padiwa_amps_gsi.pl
@@ -60,7 +60,7 @@ unless(-d $WORKDIR) {
 system("ln -sfT $lattice_path $WORKDIR/lattice-diamond");
 
 #create full lpf file
-system("cp ../base/".$TOPNAME.".lpf $WORKDIR/$TOPNAME.lpf");
+system("cp ../pinout/".$TOPNAME.".lpf $WORKDIR/$TOPNAME.lpf");
 system("cat ".$TOPNAME."_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 
 

diff --git a/amps/padiwa_amps.prj b/amps/padiwa_amps.prj
index f49a05395060467c12a4364e6bdf955cb62de125..3ab47b123ddb67e02ea3dac6c775e6298d49032c 100644 (file)
--- a/amps/padiwa_amps.prj
+++ b/amps/padiwa_amps.prj
@@ -8,23 +8,22 @@
 #project files
 add_file -vhdl -lib work "workdir/lattice-diamond/cae_library/synthesis/vhdl/machxo2.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_std.vhd"
-add_file -vhdl -lib work "../base/trb3_components.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_components.vhd"
-add_file -vhdl -lib work "../wasa/source/spi_slave.vhd"
+add_file -vhdl -lib work "../source/spi_slave.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net_onewire.vhd"
 add_file -vhdl -lib work "version.vhd"
-add_file -vhdl -lib work "../wasa/source/pwm.vhd"
-add_file -vhdl -lib work "../wasa/cores/pll_shifted_clocks.vhd"
-add_file -vhdl -lib work "../wasa/cores/fifo_1kx8.vhd"
-add_file -vhdl -lib work "../wasa/source/ffarray.vhd"
-
-
-add_file -vhdl -lib work "../wasa/cores/oddr16.vhd"
-add_file -vhdl -lib work "../wasa/cores/flash.vhd"
-add_file -vhdl -lib work "../wasa/cores/flashram.vhd"
-add_file -vhdl -lib work "../wasa/cores/pll.vhd"
-add_file -verilog -lib work "../wasa/cores/efb_define_def.v"
-add_file -verilog -lib work "../wasa/cores/UFM_WB.v"
+add_file -vhdl -lib work "../source/pwm.vhd"
+add_file -vhdl -lib work "../cores/pll_shifted_clocks.vhd"
+add_file -vhdl -lib work "../cores/fifo_1kx8.vhd"
+add_file -vhdl -lib work "../source/ffarray.vhd"
+
+
+add_file -vhdl -lib work "../cores/oddr16.vhd"
+add_file -vhdl -lib work "../cores/flash.vhd"
+add_file -vhdl -lib work "../cores/flashram.vhd"
+add_file -vhdl -lib work "../cores/pll.vhd"
+add_file -verilog -lib work "../cores/efb_define_def.v"
+add_file -verilog -lib work "../cores/UFM_WB.v"
 
 
 add_file -vhdl -lib work "padiwa_amps.vhd"

diff --git a/amps/padiwa_amps.vhd b/amps/padiwa_amps.vhd
index bbe1d776b2dc42a602d0221306bb31a7017d81c9..0f83dca9c1e61a6ddf420f9a592c913f45989040 100644 (file)
--- a/amps/padiwa_amps.vhd
+++ b/amps/padiwa_amps.vhd
@@ -5,7 +5,7 @@ use ieee.numeric_std.all;
 library work;
 use work.trb_net_std.all;
 use work.trb_net_components.all;
-use work.trb3_components.all;
+-- use work.trb3_components.all;
 use work.version.all;
 
 library machxo2;