tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-22 13:29:01 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

builder: fix ESP32 QEMU XIP image offsets

Browse Source
This commit is contained in:
Jake Bailey
2026-08-10 11:22:49 -07:00
committed by Ron Evans
parent ada22bc691
commit 1991b00395
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/esp.go
+6 -3
View File
@@ -111,9 +111,6 @@ func makeESPFirmwareImage(infile, outfile, format string) error {
// Compute the size of the RAM portion of the image (everything the ROM // Compute the size of the RAM portion of the image (everything the ROM
// bootloader loads, up to and including the appended SHA256 hash). // bootloader loads, up to and including the appended SHA256 hash).
ramImageSize := 0 ramImageSize := 0
if makeImage {
ramImageSize += 4096
}
ramImageSize += 24 // image header (8) + trailer fields (16) ramImageSize += 24 // image header (8) + trailer fields (16)
for _, seg := range segments { for _, seg := range segments {
ramImageSize += 8 + len(seg.data) // segment header + data (4-aligned) ramImageSize += 8 + len(seg.data) // segment header + data (4-aligned)
@@ -284,6 +281,9 @@ func makeESPFirmwareImage(infile, outfile, format string) error {
dromSize := 0 dromSize := 0
if len(dromSegs) > 0 { if len(dromSegs) > 0 {
targetImageOffset := int(dromFlashAddr - flashBase) targetImageOffset := int(dromFlashAddr - flashBase)
if makeImage {
targetImageOffset = int(dromFlashAddr)
}
if outf.Len() > targetImageOffset { if outf.Len() > targetImageOffset {
return fmt.Errorf("ESP32: RAM segments too large (%d bytes), overlap DROM at flash 0x%x", outf.Len(), dromFlashAddr) return fmt.Errorf("ESP32: RAM segments too large (%d bytes), overlap DROM at flash 0x%x", outf.Len(), dromFlashAddr)
} }
@@ -304,6 +304,9 @@ func makeESPFirmwareImage(infile, outfile, format string) error {
} }
iromFlashAddr := dromFlashAddr + uint32(dromPages)*pageSize iromFlashAddr := dromFlashAddr + uint32(dromPages)*pageSize
targetImageOffset := int(iromFlashAddr - flashBase) targetImageOffset := int(iromFlashAddr - flashBase)
if makeImage {
targetImageOffset = int(iromFlashAddr)
}
if outf.Len() > targetImageOffset { if outf.Len() > targetImageOffset {
return fmt.Errorf("ESP32: DROM too large, overlaps IROM at flash 0x%x", iromFlashAddr) return fmt.Errorf("ESP32: DROM too large, overlaps IROM at flash 0x%x", iromFlashAddr)
} }