From c748023ede9e7d8bdbf81ce8c8be2a437607a9e4 Mon Sep 17 00:00:00 2001 From: Leo C Date: Wed, 21 Jan 2015 04:07:19 +0100 Subject: Support for Peter Danneggers fboot. --- avr/con-utils.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'avr/con-utils.c') diff --git a/avr/con-utils.c b/avr/con-utils.c index f20dbfe..5ee1ff1 100644 --- a/avr/con-utils.c +++ b/avr/con-utils.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include #include "common.h" +#include +#include +#include "config.h" #include "serial.h" #include "background.h" #include "con-utils.h" @@ -26,6 +28,31 @@ int my_getchar(uint_fast8_t waitforchar) c = serial_getc(); } while ((c < 0) && waitforchar); +#ifdef CONFIG_SYS_FBOOTSIG + if (c < 0) + return c; + + static const FLASH unsigned char bootsig[] = {CONFIG_SYS_FBOOTSIG}; + static uint8_t pb; + unsigned char uc = c; + + + if (bootsig[pb] == 0) { + if (uc == 0xff) { + wdt_enable(WDTO_15MS); + for(;;) + ; + } else + pb = 0; + + } else { + if (bootsig[pb] == uc) + pb++; + else + pb = 0; + } +#endif + return c; } -- cgit v1.2.3