BOOTAPP support defined for EINSY

W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
This commit is contained in:
Robert Pelnar 2018-07-23 17:14:18 +02:00
parent 07d57de660
commit 6444573c92
2 changed files with 8 additions and 5 deletions

View file

@ -1041,12 +1041,14 @@ void erase_eeprom_section(uint16_t offset, uint16_t bytes)
for (int i = offset; i < (offset+bytes); i++) eeprom_write_byte((uint8_t*)i, 0xFF);
}
#ifdef BOOTAPP
#include "bootapp.h" //bootloader support
#endif //BOOTAPP
#if (LANG_MODE != 0) //secondary language support
#ifdef W25X20CL
#include "bootapp.h" //bootloader support
// language update from external flash
#define LANGBOOT_BLOCKSIZE 0x1000
@ -1146,6 +1148,8 @@ void setup()
lcd_splash();
#ifdef W25X20CL
if (!w25x20cl_init())
kill(_i("External SPI flash W25X20CL not responding."));
// Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory.
optiboot_w25x20cl_enter();
#endif
@ -1154,8 +1158,6 @@ void setup()
#ifdef W25X20CL
if (w25x20cl_init())
update_sec_lang_from_external_flash();
else
kill(_i("External SPI flash W25X20CL not responding."));
#endif //W25X20CL
#endif //(LANG_MODE != 0)

View file

@ -16,6 +16,7 @@
#define PINDA_THERMISTOR
#define W25X20CL // external 256kB flash
#define BOOTAPP // bootloader support
#define SWI2C_SDA 20 //SDA on P3