Merge branch 'master' into dmbs

2016-04-03 11:34:34 +10:00
parent 9864c02eb4 9669a00c34
commit 9cca7a594f
1050 changed files with 3172 additions and 2171 deletions
@@ -456,6 +456,10 @@
 *    <td><tt>AVRDUDE_FLAGS</tt></td>
 *    <td>Additional flags to pass to avrdude when programming, applied after the automatically generated flags.</td>
 *   </tr>
+ *   <tr>
+ *    <td><tt>AVRDUDE_MEMORY</tt></td>
+ *    <td>Main memory space used when programming in an application *e.g. <tt>application</tt> for a DFU bootloader, or <tt>flash</tt> for a regular programmer).</td>
+ *   </tr>
 *  </table>
 *
 *  \section SSec_BuildModule_AVRDUDE_ProvidedVariables Module Provided Variables