From 0ac8f72037dfcbb7256e33be21f92bbc417857fd Mon Sep 17 00:00:00 2001 From: "Man, Jianting (Meco)" <920369182@qq.com> Date: Sat, 13 Aug 2022 22:02:41 -0400 Subject: [PATCH] [lvgl] remove suareline studio specific support for imxrt1060 (#6261) * [lvgl] PKG_USING_LV_MUSIC_DEMO defaults by yes * [lvgl] remove specific suppport for imxrt1060 https://github.com/lvgl/lvgl/pull/3566 --- .../applications/lvgl/squareline/README.md | 2 -- .../applications/lvgl/squareline/SConscript | 13 ------------- .../applications/lvgl/squareline/ui/lv_ui_entry.c | 15 --------------- bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig | 6 +----- bsp/qemu-vexpress-a9/drivers/Kconfig | 2 +- bsp/raspberry-pico/libraries/Kconfig | 2 +- bsp/simulator/Kconfig | 2 +- bsp/stm32/stm32f407-atk-explorer/board/Kconfig | 2 +- bsp/stm32/stm32f469-st-disco/board/Kconfig | 2 +- bsp/stm32/stm32l475-atk-pandora/board/Kconfig | 2 +- 10 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/README.md delete mode 100644 bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/SConscript delete mode 100644 bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/ui/lv_ui_entry.c diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/README.md b/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/README.md deleted file mode 100644 index c9caca0e3c..0000000000 --- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This folder is for LVGL Squareline Studio - diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/SConscript b/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/SConscript deleted file mode 100644 index 96527eed47..0000000000 --- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/SConscript +++ /dev/null @@ -1,13 +0,0 @@ -from building import * - -cwd = GetCurrentDir() -group = [] -src = [] -CPPPATH =[] - -src += Glob(cwd + '/ui/*.c') -CPPPATH += [cwd+'/ui'] - -group = group + DefineGroup('LVGL-SquareLine', src, depend = ['BSP_USING_LVGL', 'BSP_USING_LVGL_SQUARELINE'], CPPPATH = CPPPATH) - -Return('group') diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/ui/lv_ui_entry.c b/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/ui/lv_ui_entry.c deleted file mode 100644 index d3257967b4..0000000000 --- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/squareline/ui/lv_ui_entry.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2006-2022, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2022-05-13 Meco Man First version - */ - -void lv_user_gui_init(void) -{ - extern void ui_init(void); - ui_init(); -} diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig b/bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig index c7a89b2cb8..591a875c4f 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig +++ b/bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig @@ -101,11 +101,7 @@ menu "Onboard Peripheral Drivers" config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" select PKG_USING_LV_MUSIC_DEMO - default n - - config BSP_USING_LVGL_SQUARELINE - bool "Support LVGL SuqareLine Studio" - default n + default y config BSP_USING_NXP_GUIGUIDER bool "Support NXP GUI Guider" diff --git a/bsp/qemu-vexpress-a9/drivers/Kconfig b/bsp/qemu-vexpress-a9/drivers/Kconfig index 4f62af899f..e9ffbe5f59 100644 --- a/bsp/qemu-vexpress-a9/drivers/Kconfig +++ b/bsp/qemu-vexpress-a9/drivers/Kconfig @@ -28,7 +28,7 @@ if BSP_USING_LVGL config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" select PKG_USING_LV_MUSIC_DEMO - default n + default y endif config BSP_DRV_CLCD diff --git a/bsp/raspberry-pico/libraries/Kconfig b/bsp/raspberry-pico/libraries/Kconfig index 5aa5310147..b19e6f25fe 100644 --- a/bsp/raspberry-pico/libraries/Kconfig +++ b/bsp/raspberry-pico/libraries/Kconfig @@ -18,7 +18,7 @@ menu "Onboard Peripheral Drivers" config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" select PKG_USING_LV_MUSIC_DEMO - default n + default y endif endmenu diff --git a/bsp/simulator/Kconfig b/bsp/simulator/Kconfig index a125b2daac..d69b926542 100644 --- a/bsp/simulator/Kconfig +++ b/bsp/simulator/Kconfig @@ -57,7 +57,7 @@ menu "Peripheral Drivers" config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" select PKG_USING_LV_MUSIC_DEMO - default n + default y config BSP_LCD_WIDTH int "LCD width" diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig index c3352ebbd5..e9a3d5fce0 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig +++ b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig @@ -91,7 +91,7 @@ menu "Onboard Peripheral Drivers" if BSP_USING_LVGL config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" - default n + default y endif config BSP_USING_SPI_FLASH diff --git a/bsp/stm32/stm32f469-st-disco/board/Kconfig b/bsp/stm32/stm32f469-st-disco/board/Kconfig index 899833100b..5ad0df924e 100644 --- a/bsp/stm32/stm32f469-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f469-st-disco/board/Kconfig @@ -19,7 +19,7 @@ menu "Onboard Peripheral Drivers" config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" select PKG_USING_LV_MUSIC_DEMO - default n + default y endif config BSP_USING_ARDUINO diff --git a/bsp/stm32/stm32l475-atk-pandora/board/Kconfig b/bsp/stm32/stm32l475-atk-pandora/board/Kconfig index 877a0d2578..62d93ee6fe 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/Kconfig +++ b/bsp/stm32/stm32l475-atk-pandora/board/Kconfig @@ -103,7 +103,7 @@ menu "Onboard Peripheral Drivers" if BSP_USING_LVGL config BSP_USING_LVGL_DEMO bool "Enable LVGL demo" - default n + default y endif config BSP_USING_SDCARD