env var fmon (F_CPU)

[z180-stamp.git] / avr / env.c

diff --git a/avr/env.c b/avr/env.c
index 3bb04c28fbd64a46e771b916dd1568bb1804feab..8896004c8effb9729732fe451c01fa842caaab39 100644 (file)
--- a/avr/env.c
+++ b/avr/env.c
@@ -14,7 +14,7 @@
 
 #define DEBUG_ENV      0       /* set to 1 to debug */
 
-#define debug_env(fmt, args...)                                                              \
+#define debug_env(fmt, args...)                                                \
        debug_cond(DEBUG_ENV, fmt, ##args)
 
 
@@ -25,13 +25,12 @@
 #define DELIM          "\0"
 
 const FLASH char default_env[] = {
-       ENV_BAUDRATE      "=" "115200" DELIM
-       ENV_BOOTDELAY     "=" "3" DELIM
+       ENV_BAUDRATE      "=" stringify(CONFIG_BAUDRATE) DELIM
+       ENV_BOOTDELAY     "=" stringify(CONFIG_BOOTDELAY) DELIM
        ENV_BOOTCMD               "=" "pin ${pins};loadcpm3;go ${startaddress}" DELIM
        ENV_CPM3_SYSFILE  "=" CONFIG_CPM3_SYSFILE DELIM
        ENV_PINALIAS      "=" "0:PG5,1:PG4,2:PB4,3:PB5,4:PB6,5:PB7,"
                                                  "6:PG3,7:PG2,8:PG1,9:PG0,10:PE7" DELIM
-       //ENV_STARTADDRESS  "=" "0" DELIM
        "pins"                    "=" "2,8 low 9 high 3 2" DELIM
        DELIM
 };