RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

riotboot: serial: enter bootloader mode by pin

Browse Source
This commit is contained in:
Benjamin Valentin 2021-11-20 23:04:59 +01:00
parent 4be2829537
commit f53a398bfb
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/riotboot/serial.c
View File

@ -23,11 +23,13 @@
#include "stdio_uart.h" #include "stdio_uart.h"
#include "periph/uart.h" #include "periph/uart.h"
#include "periph/gpio.h"
#include "periph/flashpage.h" #include "periph/flashpage.h"
#include "unaligned.h" #include "unaligned.h"
#include "checksum/crc8.h" #include "checksum/crc8.h"
#include "riotboot/serial.h" #include "riotboot/serial.h"
#include "riotboot/magic.h" #include "riotboot/magic.h"
#include "riotboot/bootloader_selection.h"
#include "board.h" #include "board.h"
@ -53,6 +55,20 @@ static inline void uart_write_byte(uart_t uart, uint8_t data)
uart_write(uart, &data, 1); uart_write(uart, &data, 1);
} }
static inline bool _boot_pin(void)
{
#ifdef BTN_BOOTLOADER_PIN
if (BTN_BOOTLOADER_INVERTED) {
return !gpio_read(BTN_BOOTLOADER_PIN);
}
else {
return gpio_read(BTN_BOOTLOADER_PIN);
}
#else
return false;
#endif
}
/* send 'hello' byte until we get enter bootloader byte or timeout */ /* send 'hello' byte until we get enter bootloader byte or timeout */
static bool _bootdelay(unsigned tries, volatile bool *boot_default) static bool _bootdelay(unsigned tries, volatile bool *boot_default)
{ {
@ -69,6 +85,9 @@ static bool _bootdelay(unsigned tries, volatile bool *boot_default)
while (--tries && *boot_default) { while (--tries && *boot_default) {
uart_write_byte(RIOTBOOT_UART_DEV, 0); uart_write_byte(RIOTBOOT_UART_DEV, 0);
if (_boot_pin()) {
return false;
}
} }
return *boot_default; return *boot_default;
@ -180,9 +199,9 @@ error:
static void _get_page(uintptr_t addr) static void _get_page(uintptr_t addr)
{ {
uart_write_byte(RIOTBOOT_UART_DEV, RIOTBOOT_STAT_OK);
uint32_t page = flashpage_page((void *)addr); uint32_t page = flashpage_page((void *)addr);
uart_write_byte(RIOTBOOT_UART_DEV, RIOTBOOT_STAT_OK);
uart_write(RIOTBOOT_UART_DEV, (void *)&page, sizeof(page)); uart_write(RIOTBOOT_UART_DEV, (void *)&page, sizeof(page));
} }
@ -216,6 +235,10 @@ int riotboot_serial_loader(void)
{ {
volatile bool reading = true; volatile bool reading = true;
#ifdef BTN_BOOTLOADER_PIN
gpio_init(BTN_BOOTLOADER_PIN, BTN_BOOTLOADER_MODE);
#endif
uart_init(RIOTBOOT_UART_DEV, RIOTBOOT_UART_BAUDRATE, uart_init(RIOTBOOT_UART_DEV, RIOTBOOT_UART_BAUDRATE,
_uart_rx_cmd, (void *)&reading); _uart_rx_cmd, (void *)&reading);