alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-01-19 14:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/p4_eco_5_rom_tests' into 'master'

Browse Source 
fix(rom): fixed systimer hal implementation from ROM always being used on P4

Closes IDF-14417 and IDF-14420

See merge request espressif/esp-idf!43538
This commit is contained in:
Marius Vikhammer
2025-11-21 09:21:53 +08:00
parent 69a5c7384f 4ebad0a47d
commit 963bc0fa5e
5 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_rom/esp32h4/ld/esp32h4.rom.beta5.systimer.ld
View File

@@ -9,8 +9,10 @@
***************************************/
/* Functions */
systimer_hal_init = 0x4000039c;
systimer_hal_deinit = 0x400003a0;
/* The following ROM functions are commented out because they're patched in the esp_rom_systimer.c */
/* systimer_hal_init = 0x4000039c; */
/* systimer_hal_deinit = 0x400003a0; */
systimer_hal_set_tick_rate_ops = 0x400003a4;
systimer_hal_get_counter_value = 0x400003a8;
systimer_hal_get_time = 0x400003ac;

6
components/esp_rom/esp32h4/ld/esp32h4.rom.systimer.ld
View File

@@ -18,8 +18,10 @@
***************************************/
/* Functions */
systimer_hal_init = 0x4000036c;
systimer_hal_deinit = 0x40000370;
/* The following ROM functions are commented out because they're patched in the esp_rom_systimer.c */
/* systimer_hal_init = 0x4000036c; */
/* systimer_hal_deinit = 0x40000370; */
systimer_hal_set_tick_rate_ops = 0x40000374;
systimer_hal_get_counter_value = 0x40000378;
systimer_hal_get_time = 0x4000037c;

22
components/esp_rom/esp32p4/ld/esp32p4.rom.eco5.ld
View File

@@ -170,28 +170,6 @@ rom_spiflash_legacy_data = 0x4ffbffe8;
g_flash_guard_ops = 0x4ffbfff0;
/***************************************
Group hal_systimer
***************************************/
/* Functions */
systimer_hal_init = 0x4fc00228;
systimer_hal_deinit = 0x4fc0022c;
systimer_hal_set_tick_rate_ops = 0x4fc00230;
systimer_hal_get_counter_value = 0x4fc00234;
systimer_hal_get_time = 0x4fc00238;
systimer_hal_set_alarm_target = 0x4fc0023c;
systimer_hal_set_alarm_period = 0x4fc00240;
systimer_hal_get_alarm_value = 0x4fc00244;
systimer_hal_enable_alarm_int = 0x4fc00248;
systimer_hal_on_apb_freq_update = 0x4fc0024c;
systimer_hal_counter_value_advance = 0x4fc00250;
systimer_hal_enable_counter = 0x4fc00254;
systimer_hal_select_alarm_mode = 0x4fc00258;
systimer_hal_connect_alarm_counter = 0x4fc0025c;
systimer_hal_counter_can_stall_by_cpu = 0x4fc00260;
/***************************************
Group cache
***************************************/

4
components/esp_rom/test_apps/.build-test-rules.yml
View File

@@ -10,10 +10,6 @@ components/esp_rom/test_apps/rom_impl_components:
- if: CONFIG_NAME == "rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1))
- if: CONFIG_NAME == "no_rom_impl_components" and ((ESP_ROM_HAS_HAL_WDT != 1 and ESP_ROM_HAS_HAL_SYSTIMER != 1) and (ESP_ROM_HAS_HEAP_TLSF != 1 and ESP_ROM_HAS_SPI_FLASH != 1))
- if: SOC_WDT_SUPPORTED != 1
disable_test:
- if: IDF_TARGET == "esp32p4"
temporary: true
reason: p4 rev3 migration # TODO: IDF-14417
components/esp_rom/test_apps/rom_tests:
disable_test:

1
components/esp_rom/test_apps/rom_impl_components/pytest_esp_rom_impl_components.py
View File

@@ -15,6 +15,5 @@ from pytest_embedded_idf.utils import idf_parametrize
indirect=True,
)
@idf_parametrize('target', ['supported_targets'], indirect=['target'])
@pytest.mark.temp_skip_ci(targets=['esp32p4'], reason='p4 rev3 migration # TODO: IDF-14417')
def test_esp_rom_impl_components(dut: Dut) -> None:
dut.run_all_single_board_cases()