Skip to content

Commit 68245ac

Browse files
davisonjadavisonja
committed
Adjusted values to be addresses not offsets and fixed up references
1 parent 1339018 commit 68245ac

27 files changed

+62
-60
lines changed

‎cores/esp8266/core_esp8266_eboot_command.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ bool eraseBootCommandBlock(void) {
116116
return 1;
117117
}
118118

119-
uint32_t eboot_command_read_from_flash(void)
119+
uint32_t eboot_command_read_from_flash(eboot_flash_command_t *cmd)
120120
{
121121
eboot_index_t eboot_index;
122122
eboot_flash_command_t *flash_command;
123123
uint32_t i;
124-
// const uint32_t dw_count = sizeof(struct eboot_command) / sizeof(uint32_t);
124+
const uint32_t dw_count = sizeof(struct eboot_command) / sizeof(uint32_t);
125125

126126
if (!eboot_read_flash_index(&eboot_index)) {
127127
return 0;
@@ -131,11 +131,11 @@ uint32_t eboot_command_read_from_flash(void)
131131
if (((flash_command->flags & EBOOT_CMD_FLAG_SLOT_FREE) == 0) &&
132132
((flash_command->flags & EBOOT_CMD_FLAG_PENDING) == EBOOT_CMD_FLAG_PENDING)) {
133133
// This is a valid command waiting to be actioned, or should be. The CRC check will determine if it's actually valid
134-
// uint32_t* dst = (uint32_t *) cmd;
135-
// uint32_t* src = (uint32_t *) flash_command->cmd;
136-
// for (uint32_t i = 0; i < dw_count; ++i) {
137-
// dst[i] = src[i];
138-
// }
134+
uint32_t* dst = (uint32_t *) cmd;
135+
uint32_t* src = (uint32_t *) &(flash_command->cmd);
136+
for (uint32_t i = 0; i < dw_count; ++i) {
137+
dst[i] = src[i];
138+
}
139139
return 1;
140140
}
141141
}
@@ -158,7 +158,9 @@ uint32_t eboot_command_write_to_flash(struct eboot_command *cmd)
158158
} else {
159159
ets_printf("Read bootCommand %d, flags: %x\n", i, flash_command.flags);
160160
if (((flash_command.flags & EBOOT_CMD_FLAG_SLOT_FREE) == EBOOT_CMD_FLAG_SLOT_FREE) &&
161-
((flash_command.flags & EBOOT_CMD_FLAG_PENDING) == EBOOT_CMD_FLAG_PENDING)) {
161+
((flash_command.flags & EBOOT_CMD_FLAG_PENDING) == EBOOT_CMD_FLAG_PENDING) &&
162+
(flash_command.cmd.magic == 0)
163+
) {
162164
target_command_slot = i;
163165
break;
164166
}

‎tools/boards.txt.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,8 +1281,8 @@ def flash_map (flashsize_kb, fs_kb = 0):
12811281
print("PROVIDE ( _FS_end = 0x%08X );" % (0x40200000 + fs_end))
12821282
print("PROVIDE ( _FS_page = 0x%X );" % page)
12831283
print("PROVIDE ( _FS_block = 0x%X );" % fs_blocksize)
1284-
print("PROVIDE ( _BOOTLOADER_DATA = 0x%08X );" % ota_commands_addr)
1285-
print("PROVIDE ( _SKETCH_AREA_end = _FS_start );")
1284+
print("PROVIDE ( _BOOTLOADER_DATA = 0x%08X );" % (0x40200000 + ota_commands_addr))
1285+
print("PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );")
12861286
print("PROVIDE ( _EEPROM_start = 0x%08x );" % (0x40200000 + eeprom_start))
12871287
# Re-add deprecated symbols pointing to the same address as the new standard ones
12881288
print("/* The following symbols are DEPRECATED and will be REMOVED in a future release */")

‎tools/sdk/ld/eagle.flash.16m14m.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x40400000 );
1919
PROVIDE ( _FS_end = 0x411FA000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x2000 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x001FE000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x403FE000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x411fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x40400000 );

‎tools/sdk/ld/eagle.flash.16m15m.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ PROVIDE ( _FS_start = 0x40300000 );
1818
PROVIDE ( _FS_end = 0x411FA000 );
1919
PROVIDE ( _FS_page = 0x100 );
2020
PROVIDE ( _FS_block = 0x2000 );
21-
PROVIDE ( _BOOTLOADER_DATA = 0x000FE000 );
22-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
21+
PROVIDE ( _BOOTLOADER_DATA = 0x402FE000 );
22+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2323
PROVIDE ( _EEPROM_start = 0x411fb000 );
2424
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2525
PROVIDE ( _SPIFFS_start = 0x40300000 );

‎tools/sdk/ld/eagle.flash.1m.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x402FB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x0 );
2121
PROVIDE ( _FS_block = 0x0 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x000F9000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x402F9000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x402fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x402FB000 );

‎tools/sdk/ld/eagle.flash.1m128.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x402DB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x000D9000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x402D9000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x402fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x402DB000 );

‎tools/sdk/ld/eagle.flash.1m144.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x402D7000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x000D5000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x402D5000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x402fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x402D7000 );

‎tools/sdk/ld/eagle.flash.1m160.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x402D3000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x000D1000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x402D1000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x402fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x402D3000 );

‎tools/sdk/ld/eagle.flash.1m192.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x402CB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x000C9000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x402C9000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x402fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x402CB000 );

‎tools/sdk/ld/eagle.flash.1m256.ld‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PROVIDE ( _FS_start = 0x402BB000 );
1919
PROVIDE ( _FS_end = 0x402FB000 );
2020
PROVIDE ( _FS_page = 0x100 );
2121
PROVIDE ( _FS_block = 0x1000 );
22-
PROVIDE ( _BOOTLOADER_DATA = 0x000B9000 );
23-
PROVIDE ( _SKETCH_AREA_end = _FS_start );
22+
PROVIDE ( _BOOTLOADER_DATA = 0x402B9000 );
23+
PROVIDE ( _SKETCH_AREA_end = _BOOTLOADER_DATA );
2424
PROVIDE ( _EEPROM_start = 0x402fb000 );
2525
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
2626
PROVIDE ( _SPIFFS_start = 0x402BB000 );

0 commit comments

Comments
 (0)