Merge branch 'master' into cmdline_edit

diff --cc avr/cli_readline.c
index 8795a97f82ceda74bf30444c0a90ccf05cf269bc,93a03551e6e376eed90c4e1ed2348f0c24418f4e..ff83a3a1dac48129bbcb2bb99b9c7a85bf80e798
--- 1/avr/cli_readline.c
--- 2/avr/cli_readline.c
+++ b/avr/cli_readline.c
@@@ -10,10 -12,8 +12,9 @@@
   */
  
  #include "common.h"
- 
  #include <string.h>
  #include <stdio.h>
 +#include <ctype.h>
  
  #include "config.h"
  #include "con-utils.h"

diff --cc include/config.h
index d192559325d08f4b019a29170f823cc98acbdf93,c7c45119ac102e0a704be1846dc00a35c97946f8..e4e609679c31c3926e68090d262ca0dcc8293320
--- 1/include/config.h
--- 2/include/config.h
+++ b/include/config.h
@@@ -3,10 -9,17 +9,17 @@@
  
  /* Environment variables */
  
 -#define ENV_BAUDRATE          "baudrate"
 -#define ENV_BOOTDELAY         "bootdelay"
 -#define ENV_BOOTCMD           "bootcmd"
 +#define ENV_BAUDRATE  "baudrate"
 +#define ENV_BOOTDELAY "bootdelay"
 +#define ENV_BOOTCMD   "bootcmd"
+ 
+ #define ENV_CPM3_SYSFILE      "cpm3_file"
+ #define ENV_CPM3_COMMON_BASE  "cpm3_commonbase"
+ #define ENV_CPM3_BANKED_BASE  "cpm3_bankedbase"
+ 
 -#define ENV_PINALIAS          "pin_alias"
 +#define ENV_PINALIAS  "pin_alias"
+ #define ENV_STARTADDRESS      "startaddress"
+ #define ENV_ESC_CHAR          "esc_char"
  
  #define CONFIG_ENV_SIZE               1600
  #define CONFIG_ENV_OFFSET     0
@@@ -34,9 -57,11 +57,10 @@@
  #define CONFIG_SYS_PROMPT     "=> "
  #define CONFIG_ESC_CHAR               ('^'-0x40)
  
+ #define CONFIG_SYS_FBOOTSIG "Peda"
  
 -
 +#define CONFIG_CMDLINE_EDITING        1
  /* TODO: */
 -//#define CONFIG_CMDLINE_EDITING      1
  //#define CONFIG_AUTO_COMPLETE        1
  
  #define CONFIG_SYS_LONGHELP   1