Merge branch 'maint'

3 files changed, 23 insertions, 0 deletions

diff --git a/host/docs/gpio_api.dox b/host/docs/gpio_api.dox
index d3bb4f0a9..98515d07b 100644
--- a/host/docs/gpio_api.dox
+++ b/host/docs/gpio_api.dox
@@ -13,6 +13,10 @@ disabling a TX or RX mixer).
 
 \subsection xgpio_fpanel_gpio X3x0 Front Panel GPIO
 
+The GPIO port is not meant to drive big loads. You should not try to source more than 5mA per pin.
+
+The +3.3V is for ESD clamping purposes only and not designed to deliver high currents.
+
 \subsubsection xgpio_fpanel_conn Connector
 
 \image html x3x0_gpio_conn.png "X3x0 GPIO Connectors"
diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox
index 70432d05f..b175cc201 100644
--- a/host/docs/usrp_e3x0.dox
+++ b/host/docs/usrp_e3x0.dox
@@ -283,6 +283,7 @@ It's behavior is firmware version dependent.
     + 1 - Low voltage error
     + 2 - Regulator low voltage error
     + 3 - FPGA power error
+    + 4 - DRAM power error
     + 5 - 1.8V rail power error
     + 6 - 3.3V rail power error
     + 7 - Daughterboard / TX power error
@@ -746,6 +747,16 @@ by pinging the USRP and making sure the LEDs start to blink.
      In the file `/etc/ssh/sshd_config`, uncomment the line \#`X11Forwarding no`
      and change "no" to "yes".
 
+ - Firmware
+  -# With Firmware 2.0 the device no longer turns on when AC power is plugged.<br>
+     This setting can be adjusted via `/sys/devices/axi_pmu.3/autoboot`.
+
+     Using `$ echo 1 > /sys/devices/axi_pmu.3/autoboot` autoboot is turned on.
+
+     Using `$ echo 0 > /sys/devices/axi_pmu.3/autoboot` autoboot is turned off.
+
+     Note that the path above is subject to change depending on device tree changes.
+
 \section e3x0_apps Applications
 
 \subsection e3x0_apps_gsm GSM Base Station
diff --git a/host/docs/usrp_x3x0.dox b/host/docs/usrp_x3x0.dox
index d4dccaed5..7183efc04 100644
--- a/host/docs/usrp_x3x0.dox
+++ b/host/docs/usrp_x3x0.dox
@@ -334,6 +334,10 @@ It is possible to put the device into an unusable state by loading bad images ("
 Fortunately, the USRP-X Series device can be loaded with a good image temporarily using the USB-JTAG interface.
 Once booted into the safe image, the user can once again load images onto the device over Ethernet or PCI Express.
 
+See Section \ref x3x0_load_fpga_imgs_jtag on how to load the FPGA image onto the device using a JTAG interface.
+After running the JTAG process, a new image can be flashed onto the device using the usual procedure
+to permently recover the device.
+
 \section x3x0_setup_network Setup Networking
 The USRP-X Series only supports Gigabit and Ten Gigabit Ethernet and will not work with a 10/100 Mbps interface.
 
@@ -580,6 +584,10 @@ Please see \ref page_gpsdo_x3x0 for information on configuring and using the int
 
 \image html x3x0_gpio_conn.png "X3x0 GPIO Connector"
 
+The GPIO port is not meant to drive big loads. You should not try to source more than 5mA per pin.
+
+The +3.3V is for ESD clamping purposes only and not designed to deliver high currents.
+
 ### Pin Mapping
 
 - Pin 1:  +3.3V