summaryrefslogtreecommitdiffstatshomepage
path: root/esp8266
diff options
context:
space:
mode:
Diffstat (limited to 'esp8266')
-rw-r--r--esp8266/modesp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/esp8266/modesp.c b/esp8266/modesp.c
index 4403dfde4b..1cd231f79f 100644
--- a/esp8266/modesp.c
+++ b/esp8266/modesp.c
@@ -629,7 +629,13 @@ STATIC mp_obj_t esp_flash_size(void) {
STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_size_obj, esp_flash_size);
STATIC mp_obj_t esp_flash_user_start(void) {
- return MP_OBJ_NEW_SMALL_INT(0x90000);
+ if ((*(uint32_t*)0x40200000 & 0xff00) == 0x100) {
+ // If there's just 1 loadable segment at the start of flash,
+ // we assume there's a yaota8266 bootloader.
+ return MP_OBJ_NEW_SMALL_INT(0x3c000 + 0x90000);
+ } else {
+ return MP_OBJ_NEW_SMALL_INT(0x90000);
+ }
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_flash_user_start_obj, esp_flash_user_start);