diff options
| -rwxr-xr-x | debian/bin/extract-install-filenames (renamed from dtools/bin/extract_install_filenames) | 0 | ||||
| -rwxr-xr-x | debian/bin/gen-install-files.sh (renamed from debian/gen-install-files.sh) | 2 | ||||
| -rwxr-xr-x | debian/bin/install-build-deps.sh (renamed from debian/install-build-deps.sh) | 0 | ||||
| -rw-r--r-- | debian/custom/grc.conf (renamed from debian/grc.conf) | 0 | ||||
| -rw-r--r-- | debian/custom/libusrp.udev (renamed from debian/libusrp.udev) | 0 | ||||
| -rw-r--r-- | debian/custom/libusrp2.limits (renamed from debian/libusrp2.limits) | 0 | ||||
| -rw-r--r-- | debian/custom/usrp.hotplug (renamed from debian/usrp.hotplug) | 0 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | usrp/fpga/toplevel/usrp_std/usrp_std.qsf | 9 |
9 files changed, 13 insertions, 10 deletions
diff --git a/dtools/bin/extract_install_filenames b/debian/bin/extract-install-filenames index 8ffce9db1..8ffce9db1 100755 --- a/dtools/bin/extract_install_filenames +++ b/debian/bin/extract-install-filenames diff --git a/debian/gen-install-files.sh b/debian/bin/gen-install-files.sh index ba690d02e..ab04787c9 100755 --- a/debian/gen-install-files.sh +++ b/debian/bin/gen-install-files.sh @@ -1,6 +1,6 @@ #!/bin/sh -EXTRACT=dtools/bin/extract_install_filenames +EXTRACT=debian/bin/extract-install-filenames # libusrp-dev NAME=debian/libusrp-dev.install diff --git a/debian/install-build-deps.sh b/debian/bin/install-build-deps.sh index 256717eb3..256717eb3 100755 --- a/debian/install-build-deps.sh +++ b/debian/bin/install-build-deps.sh diff --git a/debian/grc.conf b/debian/custom/grc.conf index eb503ec95..eb503ec95 100644 --- a/debian/grc.conf +++ b/debian/custom/grc.conf diff --git a/debian/libusrp.udev b/debian/custom/libusrp.udev index e45dc294a..e45dc294a 100644 --- a/debian/libusrp.udev +++ b/debian/custom/libusrp.udev diff --git a/debian/libusrp2.limits b/debian/custom/libusrp2.limits index f259b2992..f259b2992 100644 --- a/debian/libusrp2.limits +++ b/debian/custom/libusrp2.limits diff --git a/debian/usrp.hotplug b/debian/custom/usrp.hotplug index e8b943204..e8b943204 100644 --- a/debian/usrp.hotplug +++ b/debian/custom/usrp.hotplug diff --git a/debian/rules b/debian/rules index 4f77b4a09..cc298e4c6 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ configure-stamp: --disable-gr-audio-osx \ --disable-gr-audio-windows \ --disable-gcell --disable-gr-gcell \ - --disable-gr-comedi --disable-usrp2-firmware + --disable-gr-comedi touch configure-stamp build: build-stamp @@ -57,9 +57,9 @@ build-stamp: configure-stamp touch $@ extract: extract-stamp -extract-stamp: build-stamp debian/gen-install-files.sh +extract-stamp: build-stamp debian/bin/gen-install-files.sh dh_testdir - debian/gen-install-files.sh + debian/bin/gen-install-files.sh touch $@ install: install-stamp @@ -79,15 +79,15 @@ install-stamp: extract-stamp debian/control done : # Deposit rule to allow group 'usrp' access to USRP hardware - install -m 0644 -D debian/libusrp.udev \ + install -m 0644 -D debian/custom/libusrp.udev \ debian/tmp/etc/udev/rules.d/40-usrp.rules : # Deposit rule to allow group 'usrp' access to USRP2 hardware - install -m 0644 -D debian/libusrp2.limits \ + install -m 0644 -D debian/custom/libusrp2.limits \ debian/tmp/etc/security/limits.d/libusrp2.limits : # Install custom grc.conf - install -m 0644 -D debian/grc.conf \ + install -m 0644 -D debian/custom/grc.conf \ debian/tmp/etc/gnuradio/conf.d/grc.conf dh_install --sourcedir=debian/tmp diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std.qsf b/usrp/fpga/toplevel/usrp_std/usrp_std.qsf index e0bac4893..2ef4727e3 100644 --- a/usrp/fpga/toplevel/usrp_std/usrp_std.qsf +++ b/usrp/fpga/toplevel/usrp_std/usrp_std.qsf @@ -27,7 +27,7 @@ # ======================== set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0 set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04 JULY 13, 2003" -set_global_assignment -name LAST_QUARTUS_VERSION "7.1 SP1" +set_global_assignment -name LAST_QUARTUS_VERSION 8.1 # Pin & Location Assignments # ========================== @@ -368,7 +368,7 @@ set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk # end ENTITY(usrp_std) # -------------------- -set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition -to | -section_id Top +set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top set_global_assignment -name VERILOG_FILE ../../megacells/fifo_4k_18.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/atr_delay.v @@ -406,4 +406,7 @@ set_global_assignment -name VERILOG_FILE usrp_std.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/clk_divider.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/serial_io.v set_global_assignment -name VERILOG_FILE ../../sdr_lib/strobe_gen.v -set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v
\ No newline at end of file +set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v +set_global_assignment -name PARTITION_COLOR 16764057 -section_id Top +set_global_assignment -name LL_ROOT_REGION ON -section_id "Root Region" +set_global_assignment -name LL_MEMBER_STATE LOCKED -section_id "Root Region"
\ No newline at end of file |