统一Ports

Author: PeterJhon

libraries/Common/board/ports/filesystem/mnt.c

@@ -11,7 +11,7 @@
 #define DBG_TAG "app.filesystem"
 #define DBG_LVL DBG_INFO
 #include <rtdbg.h>
-
+#ifndef BSP_USING_XiaoZhi
 static const struct romfs_dirent _romfs_root[] =
 {
 #ifdef BSP_USING_FLASH
@@ -26,6 +26,7 @@ const struct romfs_dirent romfs_root =
 {
     ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_romfs_root, sizeof(_romfs_root) / sizeof(_romfs_root[0])
 };
+#endif
 
 static void _sdcard_mount(void)
 {

libraries/Common/board/ports/lvgl/lv_conf.h

@@ -824,7 +824,7 @@
 #endif
 
 /* Built-in TTF decoder */
-#define LV_USE_TINY_TTF 0
+#define LV_USE_TINY_TTF 1
 #if LV_USE_TINY_TTF
     /* Enable loading TTF data from files */
     #define LV_TINY_TTF_FILE_SUPPORT 0

projects/Edgi_Talk_M55_XiaoZhi/.cproject

@@ -130,11 +130,13 @@ if os.path.exists(os.path.join(os.getcwd(), "libraries")):
     objs.extend(SConscript('libraries/components/littlefs/SConscript', variant_dir='build/libraries/components/littlefs', duplicate=0))
     objs.extend(SConscript('libraries/components/SConscript', variant_dir='build/libraries/components', duplicate=0))
     objs.extend(SConscript('libraries/components/lvgl_9.2.0/SConscript', variant_dir='build/libraries/components/lvgl_9.2.0', duplicate=0))
+    objs.extend(SConscript('libraries/Common/board/SConscript', variant_dir='build/libraries/Common/board', duplicate=0))
 else:
     # Set VariantDir for external libraries
     env.VariantDir('build/libraries/HAL_Drivers', '../../libraries/HAL_Drivers', duplicate=0)
     env.VariantDir('build/libraries/components', '../../libraries/components', duplicate=0)
-    
+    env.VariantDir('build/libraries/Common/board', '../../libraries/Common/board', duplicate=0)
+
     objs.extend(SConscript('../../libraries/HAL_Drivers/SConscript', variant_dir='build/libraries/HAL_Drivers', duplicate=0))
     objs.extend(SConscript('../../libraries/components/Infineon_cmsis-latest/SConscript', variant_dir='build/libraries/components/Infineon_cmsis-latest', duplicate=0))
     objs.extend(SConscript('../../libraries/components/Infineon_core-lib-latest/SConscript', variant_dir='build/libraries/components/Infineon_core-lib-latest', duplicate=0))
@@ -150,6 +152,7 @@ else:
     objs.extend(SConscript('../../libraries/components/littlefs/SConscript', variant_dir='build/libraries/components/littlefs', duplicate=0))
     objs.extend(SConscript('../../libraries/components/SConscript', variant_dir='build/libraries/components', duplicate=0))
     objs.extend(SConscript('../../libraries/components/lvgl_9.2.0/SConscript', variant_dir='build/libraries/components/lvgl_9.2.0', duplicate=0))
+    objs.extend(SConscript('../../libraries/Common/board/SConscript', variant_dir='build/libraries/Common/board', duplicate=0))
 
 # make a building
 DoBuilding(TARGET, objs)