Skip to content

Commit 7613377

Browse files
almir-okatonvlsianpu
almir-okato
authored and
nvlsianpu
committed
espressif: update default bootloader.conf files
These changes reflects the default flash layout configuration for most of Espressif boards on Zephyr. Signed-off-by: Almir Okato <[email protected]>
1 parent 9ac7296 commit 7613377

File tree

7 files changed

+43
-43
lines changed

7 files changed

+43
-43
lines changed

‎boot/espressif/port/esp32/bootloader.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
CONFIG_ESP_FLASH_SIZE=4MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x1000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0x150000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x170000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x3E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -107,5 +107,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
107107
# to not overlap with other flash regions)
108108
# CONFIG_EFUSE_VIRTUAL=1
109109
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
110-
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
110+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
111111
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

‎boot/espressif/port/esp32c2/bootloader.conf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
# CONFIG_ESP_BOOT_SWAP_USING_MOVE=y
77
# CONFIG_ESP_BOOT_UPGRADE_ONLY=y
88

9-
CONFIG_ESP_FLASH_SIZE=4MB
9+
CONFIG_ESP_FLASH_SIZE=2MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x0000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0xC0000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0xE0000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x1E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -93,5 +93,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
9393
# to not overlap with other flash regions)
9494
# CONFIG_EFUSE_VIRTUAL=1
9595
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
96-
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
96+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
9797
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

‎boot/espressif/port/esp32c3/bootloader.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
CONFIG_ESP_FLASH_SIZE=4MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x0000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0x1C0000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x1E0000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x3E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -94,5 +94,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
9494
# to not overlap with other flash regions)
9595
# CONFIG_EFUSE_VIRTUAL=1
9696
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
97-
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
97+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
9898
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

‎boot/espressif/port/esp32c6/bootloader.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
CONFIG_ESP_FLASH_SIZE=4MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x0000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0x1C0000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x1E0000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x3E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -94,5 +94,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
9494
# to not overlap with other flash regions)
9595
CONFIG_EFUSE_VIRTUAL=1
9696
CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
97-
CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
97+
CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
9898
CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

‎boot/espressif/port/esp32h2/bootloader.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
CONFIG_ESP_FLASH_SIZE=4MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x0000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0x1C0000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x1E0000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x3E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -96,5 +96,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
9696
# to not overlap with other flash regions)
9797
# CONFIG_EFUSE_VIRTUAL=1
9898
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
99-
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
99+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
100100
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

‎boot/espressif/port/esp32s2/bootloader.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
CONFIG_ESP_FLASH_SIZE=4MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x1000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0x1C0000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x1E0000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x3E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -90,5 +90,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
9090
# to not overlap with other flash regions)
9191
# CONFIG_EFUSE_VIRTUAL=1
9292
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
93-
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
93+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
9494
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

‎boot/espressif/port/esp32s3/bootloader.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
CONFIG_ESP_FLASH_SIZE=4MB
1010
CONFIG_ESP_BOOTLOADER_SIZE=0xF000
1111
CONFIG_ESP_BOOTLOADER_OFFSET=0x0000
12-
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x10000
13-
CONFIG_ESP_APPLICATION_SIZE=0x100000
14-
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x110000
12+
CONFIG_ESP_IMAGE0_PRIMARY_START_ADDRESS=0x20000
13+
CONFIG_ESP_APPLICATION_SIZE=0x150000
14+
CONFIG_ESP_IMAGE0_SECONDARY_START_ADDRESS=0x170000
1515
CONFIG_ESP_MCUBOOT_WDT_ENABLE=y
16-
CONFIG_ESP_SCRATCH_OFFSET=0x210000
17-
CONFIG_ESP_SCRATCH_SIZE=0x40000
16+
CONFIG_ESP_SCRATCH_OFFSET=0x3E0000
17+
CONFIG_ESP_SCRATCH_SIZE=0x1F000
1818

1919
# When enabled, prevents updating image to an older version
2020
# CONFIG_ESP_DOWNGRADE_PREVENTION=y
@@ -114,5 +114,5 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
114114
# to not overlap with other flash regions)
115115
# CONFIG_EFUSE_VIRTUAL=1
116116
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
117-
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
117+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x10000
118118
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

0 commit comments

Comments
 (0)