Merge branch 'maint'

Conflicts:
	fpga-src
	host/CMakeLists.txt
	host/cmake/Modules/UHDVersion.cmake
	host/lib/usrp/b200/b200_impl.hpp
	host/lib/usrp/e300/e300_fpga_defs.hpp
	host/lib/usrp/x300/x300_fw_common.h

1 files changed, 77 insertions, 0 deletions

diff --git a/firmware/e300/battery/Makefile b/firmware/e300/battery/Makefile
new file mode 100644
index 000000000..c2d530e36
--- /dev/null
+++ b/firmware/e300/battery/Makefile
@@ -0,0 +1,77 @@
+# USRP E310 Firmware
+# Copyright (C) 2014-2015 Ettus Research
+# This file is part of the USRP E310 Firmware
+# The USRP E310 Firmware is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+# The USRP E310 Firmware is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with the USRP E310 Firmware. If not, see <http://www.gnu.org/licenses/>.
+
+##################################################
+# Compiler
+##################################################
+CC = avr-gcc
+OBJCOPY = avr-objcopy
+STRIP = avr-strip
+SIZE = avr-size
+OBJDUMP = avr-objdump
+SREC = srec_cat
+CFLAGS = -Os -std=c11 -Wall -fshort-enums -pedantic -Wl,--gc-sections \
+	-Wstrict-prototypes -Wcast-align -Wshadow
+
+##################################################
+# Files
+##################################################
+HDRS =
+SRCS =  main.c adc.c bq2419x.c fpga.c i2c_twi.c interrupt.c io.c ltc294x.c ltc3675.c \
+	pmu.c spi.c timer.c tps54478.c eeprom.c led.c
+TARGET = main
+
+##################################################
+# Device
+##################################################
+MMCU = attiny88
+PROGRAMMER = jtag3isp
+PORT = usb
+AVRDUDE = avrdude -p $(MMCU) -c $(PROGRAMMER) -P $(PORT) -V
+
+##################################################
+# Global Targets
+##################################################
+all: $(TARGET).hex size
+
+clean:
+	$(RM) *.o *.elf *.hex
+
+install: all
+	$(AVRDUDE) -U flash:w:$(TARGET).hex:i
+
+size: $(TARGET).hex
+	@$(SIZE) --format=SysV --mcu=$(MMCU) $(TARGET).elf
+	@$(SIZE) -C --mcu=$(MMCU) $(TARGET).elf
+
+##################################################
+# Dependency Targets
+##################################################
+fuses.hex: $(TARGET).elf
+	$(OBJCOPY) -j .fuse -O ihex $< $@ --change-section-lma .fuse=0
+
+lfuse.hex: fuses.hex
+	$(SREC) $< -Intel -crop 0x00 0x01 -offset  0x00 -O $@ -Intel
+
+hfuse.hex: fuses.hex
+	$(SREC) $< -Intel -crop 0x01 0x02 -offset -0x01 -O $@ -Intel
+
+$(TARGET).hex: $(TARGET).elf
+	$(OBJCOPY) -R .eeprom -R .fuse -O ihex $< $@
+
+$(TARGET).elf: $(SRCS:.c=.o)
+	$(CC) -mmcu=$(MMCU) $^ -o $@
+
+%.o: %.c $(HDRS) Makefile
+	$(CC) -mmcu=$(MMCU) -c $< -o $@ $(CFLAGS)