Skip to content

Commit

Permalink
soc: espressif: fix chip revision reading
Browse files Browse the repository at this point in the history
Make sure chip revision reading returns real value
for some especific chip revision, which is currently
failing.

Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
  • Loading branch information
sylvioalves authored and fabiobaltieri committed Mar 4, 2025
1 parent 92a86b3 commit b8c710d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
3 changes: 2 additions & 1 deletion soc/espressif/esp32/default.ld
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ SECTIONS
*libzephyr.a:esp_psram_impl_quad.*(.literal .literal.* .text .text.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .literal.* .text .text.*)
*libzephyr.a:mmu_hal.*(.literal .literal.* .text .text.*)
*libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
*libzephyr.a:cache_esp32.*(.literal .text .literal.* .text.*)
Expand Down Expand Up @@ -603,7 +604,7 @@ SECTIONS
*libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:efuse_hal.*(.rodata .rodata.*)
*libzephyr.a:mmu_hal.*(.rodata .rodata.*)
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
Expand Down
3 changes: 2 additions & 1 deletion soc/espressif/esp32c2/default.ld
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ SECTIONS
*libc.a:*(.literal .text .literal.* .text.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
Expand Down Expand Up @@ -467,7 +468,7 @@ SECTIONS
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
Expand Down
3 changes: 2 additions & 1 deletion soc/espressif/esp32c3/default.ld
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ SECTIONS
*libc.a:*(.literal .text .literal.* .text.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
Expand Down Expand Up @@ -560,7 +561,7 @@ SECTIONS
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
Expand Down
3 changes: 2 additions & 1 deletion soc/espressif/esp32c6/default.ld
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ SECTIONS
*libc.a:*(.literal .text .literal.* .text.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:spi_flash_hal_iram.*(.literal .literal.* .text .text.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.literal .text .literal.* .text.*)
Expand Down Expand Up @@ -571,7 +572,7 @@ SECTIONS
*libzephyr.a:cache_utils.*(.rodata .rodata.* .srodata .srodata.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:efuse_hal.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:mmu_hal.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.* .srodata .srodata.*)
Expand Down
3 changes: 2 additions & 1 deletion soc/espressif/esp32s2/default.ld
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ SECTIONS
*libzephyr.a:esp_psram_impl_octal.*(.literal .literal.* .text .text.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:mmu_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:cache_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:cache_utils.*(.literal .text .literal.* .text.*)
Expand Down Expand Up @@ -618,7 +619,7 @@ SECTIONS
*libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.literal .text .literal.* .text.*)
*libzephyr.a:efuse_hal.*(.rodata .rodata.*)
*libzephyr.a:mmu_hal.*(.rodata .rodata.*)
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
Expand Down
1 change: 1 addition & 0 deletions soc/espressif/esp32s3/default.ld
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ SECTIONS
*libzephyr.a:esp_psram_impl_quad.*(.rodata .rodata.*)

/* [mapping:hal] */
*libzephyr.a:efuse_hal.*(.rodata .rodata.*)
*libzephyr.a:mmu_hal.*(.rodata .rodata.*)
*libzephyr.a:spi_flash_hal_iram.*(.rodata .rodata.*)
*libzephyr.a:spi_flash_encrypt_hal_iram.*(.rodata .rodata.*)
Expand Down

0 comments on commit b8c710d

Please sign in to comment.