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

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
Test
  • Loading branch information
@davisonja
davisonja committed Jan 4, 2017
commit 535bc783613763b169796fe60b227ae76c2ee71e
3 changes: 3 additions & 0 deletions bootloaders/eboot/eboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ int find_app_start(const uint32_t flash_addr)
}
count += 1;
} while ((image_header.magic != 0xe9) && (count < 4));
if (count >= 4) {
return 0;
}
return pos;
}

Expand Down
0