diff options
author | Josh Blum <josh@joshknows.com> | 2012-03-11 14:06:48 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-03-11 14:06:48 -0700 |
commit | 38b138b3f31dfaaa4203d82e73be352a03f59280 (patch) | |
tree | 338a44199de06d7d94a18ca203338b8e418a00fb /fpga/usrp2/top/E1x0 | |
parent | b61f4ad603b43e8c257bf4bcca924368d5573c92 (diff) | |
parent | b4173387dd0adb27cc267b22dc57258d44fafa84 (diff) | |
download | uhd-38b138b3f31dfaaa4203d82e73be352a03f59280.tar.gz uhd-38b138b3f31dfaaa4203d82e73be352a03f59280.tar.bz2 uhd-38b138b3f31dfaaa4203d82e73be352a03f59280.zip |
Merge branch 'fpga_master'
Diffstat (limited to 'fpga/usrp2/top/E1x0')
-rw-r--r-- | fpga/usrp2/top/E1x0/Makefile.E100 | 2 | ||||
-rw-r--r-- | fpga/usrp2/top/E1x0/Makefile.E110 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp2/top/E1x0/Makefile.E100 b/fpga/usrp2/top/E1x0/Makefile.E100 index ad5a0c1bd..d3cdc92e0 100644 --- a/fpga/usrp2/top/E1x0/Makefile.E100 +++ b/fpga/usrp2/top/E1x0/Makefile.E100 @@ -71,7 +71,7 @@ SYNTHESIZE_PROPERTIES = \ "Use Clock Enable" Auto \ "Use Synchronous Reset" Auto \ "Use Synchronous Set" Auto \ -"Verilog Macros" "$(CUSTOM_MOD_DEFS)" +"Verilog Macros" "$(CUSTOM_DEFS)" TRANSLATE_PROPERTIES = \ "Macro Search Path" "$(shell pwd)/../../coregen/" diff --git a/fpga/usrp2/top/E1x0/Makefile.E110 b/fpga/usrp2/top/E1x0/Makefile.E110 index 291ac0a44..37dc0af1e 100644 --- a/fpga/usrp2/top/E1x0/Makefile.E110 +++ b/fpga/usrp2/top/E1x0/Makefile.E110 @@ -71,7 +71,7 @@ SYNTHESIZE_PROPERTIES = \ "Use Clock Enable" Auto \ "Use Synchronous Reset" Auto \ "Use Synchronous Set" Auto \ -"Verilog Macros" "$(CUSTOM_MOD_DEFS)" +"Verilog Macros" "$(CUSTOM_DEFS)" TRANSLATE_PROPERTIES = \ "Macro Search Path" "$(shell pwd)/../../coregen/" |