Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: lvgl: Rename the VDB custom section Kconfig name #83400

Merged
merged 1 commit into from
Jan 6, 2025
Merged

modules: lvgl: Rename the VDB custom section Kconfig name #83400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/nxp/mimxrt595_evk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
endif()

# Add custom linker section to relocate framebuffers to PSRAM
zephyr_linker_sources_ifdef(CONFIG_LV_Z_VBD_CUSTOM_SECTION
zephyr_linker_sources_ifdef(CONFIG_LV_Z_VDB_CUSTOM_SECTION
SECTIONS dc_ram.ld)
6 changes: 3 additions & 3 deletions boards/nxp/mimxrt595_evk/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int mimxrt595_evk_init(void)
}


#ifdef CONFIG_LV_Z_VBD_CUSTOM_SECTION
#ifdef CONFIG_LV_Z_VDB_CUSTOM_SECTION
extern char __flexspi2_start[];
extern char __flexspi2_end[];

Expand All @@ -358,14 +358,14 @@ static int init_psram_framebufs(void)
return 0;
}

#endif /* CONFIG_LV_Z_VBD_CUSTOM_SECTION */
#endif /* CONFIG_LV_Z_VDB_CUSTOM_SECTION */

#if CONFIG_REGULATOR
/* PMIC setup is dependent on the regulator API */
SYS_INIT(board_config_pmic, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY);
#endif

#ifdef CONFIG_LV_Z_VBD_CUSTOM_SECTION
#ifdef CONFIG_LV_Z_VDB_CUSTOM_SECTION
/* Framebuffers should be setup after PSRAM is initialized but before
* Graphics framework init
*/
Expand Down
2 changes: 1 addition & 1 deletion boards/renesas/ek_ra8d1/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ config MEMC

if LVGL

config LV_Z_VBD_CUSTOM_SECTION
config LV_Z_VDB_CUSTOM_SECTION
default y

endif # LVGL
Expand Down
2 changes: 1 addition & 1 deletion boards/shields/rk055hdmipi4m/boards/mimxrt595_evk_mimxrt595s_cm33.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Use external framebuffer memory
CONFIG_MCUX_DCNANO_LCDIF_EXTERNAL_FB_MEM=y
CONFIG_LV_Z_VBD_CUSTOM_SECTION=y
CONFIG_LV_Z_VDB_CUSTOM_SECTION=y
# Use FlexSPI2 for framebuffer (pSRAM is present on this bus)
CONFIG_MCUX_DCNANO_LCDIF_EXTERNAL_FB_ADDR=0x38400000
# M33 core and LCDIF both access FlexSPI2 through the same cache,
Expand Down
2 changes: 1 addition & 1 deletion boards/shields/rk055hdmipi4ma0/boards/mimxrt595_evk_mimxrt595s_cm33.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Use external framebuffer memory
CONFIG_MCUX_DCNANO_LCDIF_EXTERNAL_FB_MEM=y
CONFIG_LV_Z_VBD_CUSTOM_SECTION=y
CONFIG_LV_Z_VDB_CUSTOM_SECTION=y
# Use FlexSPI2 for framebuffer (pSRAM is present on this bus)
CONFIG_MCUX_DCNANO_LCDIF_EXTERNAL_FB_ADDR=0x38400000
# M33 core and LCDIF both access FlexSPI2 through the same cache,
Expand Down
2 changes: 1 addition & 1 deletion boards/shields/st_b_lcd40_dsi1_mb1166/boards/stm32h747i_disco_stm32h747xx_m7.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ config STM32_LTDC_FB_NUM
config LV_Z_DOUBLE_VDB
default y

config LV_Z_VBD_CUSTOM_SECTION
config LV_Z_VDB_CUSTOM_SECTION
default y

config LV_Z_FULL_REFRESH
Expand Down
2 changes: 1 addition & 1 deletion boards/st/stm32h747i_disco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
#

# Add custom linker section to relocate framebuffers to PSRAM
zephyr_linker_sources_ifdef(CONFIG_LV_Z_VBD_CUSTOM_SECTION
zephyr_linker_sources_ifdef(CONFIG_LV_Z_VDB_CUSTOM_SECTION
SECTIONS dc_ram.ld)
2 changes: 1 addition & 1 deletion boards/st/stm32h7b3i_dk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
#

# Add custom linker section to relocate framebuffers to PSRAM
zephyr_linker_sources_ifdef(CONFIG_LV_Z_VBD_CUSTOM_SECTION
zephyr_linker_sources_ifdef(CONFIG_LV_Z_VDB_CUSTOM_SECTION
SECTIONS dc_ram.ld)
2 changes: 1 addition & 1 deletion boards/st/stm32h7b3i_dk/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ config LV_Z_DOUBLE_VDB
config LV_Z_FULL_REFRESH
default y

config LV_Z_VBD_CUSTOM_SECTION
config LV_Z_VDB_CUSTOM_SECTION
default y

config LV_Z_FLUSH_THREAD
Expand Down
3 changes: 3 additions & 0 deletions doc/releases/migration-guide-4.1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ LVGL
:kconfig:option:`CONFIG_LV_Z_FLUSH_THREAD_PRIORITY` and its value is now interpreted as an
absolute priority instead of a cooperative one.

* The config option :kconfig:option:`CONFIG_LV_Z_VBD_CUSTOM_SECTION` is now called
:kconfig:option:`CONFIG_LV_Z_VDB_CUSTOM_SECTION`.

Device Drivers and Devicetree
*****************************

Expand Down
2 changes: 1 addition & 1 deletion modules/lvgl/Kconfig.memory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ config LV_Z_VDB_ALIGN
buffer may be accessed as a uint8_t *, uint16_t *, or uint32_t *,
so buffer must be aligned to prevent unaligned memory access

config LV_Z_VBD_CUSTOM_SECTION
config LV_Z_VDB_CUSTOM_SECTION
bool "Link rendering buffers to custom section"
depends on LV_Z_BUFFER_ALLOC_STATIC
help
Expand Down
6 changes: 3 additions & 3 deletions modules/lvgl/lvgl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@ struct lvgl_disp_data disp_data = {
* prevent unaligned memory accesses.
*/
static uint8_t buf0[BUFFER_SIZE]
#ifdef CONFIG_LV_Z_VBD_CUSTOM_SECTION
#ifdef CONFIG_LV_Z_VDB_CUSTOM_SECTION
Z_GENERIC_SECTION(.lvgl_buf)
#endif
__aligned(CONFIG_LV_Z_VDB_ALIGN);

#ifdef CONFIG_LV_Z_DOUBLE_VDB
static uint8_t buf1[BUFFER_SIZE]
#ifdef CONFIG_LV_Z_VBD_CUSTOM_SECTION
#ifdef CONFIG_LV_Z_VDB_CUSTOM_SECTION
Z_GENERIC_SECTION(.lvgl_buf)
#endif
__aligned(CONFIG_LV_Z_VDB_ALIGN);
#endif /* CONFIG_LV_Z_DOUBLE_VDB */

#if ALLOC_MONOCHROME_CONV_BUFFER
static uint8_t mono_vtile_buf[BUFFER_SIZE]
#ifdef CONFIG_LV_Z_VBD_CUSTOM_SECTION
#ifdef CONFIG_LV_Z_VDB_CUSTOM_SECTION
Z_GENERIC_SECTION(.lvgl_buf)
#endif
__aligned(CONFIG_LV_Z_VDB_ALIGN);
Expand Down
Loading