arduino/optiboot
1
0
Fork 0
mirror of https://github.com/Optiboot/optiboot.git synced 2025-08-19 09:02:05 +03:00
Code Activity

Put BIGBOOT strings in flash so __do_copy_data doens't get placed ahead of the jump table.

Browse Source
This commit is contained in:
Thomas Deal
2019-02-02 15:24:57 -05:00
parent 0a6528d1fc
commit 3f78f99745
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
optiboot/bootloaders/optiboot/optiboot.c
View File

@@ -1314,7 +1314,8 @@ static void do_spm(uint16_t address, uint8_t command, uint16_t data) {
*/ */
#define xstr(s) str(s) #define xstr(s) str(s)
#define str(s) #s #define str(s) #s
#define OPT2FLASH(o) char f##o[] = #o "=" xstr(o) #define OPTFLASHSECT __attribute__((section(".fini8")))
#define OPT2FLASH(o) OPTFLASHSECT const char f##o[] = #o "=" xstr(o)
#ifdef LED_START_FLASHES #ifdef LED_START_FLASHES
@@ -1327,7 +1328,7 @@ OPT2FLASH(LED_DATA_FLASH);
OPT2FLASH(LED_START_ON); OPT2FLASH(LED_START_ON);
#endif #endif
#ifdef LED_NAME #ifdef LED_NAME
char f_LED[] = "LED=" LED_NAME; OPTFLASHSECT const char f_LED[] = "LED=" LED_NAME;
#endif #endif
#ifdef SUPPORT_EEPROM #ifdef SUPPORT_EEPROM
@@ -1343,18 +1344,18 @@ OPT2FLASH(SOFT_UART);
OPT2FLASH(UART); OPT2FLASH(UART);
#endif #endif
char f_date[] = "Built:" __DATE__ ":" __TIME__; OPTFLASHSECT const char f_date[] = "Built:" __DATE__ ":" __TIME__;
#ifdef BIGBOOT #ifdef BIGBOOT
OPT2FLASH(BIGBOOT); OPT2FLASH(BIGBOOT);
#endif #endif
#ifdef VIRTUAL_BOOT_PARTITION #ifdef VIRTUAL_BOOT_PARTITION
char f_boot[] = "Virtual_Boot_Partition"; OPTFLASHSECT const char f_boot[] = "Virtual_Boot_Partition";
#endif #endif
OPT2FLASH(F_CPU); OPT2FLASH(F_CPU);
char f_device[] = "Device=" xstr(__AVR_DEVICE_NAME__); OPTFLASHSECT const char f_device[] = "Device=" xstr(__AVR_DEVICE_NAME__);
#ifdef OPTIBOOT_CUSTOMVER #ifdef OPTIBOOT_CUSTOMVER
OPT2FLASH(OPTIBOOT_CUSTOMVER); OPT2FLASH(OPTIBOOT_CUSTOMVER);
#endif #endif
char f_version[] = "Version=" xstr(OPTIBOOT_MAJVER) "." xstr(OPTIBOOT_MINVER); OPTFLASHSECT const char f_version[] = "Version=" xstr(OPTIBOOT_MAJVER) "." xstr(OPTIBOOT_MINVER);
#endif #endif