Installer was missing bootloader images

.. so it would not work on a freshly-erased ESP32
bdring · Sep 2, 2021 · 8e2ed9c · 8e2ed9c
1 parent 1da4c53
commit 8e2ed9c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/build-release.py b/build-release.py
@@ -83,6 +83,11 @@ def buildFs(pioEnv, verbose=True, extraArgs=None):
         # Put common/spiffs.bin in the archive
         obj = 'spiffs.bin'
         zipObj.write(os.path.join(pioPath, 'noradio', obj), os.path.join('common', obj))
+        tools = os.path.join(os.path.expanduser('~'),'.platformio','packages','framework-arduinoespressif32','tools')
+        bootloader = 'bootloader_dio_80m.bin'
+        zipObj.write(os.path.join(tools, 'sdk', 'bin', bootloader), os.path.join('common', bootloader))
+        bootapp = 'boot_app0.bin';
+        zipObj.write(os.path.join(tools, "partitions", bootapp), os.path.join('common', bootapp))
 
         for envName in ['wifi','bt','wifibt','noradio']:
             exitCode = buildEnv(envName, verbose=verbose)

diff --git a/install_scripts/install-linux.sh b/install_scripts/install-linux.sh
@@ -4,10 +4,11 @@ EsptoolPath=../linux-amd64/esptool
 
 SetupArgs="--chip esp32 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect"
 
-Bootloader="0x1000 bootloader_qio_80m.bin"
+Bootloader="0x1000 ../common/bootloader_dio_80m.bin"
+Bootapp="0xe000 ../common/boot_app0.bin"
 Firmware="0x10000 firmware.bin"
 Partitions="0x8000 partitions.bin"
 LocalFS="0x3d0000 ../common/spiffs.bin"
 
-echo $EsptoolPath $SetupArgs $Firmware $Partitions $LocalFs
-$EsptoolPath $SetupArgs $Firmware $Partitions $LocalFs
+echo $EsptoolPath $SetupArgs $Bootloader $Bootapp $Firmware $Partitions $LocalFs
+$EsptoolPath $SetupArgs $Bootloader $Bootapp $Firmware $Partitions $LocalFs
diff --git a/install_scripts/install-macos.sh b/install_scripts/install-macos.sh
@@ -4,10 +4,11 @@ EsptoolPath=../macos/esptool
 
 SetupArgs="--chip esp32 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect"
 
-Bootloader="0x1000 bootloader_qio_80m.bin"
+Bootloader="0x1000 ../common/bootloader_dio_80m.bin"
+Bootapp="0xe000 ../common/boot_app0.bin"
 Firmware="0x10000 firmware.bin"
 Partitions="0x8000 partitions.bin"
 LocalFS="0x3d0000 ../common/spiffs.bin"
 
-echo $EsptoolPath $SetupArgs $Firmware $Partitions $LocalFs
-$EsptoolPath $SetupArgs $Firmware $Partitions $LocalFs
+echo $EsptoolPath $SetupArgs $Bootloader $Bootapp $Firmware $Partitions $LocalFs
+$EsptoolPath $SetupArgs $Bootloader $Bootapp $Firmware $Partitions $LocalFs
diff --git a/install_scripts/install-win.bat b/install_scripts/install-win.bat
@@ -4,12 +4,13 @@ set EsptoolPath=..\win64\esptool.exe
 
 set SetupArgs=--chip esp32 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect
 
-set Bootloader=0x1000 bootloader_qio_80m.bin
+set Bootloader=0x1000 ..\common\bootloader_dio_80m.bin
+set Bootapp=0xe000 ..\common\boot_app0.bin
 set Firmware=0x10000 firmware.bin
 set Partitions=0x8000 partitions.bin
 set LocalFS=0x3d0000 ..\common\spiffs.bin
 
-echo %EsptoolPath% %SetupArgs% %Firmware% %Partitions% %LocalFs%
-%EsptoolPath% %SetupArgs% %Firmware% %Partitions% %LocalFs%
+echo %EsptoolPath% %SetupArgs% %Bootloader% %Bootapp% %Firmware% %Partitions% %LocalFs%
+%EsptoolPath% %SetupArgs% %Bootloader% %Bootapp% %Firmware% %Partitions% %LocalFs%
 
 pause