refactor: remove combined binary creation script and related configurations

This commit is contained in:
Manuel Weiser 2025-02-15 07:14:12 +01:00
parent c21be92e98
commit a55cce854e
3 changed files with 0 additions and 87 deletions

View File

@ -1,68 +0,0 @@
Import("env")
from os.path import join, exists
import shutil
import os
def combine_binaries(source, target, env):
# Define paths for binary files
build_dir = env.subst("$BUILD_DIR")
project_dir = env.subst("$PROJECT_DIR")
combined_bin = join(build_dir, "combined.bin")
firmware_bin = join(build_dir, "firmware.bin")
spiffs_bin = join(build_dir, "spiffs.bin")
# Define target firmware path
firmware_dir = join(project_dir, "firmware")
target_firmware = join(firmware_dir, "filaman.bin")
# Build firmware if it doesn't exist
if not exists(firmware_bin):
print("Building firmware...")
env.Execute("pio run -t buildprog")
# Build SPIFFS if it doesn't exist
if not exists(spiffs_bin):
print("Building SPIFFS image...")
env.Execute("pio run -t buildfs")
# Check if files exist after build attempts
if not exists(firmware_bin):
raise Exception("Firmware binary not found at: " + firmware_bin)
if not exists(spiffs_bin):
raise Exception("SPIFFS binary not found at: " + spiffs_bin)
print("Found firmware at:", firmware_bin)
print("Found SPIFFS at:", spiffs_bin)
# Command to merge firmware and SPIFFS
merge_command = (
"esptool.py --chip esp32 merge_bin -o {combined_bin} "
"--flash_mode dio --flash_freq 40m --flash_size 4MB "
"0x10000 {firmware_bin} 0x310000 {spiffs_bin}"
).format(
combined_bin=combined_bin,
firmware_bin=firmware_bin,
spiffs_bin=spiffs_bin
)
print("Executing merge command:", merge_command)
env.Execute(merge_command)
# Create firmware directory if it doesn't exist
if not exists(firmware_dir):
os.makedirs(firmware_dir)
# Move combined binary to target location
print(f"Moving combined binary to {target_firmware}")
shutil.copy2(combined_bin, target_firmware)
print(f"Binary successfully moved to {target_firmware}")
# Register the custom target with explicit dependencies
env.AddCustomTarget(
name="combine_binaries",
dependencies=["buildfs", "buildprog"],
actions=[combine_binaries],
title="Combine Firmware & SPIFFS",
description="Combines firmware.bin and spiffs.bin into a single binary"
)

View File

@ -1,6 +0,0 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x4000,
otadata, data, ota, 0xd000, 0x2000,
app0, app, ota_0, 0x10000, 0x180000,
app1, app, ota_1, 0x190000,0x180000,
spiffs, data, spiffs, 0x310000,0x0F0000,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x4000
3 otadata data ota 0xd000 0x2000
4 app0 app ota_0 0x10000 0x180000
5 app1 app ota_1 0x190000 0x180000
6 spiffs data spiffs 0x310000 0x0F0000

View File

@ -27,9 +27,7 @@ lib_deps =
digitaldragon/SSLClient @ ^1.3.2 digitaldragon/SSLClient @ ^1.3.2
; Enable SPIFFS upload ; Enable SPIFFS upload
board_build.partitions = partitions.csv
board_build.filesystem = spiffs board_build.filesystem = spiffs
board_upload.flash_size = 4MB
board_build.spiffs_create = yes board_build.spiffs_create = yes
board_build.spiffs.partition = 2M board_build.spiffs.partition = 2M
board_build.spiffs.upload_size = 2M board_build.spiffs.upload_size = 2M
@ -44,14 +42,3 @@ build_flags =
extra_scripts = extra_scripts =
pre:gzip_files.py pre:gzip_files.py
pre:extra_script.py pre:extra_script.py
post:$PROJECT_DIR/create_combined_binary.py
# Add custom target for combining binaries
custom_targets =
combine_binaries
# Define the build sequence
targets =
buildfs # Build SPIFFS image
buildprog # Build firmware
#combine_binaries # Combine both binaries