New command cpuchk

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

diff --git a/avr/main.c b/avr/main.c
index 423b48a7806e8a11ad7f528fdf99152af3c8f83b..1fba3cbfcea8031a6b16e034f800aa6f5b44eec4 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -24,6 +24,8 @@
 #include "time.h"
 #include "rtc.h"
 #include "debug.h"
+#include "cmd_fat.h"
+
 
 uint8_t mcusr __attribute__ ((section (".noinit")));
 
@@ -65,15 +67,17 @@ void print_reset_reason(void)
        uint8_t r = mcusr & 0x1f;
        const FLASH char * const FLASH *p = rreasons;
 
-       printf_P(PSTR("### Reset reason(s): %s"), r ? "" : "none");
+       my_puts_P(PSTR("### Reset reason(s): "));
+       if (r == 0)
+               my_puts_P(PSTR("none"));
        for ( ; r; p++, r >>= 1) {
                if (r & 1) {
                        my_puts_P(*p);
                        if (r & ~1)
-                               printf_P(PSTR(", "));
+                               my_puts_P(PSTR(", "));
                }
        }
-       printf_P(PSTR(".\n"));
+       my_puts_P(PSTR(".\n"));
 }
 
 #endif
@@ -146,16 +150,6 @@ void setup_system_time(void)
 }
 
 
-
-static void setup_fatfs(void)
-{
-       static FATFS FatFs0;
-       static FATFS FatFs1;
-
-       f_mount(&FatFs0, "0:", 0);
-       f_mount(&FatFs1, "1:", 0);
-}
-
 /*--------------------------------------------------------------------------*/
 
 /* Stored value of bootdelay, used by autoboot_command() */
@@ -223,7 +217,7 @@ const char *bootdelay_process(void)
        debug("### main_loop entered: bootdelay=%d\n\n", bootdelay);
        _delay_ms(20);
 
-       s = getenv_char(PSTR(ENV_BOOTCMD));
+       s = getenv_str(PSTR(ENV_BOOTCMD));
        stored_bootdelay = bootdelay;
        return s;
 }
@@ -231,7 +225,7 @@ const char *bootdelay_process(void)
 static
 void autoboot_command(const char *s)
 {
-       debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
+       debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "");
        _delay_ms(20);
 
        if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
@@ -254,6 +248,7 @@ int main(void)
 {
        extern void setup_mmc(void);
 
+       __malloc_margin = CONFIG_SYS_MALLOC_MARGIN;
        setup_avr();
        for (int i = 0; i < GPIO_MAX; i++)
                gpio_config(i, INPUT_PULLUP);