8000 Merge eboot changes from davisonja by Androbin · Pull Request #6533 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Merge eboot changes from davisonja #6533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Merge eboot changes from davisonja #6533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
448e2f3
WIP: Flash-stored OTA commands
davisonja Jan 4, 2017
535bc78
Test
davisonja Jan 4, 2017
d3238f9
Merge remote-tracking branch 'remotes/upstream/master'
davisonja Jan 18, 2017
3a33377
Sync with upstream, reimport changes.
davisonja Jan 18, 2017
2762d25
Tweak of platform.txt to specify SPIFFS start based on settings from …
davisonja Jan 19, 2017
678e332
Merge branch 'master' of https://github.com/esp8266/Arduino
davisonja Jun 13, 2017
c752acc
Comment out my modified compiler.c.elf.flags line in platform.txt aft…
davisonja Jun 13, 2017
60fd114
Merge branch 'master' of https://github.com/esp8266/Arduino
davisonja Jun 27, 2017
b97eec3
commit of draft parseBoards.py
davisonja Oct 12, 2017
421ba90
Quick tidy up of parseBoards.py discarding unused parts
davisonja Oct 12, 2017
c8adea7
Merge remote-tracking branch 'upstream/master'
davisonja Apr 23, 2018
eaca0c7
Merge branch 'master' of github.com:esp8266/Arduino
davisonja Jun 25, 2018
f3a6111
Merge eboot changes from davisonja
Androbin Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tweak of platform.txt to specify SPIFFS start based on settings from … 
…boards.txt
  • Loading branch information
@davisonja
davisonja committed Jan 19, 2017
commit 2762d256fe3b6a6b1e200fa3797b778fd68c6573
2 changes: 1 addition & 1 deletion cores/esp8266/flash_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ extern uint32_t _ESP8266_AR_APP_START;

#define FLASH_SECTOR_SIZE 0x1000
#define FLASH_BLOCK_SIZE 0x10000
#define APP_START_OFFSET (&_ESP8266_AR_APP_START - 0x40200000)
#define APP_START_OFFSET ((uint32_t) (&_ESP8266_AR_APP_START) - 0x40200000)

typedef struct {
unsigned char magic;
Expand Down
4 changes: 2 additions & 2 deletions platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implici
compiler.S.cmd=xtensa-lx106-elf-gcc
compiler.S.flags=-c -g -x assembler-with-cpp -MMD -mlongcalls

compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -u _printf_float -u _scanf_float -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,register_chipv6_phy
compiler.c.elf.flags=-g {compiler.warning_flags} -Os -nostdlib -Wl,--no-check-sections -u call_user_start -u _printf_float -u _scanf_float -Wl,-static "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.libc.path}/lib" -Wl,--defsym=_SPIFFS_start_offset={build.spiffs_start} "-T{build.flash_ld}" -Wl,--gc-sections -Wl,-wrap,system_restart_local -Wl,-wrap,register_chipv6_phy

compiler.c.elf.cmd=xtensa-lx106-elf-gcc
compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -laxtls -lespnow -lsmartconfig -lmesh -lwpa2 -lstdc++ -lm -lc -lgcc
Expand Down Expand Up @@ -83,7 +83,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.fla
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/arduino.ar" "{object_file}"

## Combine gc-sections, archives, and objects
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/arduino.ar" {compiler.c.elf.libs} -Wl,--end-group "-L{build.path}"

## Create eeprom
recipe.objcopy.eep.pattern=
Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/ld/eagle.flash.4m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MEMORY

_BOOTLOADER_SPIFFS_OFFSET = DEFINED(eboot_get_flash_block_size) ? 0x2000 : 0;

PROVIDE ( _SPIFFS_start = 0x40300000 + _BOOTLOADER_SPIFFS_OFFSET );
PROVIDE ( _SPIFFS_start = 0x40200000 + _BOOTLOADER_SPIFFS_OFFSET + _SPIFFS_start_offset );
PROVIDE ( _SPIFFS_end = 0x405FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );
Expand Down
6 changes: 5 additions & 1 deletion tools/sdk/ld/eagle.flash.4m1m.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ MEMORY
irom0_0_seg : org = 0x40201010, len = 0xfeff0
}

PROVIDE ( _SPIFFS_start = 0x40500000 );
_BOOTLOADER_SPIFFS_OFFSET = DEFINED(eboot_get_flash_block_size) ? 0x2000 : 0;

PROVIDE ( _SPIFFS_start = 0x40200000 + _BOOTLOADER_SPIFFS_OFFSET + _SPIFFS_start_offset );
PROVIDE ( _SPIFFS_end = 0x405FB000 );
PROVIDE ( _SPIFFS_page = 0x100 );
PROVIDE ( _SPIFFS_block = 0x2000 );
PROVIDE ( _BOOTLOADER_DATA = DEFINED(eboot_get_flash_block_size) ? _SPIFFS_start - _BOOTLOADER_SPIFFS_OFFSET : 0 );
PROVIDE ( _SKETCH_AREA_end = DEFINED(eboot_get_flash_block_size) ? _BOOTLOADER_DATA : _SPIFFS_start );

INCLUDE "../ld/eagle.app.v6.common.ld"
0