ci: fix location of initial bootloader

georgik · Jul 18, 2024 · 8da9a56 · 8da9a56
1 parent ede6023
commit 8da9a56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Bootloader.cmake b/Bootloader.cmake
@@ -118,7 +118,7 @@ function(merge_binaries)
     # Build command for esptool.py merge_bin
     set(MERGE_CMD esptool.py --chip esp32s3 merge_bin -o ${CMAKE_SOURCE_DIR}/build/combined.bin
         --flash_mode dio --flash_size 16MB
-        0x1000 ${BOOTLOADER_BIN}
+        0x0 ${BOOTLOADER_BIN}
         0x8000 ${PARTITION_TABLE_BIN}
         0xf000 ${OTA_DATA_INITIAL_BIN}
         0x20000 ${MAIN_APP_BIN}

diff --git a/README.md b/README.md
@@ -93,7 +93,8 @@ esptool.py --chip esp32s3 merge_bin --format uf2 -o build/uf2.bin --flash_mode d
 
 The following command merges all applications into binary image format:
 ```shell
-esptool.py --chip esp32s3 merge_bin  -o build/all.bin --flash_mode dio --flash_size 16MB \ 0x0 build/bootloader/bootloader.bin \
+esptool.py --chip esp32s3 merge_bin  -o build/all.bin --flash_mode dio --flash_size 16MB \
+    0x0 build/bootloader/bootloader.bin \
     0x8000 build/partition_table/partition-table.bin \
     0xf000 build/ota_data_initial.bin \
     0x20000 build/esp32-graphical-bootloader.bin \