From b408f8f0bf0b9a6ede1228d7d0b5aaf6d675e351 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 2 Jan 2016 00:35:53 +0200
Subject: [PATCH] Fix uploading of EEPROM data using "uploadeep" target for
 Atmel AVR development platform

---
 HISTORY.rst                            |  6 ++++++
 platformio/__init__.py                 |  2 +-
 platformio/builder/scripts/atmelavr.py | 14 +++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 97475fba..0ac4b015 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,12 @@ PlatformIO 2.0
 2.7.0 (2015-12-30)
 ~~~~~~~~~~~~~~~~~~
 
+* Fixed uploading of EEPROM data using ``uploadeep`` target for Atmel AVR
+  development platform
+
+2.7.0 (2015-12-30)
+~~~~~~~~~~~~~~~~~~
+
 **Happy New Year!**
 
 * Moved SCons to PlatformIO packages. PlatformIO does not require SCons to be
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 176f8f9f..9aef008d 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 7, 0)
+VERSION = (2, 7, "1.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index b4ff833a..7699bb65 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -110,13 +110,6 @@ else:
 
 target_elf = env.BuildProgram()
 
-#
-# Target: Extract EEPROM data (from EEMEM directive) to .eep file
-#
-
-target_eep = env.Alias("eep", env.ElfToEep(join("$BUILD_DIR", "firmware"),
-                                           target_elf))
-
 #
 # Target: Build the .hex file
 #
@@ -142,10 +135,13 @@ upload = env.Alias(["upload", "uploadlazy"], target_firm,
 AlwaysBuild(upload)
 
 #
-# Target: Upload .eep file
+# Target: Upload EEPROM data (from EEMEM directive)
 #
 
-uploadeep = env.Alias("uploadeep", target_eep, [BeforeUpload, "$UPLOADEEPCMD"])
+uploadeep = env.Alias(
+    "uploadeep",
+    env.ElfToEep(join("$BUILD_DIR", "firmware"), target_elf),
+    [BeforeUpload, "$UPLOADEEPCMD"])
 AlwaysBuild(uploadeep)
 
 #