diff options
| author | michael-west <michael.west@ettus.com> | 2014-07-30 11:54:26 -0700 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2014-07-30 11:54:26 -0700 |
| commit | 35fc42f9fcbc5a791bdabc92086a51a2279563f1 (patch) | |
| tree | fd053dd7e462fd49759ae255334de6d5c5aefd59 /fpga/usrp3/top/x300/Makefile | |
| parent | bca5edb57979983a9eb8d6cd1016961552ad217c (diff) | |
| parent | eafae66c030aa86e9da127de4f6d5ec4fd641c59 (diff) | |
| download | uhd-35fc42f9fcbc5a791bdabc92086a51a2279563f1.tar.gz uhd-35fc42f9fcbc5a791bdabc92086a51a2279563f1.tar.bz2 uhd-35fc42f9fcbc5a791bdabc92086a51a2279563f1.zip | |
Merge branch 'maint' into uhd/bug492
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
Diffstat (limited to 'fpga/usrp3/top/x300/Makefile')
| -rw-r--r-- | fpga/usrp3/top/x300/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp3/top/x300/Makefile b/fpga/usrp3/top/x300/Makefile index a5a0b22c8..dbe3bdd55 100644 --- a/fpga/usrp3/top/x300/Makefile +++ b/fpga/usrp3/top/x300/Makefile @@ -83,10 +83,10 @@ X310_HGS: $(call post_build,X310,HGS) X300_HGS: - make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K325T $(HYBRID_SRAM_DEFS) EXTRA_DEFS="$(HYBRID_SRAM_DEFS)" + make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K325T FLOORPLAN=1 $(HYBRID_SRAM_DEFS) EXTRA_DEFS="$(HYBRID_SRAM_DEFS)" $(call post_build,X300,HGS) -# 1Gig on both ports, SRAM Tx FIFO's +# 10Gig on both ports, SRAM Tx FIFO's X310_XGS: make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K410T $(XGIGE_SRAM_DEFS) EXTRA_DEFS="$(XGIGE_SRAM_DEFS)" $(call post_build,X310,XGS) |