From b72df43a3f4d3bf1d57094eb0182cfcc773007ac Mon Sep 17 00:00:00 2001 From: morris Date: Wed, 5 Jul 2023 22:54:01 +0800 Subject: [PATCH] refactor(esp_lcd): control hal function placement in the esp_lcd component because G1 component can't rely on G2 component, thus we shouldn't use the esp_lcd's Kconfig in the hal's linker.lf --- components/esp_lcd/linker.lf | 8 +++++++- components/hal/linker.lf | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/esp_lcd/linker.lf b/components/esp_lcd/linker.lf index 149801e604..e46cfad3d9 100644 --- a/components/esp_lcd/linker.lf +++ b/components/esp_lcd/linker.lf @@ -1,5 +1,11 @@ -[mapping:esp_lcd] +[mapping:esp_lcd_driver] archive: libesp_lcd.a entries: if LCD_RGB_ISR_IRAM_SAFE = y: esp_lcd_common: lcd_com_mount_dma_data (noflash) + +[mapping:esp_lcd_hal] +archive: libhal.a +entries: + if LCD_RGB_ISR_IRAM_SAFE = y: + lcd_hal: lcd_hal_cal_pclk_freq (noflash) diff --git a/components/hal/linker.lf b/components/hal/linker.lf index 07f6e5d51f..43af19ec1e 100644 --- a/components/hal/linker.lf +++ b/components/hal/linker.lf @@ -34,8 +34,6 @@ entries: timer_hal_iram (noflash) if GPIO_CTRL_FUNC_IN_IRAM = y: gpio_hal: gpio_hal_intr_disable (noflash) - if LCD_RGB_ISR_IRAM_SAFE = y: - lcd_hal: lcd_hal_cal_pclk_freq (noflash) if ADC_ONESHOT_CTRL_FUNC_IN_IRAM = y: adc_oneshot_hal (noflash) if COMPILER_OPTIMIZATION_DEBUG = y: