From dba1522e5cc560df86c95e4a28e3d9f4f6f57008 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Thu, 27 Mar 2014 19:05:06 +0100 Subject: [PATCH] adjusted path names --- amps/compile_padiwa_amps_frankfurt.pl | 2 +- amps/compile_padiwa_amps_gsi.pl | 2 +- amps/padiwa_amps.prj | 27 +++++++++++++-------------- amps/padiwa_amps.vhd | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/amps/compile_padiwa_amps_frankfurt.pl b/amps/compile_padiwa_amps_frankfurt.pl index dca7adf..681a99a 100755 --- 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 d4db404..69d233b 100755 --- 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 f49a053..3ab47b1 100644 --- 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 bbe1d77..0f83dca 100644 --- 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; -- 2.43.0