From 4f5700635e2f1982e862025b0ce7f3b49e6041ec Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Fri, 15 Jun 2018 10:03:44 +0800 Subject: [PATCH] feat(partition_table): Make other components to adjust app offset at ox10000 --- components/bootloader/subproject/main/bootloader_start.c | 4 +++- components/esp8266/ld/esp8266.ld | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/bootloader/subproject/main/bootloader_start.c b/components/bootloader/subproject/main/bootloader_start.c index 86c2dccb..99df7f6d 100644 --- a/components/bootloader/subproject/main/bootloader_start.c +++ b/components/bootloader/subproject/main/bootloader_start.c @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "sdkconfig.h" + #include #include @@ -308,5 +310,5 @@ void call_start_cpu(void) ets_printf("jump to run"); - jump_to_run_addr(0x1000); + jump_to_run_addr(CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET); } diff --git a/components/esp8266/ld/esp8266.ld b/components/esp8266/ld/esp8266.ld index 763da540..a5b2e5a1 100644 --- a/components/esp8266/ld/esp8266.ld +++ b/components/esp8266/ld/esp8266.ld @@ -27,7 +27,7 @@ MEMORY iram1_0_seg : org = 0x40100000, len = 0x8000 /* It is actually mapped to flash. */ - irom0_0_seg : org = 0x40201010, len = 0xFF000 - 0x10 + irom0_0_seg : org = 0x40200010 + CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET, len = 0x100000 - 0x10 - CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET /* RTC memory, persists over deep sleep. */ rtc_seg : org = 0x60001200, len = 0x200