Merge branch 'maint'

5 files changed, 30 insertions, 2 deletions

diff --git a/firmware/e300/battery/Makefile b/firmware/e300/battery/Makefile
index c2d530e36..1ce0bf279 100644
--- a/firmware/e300/battery/Makefile
+++ b/firmware/e300/battery/Makefile
@@ -39,17 +39,18 @@ MMCU = attiny88
 PROGRAMMER = jtag3isp
 PORT = usb
 AVRDUDE = avrdude -p $(MMCU) -c $(PROGRAMMER) -P $(PORT) -V
+FUSES = -U hfuse:w:hfuse.hex:i -U lfuse:w:lfuse.hex:i -U efuse:w:efuse.hex:i -u
 
 ##################################################
 # Global Targets
 ##################################################
-all: $(TARGET).hex size
+all: $(TARGET).hex size hfuse.hex lfuse.hex efuse.hex
 
 clean:
 	$(RM) *.o *.elf *.hex
 
 install: all
-	$(AVRDUDE) -U flash:w:$(TARGET).hex:i
+	$(AVRDUDE) -U flash:w:$(TARGET).hex:i $(FUSES)
 
 size: $(TARGET).hex
 	@$(SIZE) --format=SysV --mcu=$(MMCU) $(TARGET).elf
@@ -67,6 +68,9 @@ lfuse.hex: fuses.hex
 hfuse.hex: fuses.hex
 	$(SREC) $< -Intel -crop 0x01 0x02 -offset -0x01 -O $@ -Intel
 
+efuse.hex: fuses.hex
+	$(SREC) $< -Intel -crop 0x02 0x03 -offset -0x02 -O $@ -Intel
+
 $(TARGET).hex: $(TARGET).elf
 	$(OBJCOPY) -R .eeprom -R .fuse -O ihex $< $@
 
diff --git a/firmware/e300/battery/main.c b/firmware/e300/battery/main.c
index eec9e8293..723816924 100644
--- a/firmware/e300/battery/main.c
+++ b/firmware/e300/battery/main.c
@@ -35,6 +35,7 @@
 FUSES = {
 	.low	=	(FUSE_CKSEL0 & FUSE_SUT0),
 	.high	=	(FUSE_EESAVE & FUSE_SPIEN),
+	.extended = EFUSE_DEFAULT,
 };
 
 
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