Skip to content

Commit 8da9a56

Browse files
committed
ci: fix location of initial bootloader
1 parent ede6023 commit 8da9a56

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Bootloader.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function(merge_binaries)
118118
# Build command for esptool.py merge_bin
119119
set(MERGE_CMD esptool.py --chip esp32s3 merge_bin -o ${CMAKE_SOURCE_DIR}/build/combined.bin
120120
--flash_mode dio --flash_size 16MB
121-
0x1000 ${BOOTLOADER_BIN}
121+
0x0 ${BOOTLOADER_BIN}
122122
0x8000 ${PARTITION_TABLE_BIN}
123123
0xf000 ${OTA_DATA_INITIAL_BIN}
124124
0x20000 ${MAIN_APP_BIN}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ esptool.py --chip esp32s3 merge_bin --format uf2 -o build/uf2.bin --flash_mode d
9393

9494
The following command merges all applications into binary image format:
9595
```shell
96-
esptool.py --chip esp32s3 merge_bin -o build/all.bin --flash_mode dio --flash_size 16MB \ 0x0 build/bootloader/bootloader.bin \
96+
esptool.py --chip esp32s3 merge_bin -o build/all.bin --flash_mode dio --flash_size 16MB \
97+
0x0 build/bootloader/bootloader.bin \
9798
0x8000 build/partition_table/partition-table.bin \
9899
0xf000 build/ota_data_initial.bin \
99100
0x20000 build/esp32-graphical-bootloader.bin \

0 commit comments

Comments
 (0)