Skip to content

Commit b8c710d

Browse files
sylvioalvesfabiobaltieri
authored andcommitted
soc: espressif: fix chip revision reading
Make sure chip revision reading returns real value for some especific chip revision, which is currently failing. Signed-off-by: Sylvio Alves <[email protected]>
1 parent 92a86b3 commit b8c710d

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

soc/espressif/esp32/default.ld

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ SECTIONS
366366
*libzephyr.a:esp_psram_impl_quad.*(.literal .literal.* .text .text.*)
367367

368368
/* [mapping:hal] */
369+
*libzephyr.a:efuse_hal.*(.literal .literal.* .text .text.*)
369370
*libzephyr.a:mmu_hal.*(.literal .literal.* .text .text.*)
370371
*libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
371372
*libzephyr.a:cache_esp32.*(.literal .text .literal.* .text.*)
@@ -603,7 +604,7 @@ SECTIONS
603604
*libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)
604605

605606
/* [mapping:hal] */
606-
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
607+
*libzephyr.a:efuse_hal.*(.rodata .rodata.*)
607608
*libzephyr.a:mmu_hal.*(.rodata .rodata.*)
608609
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
609610
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)

soc/espressif/esp32c2/default.ld

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ SECTIONS
241241
*libc.a:*(.literal .text .literal.* .text.*)
242242

243243
/* [mapping:hal] */
244+
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
244245
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
245246
*libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
246247
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -467,7 +468,7 @@ SECTIONS
467468
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
468469

469470
/* [mapping:hal] */
470-
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
471+
*libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
471472
*libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
472473
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
473474
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)

soc/espressif/esp32c3/default.ld

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ SECTIONS
335335
*libc.a:*(.literal .text .literal.* .text.*)
336336

337337
/* [mapping:hal] */
338+
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
338339
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
339340
*libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
340341
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -560,7 +561,7 @@ SECTIONS
560561
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
561562

562563
/* [mapping:hal] */
563-
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
564+
*libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
564565
*libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
565566
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
566567
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)

soc/espressif/esp32c6/default.ld

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ SECTIONS
344344
*libc.a:*(.literal .text .literal.* .text.*)
345345

346346
/* [mapping:hal] */
347+
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
347348
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
348349
*libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
349350
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
@@ -571,7 +572,7 @@ SECTIONS
571572
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)
572573

573574
/* [mapping:hal] */
574-
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
575+
*libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
575576
*libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
576577
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
577578
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)

soc/espressif/esp32s2/default.ld

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ SECTIONS
378378
*libzephyr.a:esp_psram_impl_octal.*(.literal .literal.* .text .text.*)
379379

380380
/* [mapping:hal] */
381+
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
381382
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
382383
*libzephyr.a:cache_hal.*(.literal .text .literal.* .text.*)
383384
*libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
@@ -618,7 +619,7 @@ SECTIONS
618619
*libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)
619620

620621
/* [mapping:hal] */
621-
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
622+
*libzephyr.a:efuse_hal.*(.rodata .rodata.*)
622623
*libzephyr.a:mmu_hal.*(.rodata .rodata.*)
623624
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
624625
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)

soc/espressif/esp32s3/default.ld

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ SECTIONS
640640
*libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)
641641

642642
/* [mapping:hal] */
643+
*libzephyr.a:efuse_hal.*(.rodata .rodata.*)
643644
*libzephyr.a:mmu_hal.*(.rodata .rodata.*)
644645
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
645646
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)

0 commit comments

Comments
 (0)