Merge branch 'feature/use_esp_jpeg_for_example' into 'master'

examples/tjpgd: Use esp_jpeg component in tjpgd and SPI examples Closes IDF-5652 See merge request espressif/esp-idf!19464
espressif · Aug 18, 2022 · 5b48a33 · 5b48a33
2 parents 60d7945 + a00e877
commit 5b48a33
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 1,456 deletions.
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
@@ -18,7 +18,6 @@ else()
                         "patches/esp_rom_sys.c"
                         "patches/esp_rom_uart.c"
                         "patches/esp_rom_spiflash.c"
-                        "patches/esp_rom_tjpgd.c"
                         "patches/esp_rom_regi2c.c"
                         "patches/esp_rom_efuse.c")
     list(APPEND private_required_comp soc hal)

diff --git a/components/esp_rom/esp32/ld/esp32.rom.api.ld b/components/esp_rom/esp32/ld/esp32.rom.api.ld
@@ -1,12 +1,6 @@
 /**
  * ROM APIs
  */
-
-/* user may provide newer version of tjpgd */
-/* so here directly assign the symbols with the ROM API address to make sure one from rom is correctly linked */
-PROVIDE ( esp_rom_tjpgd_decomp = 0x400613e8 );
-PROVIDE ( esp_rom_tjpgd_prepare = 0x40060fa8 );
-
 PROVIDE ( esp_rom_crc32_le = crc32_le );
 PROVIDE ( esp_rom_crc16_le = crc16_le );
 PROVIDE ( esp_rom_crc8_le  = crc8_le );

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld
@@ -1,11 +1,6 @@
-/** ROM APIs
+/**
+ * ROM APIs
  */
-
-/* user may provide newer version of tjpgd */
-/* so here directly assign the symbols with the ROM API address to make sure one from rom is correctly linked */
-PROVIDE ( esp_rom_tjpgd_decomp = 0x40000108 );
-PROVIDE ( esp_rom_tjpgd_prepare = 0x40000104 );
-
 PROVIDE ( esp_rom_crc32_le = crc32_le );
 PROVIDE ( esp_rom_crc16_le = crc16_le );
 PROVIDE ( esp_rom_crc8_le  = crc8_le );

diff --git a/components/esp_rom/esp32h2/ld/rev1/esp32h2.rom.api.ld b/components/esp_rom/esp32h2/ld/rev1/esp32h2.rom.api.ld
@@ -6,9 +6,6 @@
 
 /** ROM APIs
  */
-PROVIDE ( esp_rom_tjpgd_decomp = 0x40000104 );
-PROVIDE ( esp_rom_tjpgd_prepare = 0x40000100 );
-
 PROVIDE ( esp_rom_crc32_le = crc32_le );
 PROVIDE ( esp_rom_crc16_le = crc16_le );
 PROVIDE ( esp_rom_crc8_le  = crc8_le );

diff --git a/components/esp_rom/esp32h2/ld/rev2/esp32h2.rom.api.ld b/components/esp_rom/esp32h2/ld/rev2/esp32h2.rom.api.ld
@@ -6,9 +6,6 @@
 
 /** ROM APIs
  */
-PROVIDE ( esp_rom_tjpgd_decomp = 0x40000104 );
-PROVIDE ( esp_rom_tjpgd_prepare = 0x40000100 );
-
 PROVIDE ( esp_rom_crc32_le = crc32_le );
 PROVIDE ( esp_rom_crc16_le = crc16_le );
 PROVIDE ( esp_rom_crc8_le  = crc8_le );

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld
@@ -1,12 +1,6 @@
 /**
  * ROM APIs
  */
-
-/* user may provide newer version of tjpgd */
-/* so here directly assign the symbols with the ROM API address to make sure one from rom is correctly linked */
-PROVIDE ( esp_rom_tjpgd_decomp = 0x40000864 );
-PROVIDE ( esp_rom_tjpgd_prepare = 0x40000858 );
-
 PROVIDE ( esp_rom_crc32_le = crc32_le );
 PROVIDE ( esp_rom_crc16_le = crc16_le );
 PROVIDE ( esp_rom_crc8_le  = crc8_le );

diff --git a/components/esp_rom/include/esp_rom_tjpgd.h b/components/esp_rom/include/esp_rom_tjpgd.h