Merge pull request #60 from dobairoland/feat/c6h2_get_security_info

Add ESP32-C6 and ESP32-H2 support for get_security_info
esp-rs · May 10, 2024 · f835fb8 · f835fb8
2 parents 09944f9 + 6f60852
commit f835fb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/ld/esp32c6_rom.x b/ld/esp32c6_rom.x
@@ -16,3 +16,4 @@ PROVIDE( esp_rom_spiflash_write_encrypted = 0x40000114 );
 PROVIDE( esp_rom_spiflash_write_enable = 0x4000015c );
 PROVIDE( esp_rom_spiflash_erase_area = 0x40000158 );
 PROVIDE( esp_flasher_rom_get_uart = 0x400000b4 );
+PROVIDE( get_security_info_proc = 0x400000bc );
diff --git a/ld/esp32h2_rom.x b/ld/esp32h2_rom.x
@@ -15,4 +15,5 @@ PROVIDE( esp_rom_spiflash_attach = 0x400001d4 );
 PROVIDE( esp_rom_spiflash_write_encrypted = 0x4000010c );
 PROVIDE( esp_rom_spiflash_write_enable = 0x40000154 );
 PROVIDE( esp_rom_spiflash_erase_area = 0x40000150 );
-PROVIDE( esp_flasher_rom_get_uart = 0x400000b4 );
+PROVIDE( esp_flasher_rom_get_uart = 0x400000b4 );
+PROVIDE( get_security_info_proc = 0x400000bc );
diff --git a/src/targets.rs b/src/targets.rs
@@ -243,12 +243,6 @@ pub trait EspCommon {
         }
     }
 
-    #[cfg(any(feature = "esp32c6", feature = "esp32h2"))]
-    fn get_security_info(&self) -> Result<[u8; SECURITY_INFO_BYTES], Error> {
-        Err(Error::InvalidCommand)
-    }
-
-    #[cfg(not(any(feature = "esp32c6", feature = "esp32h2")))]
     fn get_security_info(&self) -> Result<[u8; SECURITY_INFO_BYTES], Error> {
         let mut buf: [u8; SECURITY_INFO_BYTES] = [0; SECURITY_INFO_BYTES];