Merge branch 'feat/switch_h4_ci_build_to_mp_v6.0' into 'release/v6.0'

feat(esp32h4): switch default h4 build to mp version (v6.0)

See merge request espressif/esp-idf!43052
This commit is contained in:
Michael (XIAO Xufeng)
2025-11-06 00:22:51 +08:00
5 changed files with 3 additions and 8 deletions
@@ -3,7 +3,7 @@ comment "Read the help text of the option below for explanation"
config ESP32H4_SELECTS_REV_MP
bool "Select ESP32-H4 MP version"
default n
default y
help
Enable this option to select ESP32-H4 MP revision.
MP revisions have some hardware differences with Beta revision.
@@ -51,10 +51,6 @@ config ESP_ROM_HAS_LAYOUT_TABLE
bool
default y
config ESP_ROM_HAS_SPI_FLASH
bool
default y
config ESP_ROM_WITHOUT_REGI2C
bool
default y
@@ -18,7 +18,6 @@
#define ESP_ROM_HAS_HEAP_TLSF (1) // ROM has the implementation of the tlsf and multi-heap library
#define ESP_ROM_MULTI_HEAP_WALK_PATCH (1) // ROM does not contain the patch of multi_heap_walk()
#define ESP_ROM_HAS_LAYOUT_TABLE (1) // ROM has the layout table
#define ESP_ROM_HAS_SPI_FLASH (1) // ROM has the implementation of SPI Flash driver
#define ESP_ROM_WITHOUT_REGI2C (1) // ROM has the regi2c bug or rom does not support regi2c function
#define ESP_ROM_HAS_NEWLIB (1) // ROM has newlib (at least parts of it) functions included
#define ESP_ROM_HAS_NEWLIB_NANO_FORMAT (1) // ROM has the newlib nano versions of formatting functions
@@ -38,7 +38,7 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src);
ESP_LOG_ATTR_TAG(TAG, "clk");
void esp_rtc_init(void)
__attribute__((weak)) void esp_rtc_init(void)
{
#if SOC_PMU_SUPPORTED && !CONFIG_IDF_ENV_FPGA
pmu_init();
+1 -1
View File
@@ -38,7 +38,7 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src);
ESP_LOG_ATTR_TAG(TAG, "clk");
void esp_rtc_init(void)
__attribute__((weak)) void esp_rtc_init(void)
{
#if SOC_PMU_SUPPORTED && !CONFIG_IDF_ENV_FPGA
pmu_init();