Skip to content

Commit aa4fa2b

Browse files
committed
espressif: move the virtual eFuse offset config to .conf file
Move the Virtual eFuse offset in flash configuration from hardcoded value in sdkconfig.h to the .conf file. Signed-off-by: Almir Okato <[email protected]>
1 parent 0d9de63 commit aa4fa2b

File tree

16 files changed

+50
-25
lines changed

16 files changed

+50
-25
lines changed

boot/espressif/hal/include/esp32/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@
2525
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2626
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
2727
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
28-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
29-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
3028
#define CONFIG_EFUSE_MAX_BLK_LEN 192
3129
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32c2/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,5 @@
2424
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2525
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
2626
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
27-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
28-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
2927
#define CONFIG_EFUSE_MAX_BLK_LEN 256
3028
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32c3/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,5 @@
2323
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2424
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
2525
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
26-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
27-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
2826
#define CONFIG_EFUSE_MAX_BLK_LEN 256
2927
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32c6/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,5 @@
2424
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2525
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
2626
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
27-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
28-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
2927
#define CONFIG_EFUSE_MAX_BLK_LEN 256
3028
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32h2/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@
2525
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2626
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
2727
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
28-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
29-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
3028
#define CONFIG_EFUSE_MAX_BLK_LEN 256
3129
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32s2/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,5 @@
2323
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2424
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
2525
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
26-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
27-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
2826
#define CONFIG_EFUSE_MAX_BLK_LEN 256
2927
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32s3/sdkconfig.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@
2222
#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
2323
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
2424
#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
25-
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
26-
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
2725
#define CONFIG_EFUSE_MAX_BLK_LEN 256
2826
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/port/esp32/bootloader.conf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
100100
# CONFIG_SECURE_BOOT_ALLOW_JTAG=1
101101
# CONFIG_SECURE_BOOT_ALLOW_ROM_BASIC=1
102102

103-
# Options for enabling eFuse emulation in Flash
103+
# Options for enabling eFuse emulation in Flash (adjust
104+
# CONFIG_EFUSE_VIRTUAL_OFFSET accordingly in order
105+
# to not overlap with other flash regions)
104106
# CONFIG_EFUSE_VIRTUAL=1
105107
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
108+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
109+
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

boot/espressif/port/esp32c2/bootloader.conf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
8686
# and Flash Encryption at same time
8787
# CONFIG_SECURE_BOOT_FLASH_ENC_KEYS_BURN_TOGETHER=1
8888

89-
# Options for enabling eFuse emulation in Flash
89+
# Options for enabling eFuse emulation in Flash (adjust
90+
# CONFIG_EFUSE_VIRTUAL_OFFSET accordingly in order
91+
# to not overlap with other flash regions)
9092
# CONFIG_EFUSE_VIRTUAL=1
9193
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
94+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
95+
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

boot/espressif/port/esp32c3/bootloader.conf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
8787
# CONFIG_SECURE_BOOT_ALLOW_JTAG=1
8888
# CONFIG_SECURE_BOOT_ALLOW_ROM_BASIC=1
8989

90-
# Options for enabling eFuse emulation in Flash
90+
# Options for enabling eFuse emulation in Flash (adjust
91+
# CONFIG_EFUSE_VIRTUAL_OFFSET accordingly in order
92+
# to not overlap with other flash regions)
9193
# CONFIG_EFUSE_VIRTUAL=1
9294
# CONFIG_EFUSE_VIRTUAL_KEEP_IN_FLASH=1
95+
# CONFIG_EFUSE_VIRTUAL_OFFSET=0x250000
96+
# CONFIG_EFUSE_VIRTUAL_SIZE=0x2000

0 commit comments

Comments
 (0)