From 2df1b69dcc38effa5ba66eab86341df9a7a04733 Mon Sep 17 00:00:00 2001
From: Marcus Müller <marcus.mueller@ettus.com>
Date: Sun, 29 Mar 2015 22:52:43 +0200
Subject: db_tvrx2: fixed boost::format bug
---
host/lib/usrp/dboard/db_tvrx2.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'host')
diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp
index 9300483d1..00c2fef50 100644
--- a/host/lib/usrp/dboard/db_tvrx2.cpp
+++ b/host/lib/usrp/dboard/db_tvrx2.cpp
@@ -1014,7 +1014,7 @@ tvrx2::tvrx2(ctor_args_t args) : rx_dboard_base(args){
_freq_scalar = (6*16.0e6)/this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX);
} else if (ref_clock == 200e6) {
- UHD_MSG(warning) << boost::format("ref_clock was 200e6, setting ref_clock divider for 100e6.") % ref_clock << std::endl;
+ UHD_MSG(warning) << boost::format("ref_clock was 200e6, setting ref_clock divider for 100e6.") << std::endl;
this->get_iface()->set_clock_rate(dboard_iface::UNIT_RX, 100e6);
this->get_iface()->set_gpio_out(dboard_iface::UNIT_RX, REFCLOCK_DIV6);
--
cgit v1.2.3
From 1fe6a3a8aa4ae6af023552786a190f2d98de8a87 Mon Sep 17 00:00:00 2001
From: Neel Pandeya <neel.pandeya@ettus.com>
Date: Mon, 23 Mar 2015 16:10:04 -0700
Subject: x300: Fix for Bug #714: Phase wobble across four channels on two
devices - Increased filter loop bandwith on clock control chip
---
host/lib/usrp/x300/x300_clock_ctrl.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'host')
diff --git a/host/lib/usrp/x300/x300_clock_ctrl.cpp b/host/lib/usrp/x300/x300_clock_ctrl.cpp
index 247c10ac4..b59247d53 100644
--- a/host/lib/usrp/x300/x300_clock_ctrl.cpp
+++ b/host/lib/usrp/x300/x300_clock_ctrl.cpp
@@ -190,7 +190,7 @@ void set_master_clock_rate(double clock_rate) {
// PLL1 - 2 MHz compare frequency
_lmk04816_regs.PLL1_N_28 = 100;
_lmk04816_regs.PLL1_R_27 = 5;
- _lmk04816_regs.PLL1_CP_GAIN_27 = lmk04816_regs_t::PLL1_CP_GAIN_27_100UA;
+ _lmk04816_regs.PLL1_CP_GAIN_27 = lmk04816_regs_t::PLL1_CP_GAIN_27_1600UA;
// PLL2 - 96 MHz compare frequency
_lmk04816_regs.PLL2_N_30 = 5;
--
cgit v1.2.3
From da5311407bdabcb7206f8ffb0b77de32d294f083 Mon Sep 17 00:00:00 2001
From: Moritz Fischer <moritz.fischer@ettus.com>
Date: Mon, 30 Mar 2015 13:21:04 -0700
Subject: docs: e3x0: Add a paragraph on writing the sdcard.
This also fixes some numbering issues in hte paragraphs yocto
paragraphs.
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
---
host/docs/usrp_e3x0.dox | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
(limited to 'host')
diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox
index 38bf8d926..2965f4dad 100644
--- a/host/docs/usrp_e3x0.dox
+++ b/host/docs/usrp_e3x0.dox
@@ -179,7 +179,6 @@ knowledge of Linux.
$ repo sync
$ TEMPLATECONF=`pwd`/meta-ettus/conf source ./oe-core/oe-init-build-env ./build ./bitbake
\endcode
-
At this point you should review the file in conf/local.conf and make sure
path names make sense for your machine.
@@ -190,27 +189,36 @@ builds)
$ export MACHINE="ettus-e300"
$ bitbake gnuradio-dev-image
\endcode
-
When this completes, the files needed to create the sd card are in
-`tmp-glibc/deploy/images/ettus-e300`
+`tmp-glibc/deploy/images/ettus-e300`. See \ref e3x0_upgrade_sd_card for instructions to write the image to your sd card.
+
-# Build the toolchain.
\code{.sh}
$ bitbake -c populate_sdk gnuradio-dev-image
\endcode
-
The sdk is in `tmp-glibc/deploy/sdk`
-
Note that you can set the `MACHINE` variable in `local.conf so that you no
longer need to set it from the command line.
+-# Using the environment
When you log back in, you will need to setup the OpenEmbedded environment
again by:
+ \code{.sh}
+ $ cd e300-oe-build/oe-core
+ $ . oe-core/oe-init-build-env ./build ./bitbake
+ \endcode
-\code{.sh}
- $ cd e300-oe-build/oe-core
- $ . oe-core/oe-init-build-env ./build ./bitbake
-\endcode
+\section e3x0_upgrade_sd_card Upgrading / Writing image to sd card
+
+In order to upgrade or reinitialize a sd card for the first time, you can use the 'dd' tool.
+Make sure that you are using the right block device for your sd card as failing to do so can wipe your harddrive.
+
+Replace <yourimage>.direct with your image file name and yoursdcard with your blockdevice e.g. /dev/mmcblk0 or /dev/sdb.
+
+ $ sudo dd if=<yourimage>.direct of=/dev/<yoursdcard> bs=1M
+
+Notes: The commands will wipe the entire sd card and reinitialize it. Newer images need a 8GB sd card.
\section e3x0_load_fpga_imgs Specifying a Non-standard FPGA Image
--
cgit v1.2.3