From dacc1067583febd49b2171cbeea3878c87e00fdf Mon Sep 17 00:00:00 2001 From: Chen Jichang Date: Wed, 22 Oct 2025 16:04:52 +0800 Subject: [PATCH] feat(esp32h4): switch default h4 build to mp version --- components/esp_hw_support/port/esp32h4/Kconfig.hw_support | 2 +- components/esp_rom/esp32h4/Kconfig.soc_caps.in | 4 ---- components/esp_rom/esp32h4/esp_rom_caps.h | 1 - components/esp_system/port/soc/esp32h21/clk.c | 2 +- components/esp_system/port/soc/esp32h4/clk.c | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/components/esp_hw_support/port/esp32h4/Kconfig.hw_support b/components/esp_hw_support/port/esp32h4/Kconfig.hw_support index 2945c1b94c..22a251a477 100644 --- a/components/esp_hw_support/port/esp32h4/Kconfig.hw_support +++ b/components/esp_hw_support/port/esp32h4/Kconfig.hw_support @@ -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. diff --git a/components/esp_rom/esp32h4/Kconfig.soc_caps.in b/components/esp_rom/esp32h4/Kconfig.soc_caps.in index 168f73e1b7..d40437c43e 100644 --- a/components/esp_rom/esp32h4/Kconfig.soc_caps.in +++ b/components/esp_rom/esp32h4/Kconfig.soc_caps.in @@ -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 diff --git a/components/esp_rom/esp32h4/esp_rom_caps.h b/components/esp_rom/esp32h4/esp_rom_caps.h index fc1e51202a..5276df390b 100644 --- a/components/esp_rom/esp32h4/esp_rom_caps.h +++ b/components/esp_rom/esp32h4/esp_rom_caps.h @@ -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 diff --git a/components/esp_system/port/soc/esp32h21/clk.c b/components/esp_system/port/soc/esp32h21/clk.c index 54b019c7e3..5395cc4f11 100644 --- a/components/esp_system/port/soc/esp32h21/clk.c +++ b/components/esp_system/port/soc/esp32h21/clk.c @@ -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(); diff --git a/components/esp_system/port/soc/esp32h4/clk.c b/components/esp_system/port/soc/esp32h4/clk.c index bec414fb2f..74ba4461b5 100644 --- a/components/esp_system/port/soc/esp32h4/clk.c +++ b/components/esp_system/port/soc/esp32h4/clk.c @@ -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();