From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 18:03:31 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2175d633ba66aa917a33281b3768895bd6723c3c;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 06257e1..8f13acb 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 9a2a17710286eae76fb981d0f5ff64c78a64dc55
-Head: c0bc8debf435b9b6ffd7dc2ac6153e0314764a87
+Previous: f9c7fa70cf4d4deeef58e90ebf6a03473b36588f
+Head: e7ca49239c134da3660d80b1005a9564672d6c6b
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
   add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
   makefile-support-v-1: 90c247c0f2f80ca736bb1d43ff738460f0d1a824
-  makefile-avr-size: 36fbda52517019012c228b3ba63037cd6a57c152
-  refresh-temp: c0bc8debf435b9b6ffd7dc2ac6153e0314764a87
+  makefile-avr-size: e7ca49239c134da3660d80b1005a9564672d6c6b
 Unapplied:
   motion-control-max-min: 44befa5f783994f92f7c6fd39b7f581cf174d9d4
   m206-always-use-homing-homeing: 5c4da74300c80f25a333307be1768e7eb4c24325
diff --git a/patches/makefile-avr-size b/patches/makefile-avr-size
index a4d07a7..69d52c1 100644
--- a/patches/makefile-avr-size
+++ b/patches/makefile-avr-size
@@ -1,5 +1,5 @@
 Bottom: fe29c935d597df4792c2f9c33288912120351048
-Top:    fe29c935d597df4792c2f9c33288912120351048
+Top:    4fa736aa57e0b7f1687af78e8c0f83fa18dc2549
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-09 19:03:12 +0100
 
@@ -14,4 +14,16 @@ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 
 ---
 
-
+diff --git a/Marlin/Makefile b/Marlin/Makefile
+index a85111d..940bb16 100644
+--- a/Marlin/Makefile
++++ b/Marlin/Makefile
+@@ -221,7 +221,8 @@ endif
+ 
+ 	# Display size of file.
+ HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex
+-ELFSIZE = $(SIZE)  applet/$(TARGET).elf
++ELFSIZE = $(SIZE) --mcu=$(MCU) -C applet/$(TARGET).elf; \
++          $(SIZE)  applet/$(TARGET).elf
+ sizebefore:
+ 	$P if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 1e684a4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: fe29c935d597df4792c2f9c33288912120351048
-Top:    4fa736aa57e0b7f1687af78e8c0f83fa18dc2549
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 19:03:31 +0100
-
-Refresh of makefile-avr-size
-
----
-
-diff --git a/Marlin/Makefile b/Marlin/Makefile
-index a85111d..940bb16 100644
---- a/Marlin/Makefile
-+++ b/Marlin/Makefile
-@@ -221,7 +221,8 @@ endif
- 
- 	# Display size of file.
- HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex
--ELFSIZE = $(SIZE)  applet/$(TARGET).elf
-+ELFSIZE = $(SIZE) --mcu=$(MCU) -C applet/$(TARGET).elf; \
-+          $(SIZE)  applet/$(TARGET).elf
- sizebefore:
- 	$P if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi